sabrina-shanman
|
14b3093506
|
Clarify 'what can be parented to what' table in pick parenting doc
|
2018-09-27 10:33:21 -07:00 |
|
sabrina-shanman
|
a9164f96b9
|
Fix some inaccuracies in the pick parenting doc
|
2018-09-27 09:53:42 -07:00 |
|
sabrina-shanman
|
4011660435
|
Merge branch 'master' into stt_parenting2
|
2018-09-26 10:17:45 -07:00 |
|
John Conklin II
|
0de433c7c7
|
Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master
fix for deadlock in other avatar entity removal from tree
|
2018-09-26 09:58:26 -07:00 |
|
John Conklin II
|
c5ff72bd20
|
Merge pull request #14024 from wayne-chen/toggle404Redirect
Toggle going to 404 redirect domain
|
2018-09-25 20:44:57 -07:00 |
|
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 |
|
Wayne Chen
|
69d5299362
|
patching fix for previous commits
|
2018-09-24 15:22:46 -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 |
|
Wayne Chen
|
ac5814a1f8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect
|
2018-09-24 13:57:23 -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 |
|
Stephen Birarda
|
b31837168d
|
fix bad lock, optimize some operations, clarify comment
|
2018-09-24 11:27:20 -07:00 |
|
sabrina-shanman
|
e15f22d6ca
|
Add pick parenting markdeep doc
|
2018-09-24 11:13:38 -07:00 |
|
sabrina-shanman
|
a5950156cc
|
Add markdeep for docs
|
2018-09-24 11:13:13 -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
|
7e796f7e7f
|
committing requested changes
|
2018-09-19 14:26:30 -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
|
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 |
|
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 |
|
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 |
|