Commit graph

72124 commits

Author SHA1 Message Date
Kerry Ivan Kurian
c1cc031bd0 Remove cruft and refactor 2018-09-20 14:50:27 -07:00
Wayne Chen
3907eaf68f changing show password image 2018-09-20 14:40:19 -07:00
Zach Fox
33c04631ea Comments on Confluence doc 2018-09-20 14:37:46 -07:00
Thijs Wenker
1094b6722f self-CR 2018-09-20 23:36:53 +02:00
Kerry Ivan Kurian
ae4352f450 Rez entity in marketplace item tester 2018-09-20 13:55:22 -07:00
Ryan Huffman
1ee655c8f8 Fix sorting of entity list not working as expected 2018-09-20 13:51:00 -07:00
Thijs Wenker
d1f35c8c54 update the entityList update with newly added Entities.getMultipleEntities function 2018-09-20 22:48:56 +02:00
Thijs Wenker
e2cb96193d JSDocs 2018-09-20 22:47:14 +02:00
Ryan Huffman
72adfb7ff0 Fix entity list selection failing when selecting entities not in list 2018-09-20 13:46:22 -07:00
Zach Fox
87e91a4401 GOTO doesn't care about SINCE; reduce data for PEOPLE 2018-09-20 13:36:50 -07:00
Thijs Wenker
6d72881f3f remove commented out test code 2018-09-20 21:14:30 +02:00
Wayne Chen
8bd698b143 leaving button in natural dims 2018-09-20 11:13:27 -07:00
Kerry Ivan Kurian
afa8e44e66 Refactor 2018-09-20 10:53:32 -07:00
Thijs Wenker
06491ef12f API function for retrieving multiple entity properties with better performance 2018-09-20 19:34:00 +02:00
Andrew Meadows
cf85c617a2 tweak avatar update priority coefs for load tests 2018-09-20 09:56:50 -07:00
Wayne Chen
8770c363df change button text to have a space 2018-09-19 17:02:05 -07:00
Howard Stearns
391128ef77 Merge branch 'followWalletSetupReferrer' of github.com:zfox23/hifi into account-managed-wallet-punchlist2 2018-09-19 16:46:09 -07:00
luiscuenca
cad8425c7b Time-based frames, max distance and setting animation from script 2018-09-19 16:43:45 -07:00
Zach Fox
ed84b49ece Small bugfixes and using original endpoints 2018-09-19 16:15:59 -07:00
Kerry Ivan Kurian
5445d6f670 Switch to localhost before replacing content 2018-09-19 16:06:43 -07:00
Howard Stearns
d644a63990 consistent/usefull checkout flow when you don't have enough money. 2018-09-19 16:00:40 -07:00
Kerry Ivan Kurian
38fd9523ee Attempt to load content set
This does not result in the user seeing the content set.
2018-09-19 15:57:29 -07:00
Roxanne Skelly
bda179697e Tray Notifications - users handling changes
Since the 'users' api call doesn't support a 'since', we now query
all of the online connections each time to keep track of connections
that join or leave.
2018-09-19 15:50:50 -07:00
Kerry Ivan Kurian
66bf45c3ef Update location only if certificate id 2018-09-19 15:18:18 -07:00
Kerry Ivan Kurian
5bc7d944f9 Remove whitespace 2018-09-19 15:17:13 -07:00
Ryan Huffman
8805ce49e3 Remove verbose logging of keyboard messages in edit.js and gridTool.js 2018-09-19 15:06:58 -07:00
Ryan Huffman
431daecd8e Fix shifting of yaw rotation handle 2018-09-19 14:33:51 -07:00
Wayne Chen
7e796f7e7f committing requested changes 2018-09-19 14:26:30 -07:00
Roxanne Skelly
aba183b165 Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray 2018-09-19 13:40:18 -07:00
Ryan Huffman
788c883c02 Fix Circle3DOverlay not rendering solid circle to exact degrees 2018-09-19 13:38:35 -07:00
Alexander Ivash
e5b7b7f12a FB18061 - Avatar favorites cannot be moved to a different joint - At Save the wearable jumps to the original joint 2018-09-19 23:07:21 +03:00
Wayne Chen
8d0e55c1cd Merge branch 'master' of https://github.com/highfidelity/hifi 2018-09-19 13:00:33 -07:00
Roxanne Skelly
d5f756c79d Tray Notifier Checkpoint
* Add app launch
* Add authentication for auth-related calls
* Refactor notifications code
2018-09-19 12:40:15 -07:00
John Conklin II
3b1e0dc7d9
Merge pull request #13987 from zfox23/discovery_appUi
Discovery Notifications Project Checkpoint: Discovery apps now use AppUI module; PEOPLE app notifications
2018-09-19 12:38:28 -07:00
John Conklin II
6c63f92f39
Merge pull request #13933 from SamGondelman/accelerationSpread
Fix particle acceleration spread
2018-09-19 11:49:42 -07:00
John Conklin II
60c07280f8
Merge pull request #13971 from SamGondelman/parabola
Correct transparent parabola shader
2018-09-19 11:46:24 -07:00
Zach Fox
144771b77b Request JSON from server 2018-09-19 11:35:17 -07:00
Brad Davis
783ea21951 Fix AMD highlighting effect 2018-09-19 11:21:12 -07:00
Wayne Chen
a43799fffa moving settings check within slotted functions 2018-09-19 10:40:49 -07:00
Wayne Chen
01594d7a52 fixing settings check in domain handler 2018-09-19 10:17:14 -07:00
David Back
46c8083fb9 only call selectEntity one time per trigger 2018-09-19 10:13:15 -07:00
Wayne Chen
795580f4e1 adding 404 redirect toggle with interstitial 2018-09-19 09:55:15 -07:00
Stephen Birarda
3a7785d10f fix for deadlock in other avatar entity removal 2018-09-18 17:52:24 -07:00
Zach Fox
f70ecdad16 Small bugfix 2018-09-18 17:00:53 -07:00
Zach Fox
9db11aeda7 Bugfixes and new algo for PAL notifs 2018-09-18 16:35:53 -07:00
Wayne Chen
8b3fff120a Merge branch 'master' of https://github.com/highfidelity/hifi 2018-09-18 16:28:33 -07:00
Wayne Chen
be5f498c2f reversion 2018-09-18 15:47:54 -07:00
Zach Fox
4987164706 Notifications for GOTO (using a cool algorithm) 2018-09-18 15:30:43 -07:00
Wayne Chen
43fe98a511 reversion 2018-09-18 15:29:28 -07:00
Wayne Chen
f39c829635 Merge branch 'master' of https://github.com/wayne-chen/hifi into fixMainTextContainerQML 2018-09-18 15:28:29 -07:00