John Conklin II
3d71dfc467
Merge pull request #14072 from SamGondelman/highlight
...
Fix avatar highlighting
2018-09-25 16:13:14 -07:00
John Conklin II
19438d143e
Merge pull request #14073 from jherico/fix/18069_test
...
Working on Vive shutdown issues
2018-09-25 15:41:32 -07:00
Brad Davis
15de0590e8
Cleaning up commented out code
2018-09-25 13:18:49 -07:00
Brad Davis
5adc4c2290
Protect against null pointer usage in sound scripting wrapper
2018-09-25 13:17:49 -07:00
John Conklin II
be23d07621
Merge pull request #14010 from sethalves/thread-safe-settings
...
make settings thread safe
2018-09-24 17:24:50 -07:00
Brad Davis
72fc686ec1
Fix timer managmement during shutdown
2018-09-24 14:52:13 -07:00
John Conklin II
55848e6959
Merge pull request #14008 from sethalves/fix-local-angular-velocity
...
fix bug that caused localAngularVelocity to get zeroed out
2018-09-24 14:32:57 -07:00
SamGondelman
ad73cb3996
fix avatar highlighting
2018-09-24 14:02:35 -07:00
John Conklin II
a602bff217
Merge pull request #13981 from gcalero/android_settings
...
Android settings (AEC)
2018-09-24 13:55:30 -07:00
John Conklin II
1f6f51993d
Merge pull request #14029 from huffman/fix/keyboard-logging-in-edit
...
Remove verbose logging of keyboard messages in edit.js and gridTool.js
2018-09-24 12:54:43 -07:00
John Conklin II
45b206d748
Merge pull request #14065 from SamGondelman/blendshapeCrash
...
Fix blendshape crash on avatar removal
2018-09-24 12:39:52 -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
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
Seth Alves
86e502637e
Make Settings thread safe
2018-09-21 15:46:35 -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
John Conklin II
428ace17e1
Merge pull request #14001 from wayne-chen/fixLoginFailTwiceCall
...
Fixing double loginFailed
2018-09-21 11:36:06 -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
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
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
Wayne Chen
8bd698b143
leaving button in natural dims
2018-09-20 11:13:27 -07:00
Andrew Meadows
cf85c617a2
tweak avatar update priority coefs for load tests
2018-09-20 09:56:50 -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
8d0e55c1cd
Merge branch 'master' of https://github.com/highfidelity/hifi
2018-09-19 13:00:33 -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
Brad Davis
783ea21951
Fix AMD highlighting effect
2018-09-19 11:21:12 -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
Wayne Chen
48e4b38312
reversion
2018-09-18 15:28:15 -07:00
Wayne Chen
8274f4cb4c
reverting domain handler change
2018-09-18 15:26:12 -07:00
Zach Fox
d487914656
Prevent text notification from appearing when not necessary
2018-09-18 11:28:59 -07:00
Sam Gateau
d768809fbc
Merge pull request #13969 from SamGondelman/modelBugs
...
Fixing Model animation bugs
2018-09-18 11:28:37 -07:00
Wayne Chen
f82063ed46
Merge branch 'master' of https://github.com/highfidelity/hifi
2018-09-18 09:17:28 -07:00
Anthony Thibault
8229c14c44
Fix for type in AnimStats.qml
2018-09-17 15:17:43 -07:00
Zach Fox
c453594eb7
Overhaul notification logic for PAL
2018-09-17 14:41:18 -07:00
Zach Fox
143a059b16
Small changes to AppUI and PAL
2018-09-17 11:11:36 -07:00
Zach Fox
23fab0985b
Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi
2018-09-17 11:11:21 -07:00
Anthony Thibault
11fe657c05
Swaped AnimVar and StatMachine panels
2018-09-17 10:33:04 -07:00
Seth Alves
f86075b2dd
Revert "Fix for angularVelocity zeroing out on duplication or undo"
...
This reverts commit 9c96a10f6c
2018-09-15 09:21:12 -07:00
Seth Alves
1a44054c49
attempt fix for fb-17131
2018-09-15 09:15:43 -07:00
John Conklin II
be76c43aec
Merge pull request #13999 from gcalero/dont_popup_login_android
...
Don't popup login dialog in android
2018-09-14 16:06:03 -07:00
John Conklin II
cb8e3c6452
Merge pull request #14003 from danteruiz/snap-fix
...
Fix snapshot settings issue in HMD
2018-09-14 15:34:22 -07:00
John Conklin II
49e578ebef
Merge pull request #13998 from AndrewMeadows/dont-zero-kinematic
...
don't zero kinematic velocities when releasing simulation ownership
2018-09-14 15:18:06 -07:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip
...
Safe Teleport Target
2018-09-14 15:11:18 -07:00
Anthony Thibault
b0cde2afcc
Small addition to Anim Stats
...
* During a state machine interp the previous state now shows up in AlphaValues panel, with parentheses around the name.
* Added 3 new fields
* Position - in world coordinate frame.
* Heading - the facing angle in the world corrdinate frame.
* Local Vel - the velocity of the character in the local coordinate frame. (left, forward, up).
2018-09-14 15:05:17 -07:00
Zach Fox
9c5544af39
Merge in big work from appui_notifications branch
2018-09-14 14:37:04 -07:00
