Andrew Meadows
c1d65f5118
update avatar shape after it loads
2018-09-24 12:07:08 -07:00
John Conklin II
d520152a95
Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements
...
Small Improvements to Anim Stats
2018-09-24 11:56:01 -07:00
Stephen Birarda
b31837168d
fix bad lock, optimize some operations, clarify comment
2018-09-24 11:27:20 -07:00
John Conklin II
9916496118
Merge pull request #14041 from huffman/fix/entity-list-no-highlight-74
...
Fix entity list selection failing when selecting entities not in list
2018-09-24 11:02:36 -07:00
SamGondelman
d772cdb34a
please
2018-09-24 10:16:35 -07:00
Zach Fox
57c303440b
Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps
2018-09-24 09:32:53 -07:00
Dante Ruiz
5a8ab61426
Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial
2018-09-24 09:21:36 -07:00
Dante Ruiz
d4450ac780
fix equip and keeping new functionallity
2018-09-21 15:59:00 -07:00
Seth Alves
86e502637e
Make Settings thread safe
2018-09-21 15:46:35 -07:00
Roxanne Skelly
61cbee72af
Merge branch 'master' of https://github.com/highfidelity/hifi into sysTray
2018-09-21 12:31:36 -07:00
John Conklin II
ea7bc26ad8
Merge pull request #14038 from wayne-chen/fixInterstitialButton
...
Fix Interstitial GoTo button stretch
2018-09-21 11:44:48 -07:00
John Conklin II
fa5bb84628
Merge pull request #14043 from huffman/fix/entity-list-sort-visible-lock-74
...
Fix sorting of entity list not working as expected
2018-09-21 11:44:17 -07:00
Dante Ruiz
d3368146ce
saving work
2018-09-21 11:42:26 -07:00
John Conklin II
428ace17e1
Merge pull request #14001 from wayne-chen/fixLoginFailTwiceCall
...
Fixing double loginFailed
2018-09-21 11:36:06 -07:00
Zach Fox
6284074ff9
Don't show banner when app is open but continue updating data
2018-09-21 10:47:59 -07:00
Seth Alves
6eb3fa251d
guard against null deref
2018-09-21 10:39:41 -07:00
Seth Alves
f6e57f54b0
don't call enterEntity until script preload has finished
2018-09-21 10:26:55 -07:00
Seth Alves
d5c0c05ab2
wait for an entity's script to load before adding it to the contain-avatar list. do this so the script doesn't miss the 'enterEntity' entity-method due to not being loaded.
2018-09-21 10:26:55 -07:00
John Conklin II
9c2a7931fb
Merge pull request #14036 from AndrewMeadows/crowd-update-tuning
...
tweak avatar update priority coefficients for load tests
2018-09-21 09:44:15 -07:00
Zach Fox
e75a45af92
Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps
2018-09-21 09:43:30 -07:00
Kerry Ivan Kurian
f9c25f2f32
Allow user to select asset type in marketplace item tester
2018-09-20 16:36:06 -07:00
John Conklin II
0560b8678c
Merge pull request #14022 from jherico/fix/amd_highlight
...
Fix AMD highlighting effect
2018-09-20 16:17:10 -07:00
Roxanne Skelly
6e051b7431
Checkpoint tray notifications
...
* Fix app launch
* refactor notifications code
* fixup wording
2018-09-20 15:55:35 -07:00
Kerry Ivan Kurian
c1cc031bd0
Remove cruft and refactor
2018-09-20 14:50:27 -07:00
Zach Fox
33c04631ea
Comments on Confluence doc
2018-09-20 14:37:46 -07: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
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
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
Andrew Meadows
cf85c617a2
tweak avatar update priority coefs for load tests
2018-09-20 09:56:50 -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
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
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
Wayne Chen
4ce942b0f2
updating spawn location/floor in redirect
2018-09-19 13:00:56 -07: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
