Commit graph

29542 commits

Author SHA1 Message Date
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
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
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
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
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
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
Andrew Meadows
cf85c617a2 tweak avatar update priority coefs for load tests 2018-09-20 09:56:50 -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
Sam Gateau
d768809fbc
Merge pull request #13969 from SamGondelman/modelBugs
Fixing Model animation bugs
2018-09-18 11:28:37 -07:00
Seth Alves
1a44054c49 attempt fix for fb-17131 2018-09-15 09:15:43 -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
Wayne Chen
0afea6fbd1 removing double login fail signal 2018-09-14 11:08:53 -07:00
Andrew Meadows
9390687e2d remove redundant EntityMotionState::updateSendVelocities() call 2018-09-14 10:37:55 -07:00
Andrew Meadows
9073e1ade3 don't zero kinematic velocity at end of sim ownership 2018-09-14 10:37:17 -07:00
John Conklin II
44041fcc14
Merge pull request #13986 from Atlante45/fix/ess-crash
Fix ESS crash caused by concurrent access to _entityScripts
2018-09-14 07:56:45 -07:00
Wayne Chen
fd1e64e4e6
Revert "Fix login fail twice call" 2018-09-13 17:01:59 -07:00
John Conklin II
aef3ed3e01
Merge pull request #13989 from wayne-chen/fixLoginFailTwiceCall
Fix login fail twice call
2018-09-13 16:59:00 -07:00
luiscuenca
c5669ef1f5 better property names 2018-09-13 15:22:18 -07:00
John Conklin II
0bf064c451
Merge pull request #13984 from wayne-chen/fixLoopingConnectionMonitor
Fixing Error State for Timeout/localhost Redirection
2018-09-13 15:19:55 -07:00
Clement
e6b4ccef16 Add lock around _entityScripts 2018-09-13 15:10:16 -07:00
Gabriel Calero
1215ddbe88 Remove debug files from linux qt build. Remove extra space 2018-09-13 18:50:46 -03:00
luiscuenca
ceccc6d6ec make getCollisionCapsule thread safe 2018-09-13 14:49:35 -07:00
Wayne Chen
647c4e1694 adding true fix for localhost timeouts 2018-09-13 13:51:42 -07:00
John Conklin II
b675e6cc6b
Merge pull request #13894 from SimonWalton-HiFi/avatar-mixer-scaling
Performance improvements for Avatar Mixer
2018-09-13 13:43:18 -07:00
John Conklin II
28140fc0c0
Merge pull request #13988 from sabrina-shanman/crash_bubble-tp
Fix crash when teleporting into avatars with bubble active
2018-09-13 13:07:31 -07:00
Wayne Chen
873859455a Revert "adding fix for getting DomainHandler into error state"
This reverts commit 3fe3f674d0.
2018-09-13 11:53:56 -07:00
Wayne Chen
380f24b37f adding fix, changing window title 2018-09-13 11:53:21 -07:00
sabrina-shanman
f3d86cfc7d Fix crash when teleporting into avatars with bubble active 2018-09-13 10:51:53 -07:00
Wayne Chen
96ab7d417e removing connection for on login failed 2018-09-13 10:35:43 -07:00
Wayne Chen
bcd014ddc8 Merge branch 'master' of https://github.com/highfidelity/hifi into fixLoopingConnectionMonitor 2018-09-13 10:29:02 -07:00
Wayne Chen
9a657559ef Merge branch 'master' of https://github.com/wayne-chen/hifi 2018-09-13 09:52:20 -07:00
Bradley Austin Davis
d90551ac3e
Merge pull request #13954 from jherico/fix/reduce_pointer_duplication
Reduce needless smart pointer duplication
2018-09-13 08:56:50 -07:00
Wayne Chen
47b5ce706e Merge branch 'master' of https://github.com/highfidelity/hifi 2018-09-13 07:09:00 -07:00
Sam Gateau
6285487214
Merge pull request #13976 from SamGondelman/crash
Blendshape fixes
2018-09-12 22:19:44 -07:00
Wayne Chen
ad233677b8 adding changes for overriding host change for error state 2018-09-12 18:31:01 -07:00
Wayne Chen
3fe3f674d0 adding fix for getting DomainHandler into error state 2018-09-12 15:45:06 -07:00
Wayne Chen
49f26d968a adding fix for getting DomainHandler into error state 2018-09-12 15:42:55 -07:00
SamGondelman
2b2091290e fix everything 2018-09-12 15:32:35 -07:00
Brad Davis
d92c62c742 Make android use the existing shared pointers 2018-09-12 15:04:36 -07:00
Brad Davis
700c6519bf More PR comments 2018-09-12 15:04:36 -07:00
Brad Davis
37cf37e3e1 PR feedback 2018-09-12 15:04:36 -07:00
Brad Davis
cfff28ad0a More shared pointer deduplication 2018-09-12 15:04:35 -07:00