Commit graph

1147 commits

Author SHA1 Message Date
Howard Stearns
a0ea306aed cleanup, and include missing allowBackface parameter 2017-06-04 07:55:23 -07:00
Howard Stearns
c48b729527 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-02 18:05:20 -07:00
Seth Alves
142739eec7 Merge pull request #10602 from AndrewMeadows/simulation-ownership-002
fixes for some simulation ownership problems
2017-06-02 14:23:19 -07:00
Andrew Meadows
29a05d7eb4 bid immediately when creating new entity
also clear EntityMotionState::_numInactiveUpdates on new ownership
2017-06-01 17:39:21 -07:00
Andrew Meadows
74827fc4c8 recently moved static objects added to changelist
since static objects are not active this will make the interface
release ownership of recently changed static objects
2017-06-01 17:39:21 -07:00
Andrew Meadows
e34f979ed9 add EntityMotionState::isLocallyOwned() for cleaner logic 2017-06-01 17:39:21 -07:00
howard-stearns
6b2e4c5abc zaru stuff 2017-06-01 17:08:22 -07:00
howard-stearns
1e1dd3a633 checkpoint with working detector 2017-05-31 17:10:37 -07:00
Andrew Meadows
971855e6bf add asserts to catch dangling pointers sooner 2017-05-25 14:29:14 -07:00
Andrew Meadows
c22e4ef883 rename method to clarify where it is called 2017-05-25 13:48:19 -07:00
Andrew Meadows
5378cbead6 make ObjectMotionState dtor virtual 2017-05-25 13:47:03 -07:00
Brad Hefta-Gaub
23af6294ab Merge pull request #10521 from sethalves/fix-locked-in-motion
if something is locked but in motion, make it kinematic rather than static
2017-05-25 08:32:30 -07:00
Seth Alves
3825830fac if something is locked but in motion, make it kinematic rather than static 2017-05-22 14:07:53 -07:00
samcake
f8c291ee78 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-22 10:56:00 -07:00
Seth Alves
4142d8c686 actions shouldn't change locked entities 2017-05-21 11:05:18 -07:00
Sam Cake
321f74c305 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-20 18:12:58 -07:00
Seth Alves
8f38ea8c6a force locked entities to be static in bullet 2017-05-20 11:54:42 -07:00
samcake
c449229850 Cleaned up the counters for memory 2017-05-19 17:52:56 -07:00
Andrew Meadows
09433a93ba Merge pull request #10477 from AndrewMeadows/correct-avatar-mass
More correct avatar mass
2017-05-17 16:22:06 -07:00
Seth Alves
9b1fe60b7c suppress frequest log-spam from constraints. 2017-05-17 11:55:31 -07:00
Andrew Meadows
d065b569d3 support for variable avatar mass by size 2017-05-16 16:03:51 -07:00
Andrew Meadows
9b3754c2ee remove unused API from ObjectDynamic and friends 2017-05-15 22:13:03 -07:00
Andrew Meadows
9e08dadaf4 Remove ObjectActionSpring 2017-05-15 22:11:42 -07:00
Seth Alves
fcc5e12211 redelete these 2017-05-12 13:19:15 -07:00
Seth Alves
f40c7bde71 Merge pull request #9 from AndrewMeadows/motor-action
remove unused parameters from Hinge and ConeTwist constraints
2017-05-12 13:14:02 -07:00
Seth Alves
630d95a812 fix constraint import some more 2017-05-12 13:03:51 -07:00
Andrew Meadows
10d058af02 remove unused parameters from ObjectConstraintConeTwist 2017-05-12 12:07:34 -07:00
Andrew Meadows
18b1bb8b7f remove unused parameters from ObjectConstraintHinge 2017-05-12 12:04:08 -07:00
Seth Alves
bc6fb182eb pull out motor action, fix import of slider and cone-twist constraints 2017-05-12 10:32:28 -07:00
Seth Alves
80e6edda0c code review 2017-05-11 10:13:15 -07:00
Seth Alves
b285a582bd oops 2017-05-09 10:37:45 -07:00
Seth Alves
4f24a7618a cleanups 2017-05-09 10:23:04 -07:00
Seth Alves
1e1968357a Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-09 09:24:50 -07:00
Seth Alves
55056e730a guard slider and cone-twist constraints against zero-length axisq 2017-05-08 17:02:37 -07:00
Seth Alves
de589a32f3 clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring 2017-05-08 16:36:51 -07:00
Seth Alves
94dfbc81f3 entity export/import involving constraints now works 2017-05-08 15:44:31 -07:00
Andrew Meadows
e44c2c8da3 init zero gravity to agree with init hover state 2017-05-08 12:47:32 -07:00
Seth Alves
fd238f5438 working on fixing action/constraint export/import 2017-05-08 11:02:35 -07:00
Andrew Meadows
d9e893ac21 minior optimization/cleanup 2017-05-08 11:02:11 -07:00
Andrew Meadows
0f643b7d66 add check to avoid divide by zero 2017-05-08 10:59:15 -07:00
Andrew Meadows
f00a3cafb6 cleanup logic to be more readable 2017-05-08 10:52:54 -07:00
Seth Alves
7a1a9d6496 start on code to remap constraint IDs during import 2017-05-07 19:42:04 -07:00
Seth Alves
b2ccc33a79 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-05 14:52:07 -07:00
Andrew Meadows
2bfbb63906 remove unused variable 2017-05-05 09:37:01 -07:00
Andrew Meadows
8ed93783bd fix step up velocity calculation 2017-05-05 09:37:01 -07:00
Andrew Meadows
cd7be46b70 tweak threshold for minimum stepheight 2017-05-05 09:37:01 -07:00
Andrew Meadows
6e8d90e3b6 restore clear of follow accumulators 2017-05-05 09:37:01 -07:00
Andrew Meadows
fe401c7488 improved management of collisionless avatar state 2017-05-05 09:37:00 -07:00
Andrew Meadows
95a4bb9ef4 fix transition height from hover to stand 2017-05-05 09:35:49 -07:00
Andrew Meadows
e449c48888 remove one more line of cruft 2017-05-05 09:35:49 -07:00