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 |
|
Sam Gateau
|
d768809fbc
|
Merge pull request #13969 from SamGondelman/modelBugs
Fixing Model animation bugs
|
2018-09-18 11:28:37 -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 |
|
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 |
|
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 |
|
Brad Davis
|
9a435cdca2
|
Reduce needless smart pointer duplication
|
2018-09-12 15:04:35 -07:00 |
|
Sam Gondelman
|
42ded53b5f
|
Merge branch 'master' into modelBugs
|
2018-09-12 14:35:46 -07:00 |
|
Stephen Birarda
|
b1f44d2ad7
|
perform avatar entity cleanup in AvatarManager::handleRemovedAvatar
|
2018-09-12 12:30:15 -07:00 |
|
Stephen Birarda
|
1789d51d6e
|
Revert "cycle avatar entity IDs for new avatar mixer"
This reverts commit 20912349a4.
|
2018-09-12 12:22:07 -07:00 |
|
Stephen Birarda
|
6d3e6a661f
|
Revert "XOR incoming trait instance IDs for other avatars"
This reverts commit 9b3d9dd0f3.
|
2018-09-12 12:20:31 -07:00 |
|
Stephen Birarda
|
4b93f9f5cd
|
Revert "use different XORed instance ID for replicas"
This reverts commit a37a19da1e.
|
2018-09-12 12:20:03 -07:00 |
|
luiscuenca
|
fa3c6932c6
|
Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip
|
2018-09-12 11:47:18 -07:00 |
|
Simon Walton
|
7136698c6b
|
Move default pose flags out of joint-positions condition
|
2018-09-12 10:49:26 -07:00 |
|
sabrina-shanman
|
87b5605d69
|
Add normalOnPick to CollisionPickResult
|
2018-09-12 10:36:00 -07:00 |
|
Simon Walton
|
0d72e3808c
|
Small changes per review
|
2018-09-12 10:31:26 -07:00 |
|
John Conklin II
|
f67deb9f65
|
Merge pull request #13938 from wayne-chen/interstitalMerged
Interstitial Page with 404 Redirect
|
2018-09-12 08:39:52 -07:00 |
|
Sam Gateau
|
f79c92b4ff
|
Merge pull request #13974 from samcake/black-ter
Fix a missing std::chrono::duration_cast
|
2018-09-12 08:27:19 -07:00 |
|
Wayne Chen
|
20cab87a17
|
Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged
|
2018-09-11 18:53:06 -07:00 |
|
Wayne Chen
|
a7321f950a
|
pushing requested changes - adding timeout refusal
|
2018-09-11 18:32:17 -07:00 |
|
Brad Hefta-Gaub
|
d319bea2ac
|
Merge pull request #13973 from hyperlogic/feature/indicate-loading-status-on-avatar-orb
Avatar loading orb now indicates loading status
|
2018-09-11 18:01:40 -07:00 |
|
Wayne Chen
|
cb0aa8055f
|
Merge pull request #13961 from wayne-chen/loginOnLaunch
Pop up login dialog on launch
|
2018-09-11 17:43:29 -07:00 |
|