Seth Alves
|
16bf59f8a6
|
fix a crash in RenderableModelEntityItem::getModel
|
2016-04-25 10:26:32 -07:00 |
|
Brad Hefta-Gaub
|
8c7ef31636
|
Merge pull request #7746 from AndrewMeadows/supress-spurious-logs
reduce warnings about truncated kinematic timesteps
|
2016-04-23 09:34:45 -07:00 |
|
Brad Hefta-Gaub
|
04dab65b59
|
Merge pull request #7727 from ZappoMan/supportLargeClockSkew
support for larger than 35 minute clock skew
|
2016-04-23 08:42:38 -07:00 |
|
Andrew Meadows
|
d984ce4792
|
properly update _lastSimulated for kinematic objs
|
2016-04-22 17:19:00 -07:00 |
|
Andrew Meadows
|
34d622e498
|
add warning about truncated kinematic timestep
|
2016-04-22 13:10:23 -07:00 |
|
Andrew Meadows
|
872622c6f7
|
fix acceleration of for server-side kinematics
|
2016-04-22 09:38:43 -07:00 |
|
Andrew Meadows
|
14abb15216
|
set kinematic accel before stepping
|
2016-04-22 09:38:43 -07:00 |
|
Andrew Meadows
|
8efb07cfd8
|
correctg measured acceleration for kinematics
|
2016-04-22 09:38:43 -07:00 |
|
Andrew Meadows
|
a79f49a5cd
|
don't stop slow kinematic objs when sending updates
|
2016-04-22 09:38:43 -07:00 |
|
Andrew Meadows
|
ad045bc439
|
remove second-order term from kinematic motion
|
2016-04-22 09:38:43 -07:00 |
|
Andrew Meadows
|
3639ffe53e
|
optimize kinematic motion math
|
2016-04-22 09:38:43 -07:00 |
|
Brad Hefta-Gaub
|
31f9d592e0
|
support for larger than 35 minute clock skew
|
2016-04-20 18:42:00 -07:00 |
|
Howard Stearns
|
9ff9682b2a
|
Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange
Reset entities script engine on domain change
|
2016-04-19 11:14:28 -07:00 |
|
Seth Alves
|
4bf98a80b9
|
Merge pull request #7667 from AndrewMeadows/fix-entity-server-crash
fix entity-server crash when entity moves out of bounds
|
2016-04-18 14:09:21 -07:00 |
|
Brad Hefta-Gaub
|
374ba10524
|
more CR feedback
|
2016-04-18 12:23:36 -07:00 |
|
Brad Hefta-Gaub
|
1c111e20bd
|
fix possible thread issue with Entities.callEntityMethod()
|
2016-04-18 11:20:26 -07:00 |
|
Brad Hefta-Gaub
|
91334d6a39
|
Merge pull request #7664 from ZappoMan/reduceJointProperties
only export joint values if they've been explicitly set by scripts
|
2016-04-14 15:30:04 -07:00 |
|
Andrew Meadows
|
a263091c94
|
fix entity-server crash for out of bounds
|
2016-04-14 15:23:14 -07:00 |
|
Zach Pomerantz
|
e80898f095
|
Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache
|
2016-04-14 10:12:16 -07:00 |
|
Brad Hefta-Gaub
|
7b5075cce5
|
Merge pull request #7645 from sethalves/dont-run-bullet-too-soon
add a heuristic for deciding when it's safe to enable bullet
|
2016-04-14 09:35:58 -07:00 |
|
Brad Hefta-Gaub
|
b48503a82d
|
only export joint values if they've been explicitly set by scripts
|
2016-04-13 19:52:50 -07:00 |
|
Zach Pomerantz
|
7a15339631
|
Use AnimationCache for models
|
2016-04-13 15:44:47 -07:00 |
|
Seth Alves
|
3288bff963
|
don't flood log with messages about expired actions. also, try to remove such actions
|
2016-04-13 09:47:07 -07:00 |
|
Seth Alves
|
e4c91e5064
|
add a heuristic for deciding when it's safe to enable bullet
|
2016-04-12 11:46:00 -07:00 |
|
Seth Alves
|
1d63f6d354
|
Merge branch 'master' of github.com:highfidelity/hifi into make-fixupMissingParents-more-thread-safe
|
2016-04-11 09:58:08 -07:00 |
|
Brad Hefta-Gaub
|
47ff5c090d
|
Merge pull request #7623 from ZappoMan/fixAnimationFrameExport
fix export of animation properties
|
2016-04-11 09:37:47 -07:00 |
|
Brad Hefta-Gaub
|
cc418c615f
|
Merge pull request #7631 from sethalves/parent-equipping-and-platform-hack
treat children of avatars and children of entities differently until velocity handling is fixed
|
2016-04-10 14:55:03 -07:00 |
|
Seth Alves
|
43f735dd21
|
avoid loop where bullet moves an entity and then an entity tells bullet that it has moved.
|
2016-04-09 22:18:43 -07:00 |
|
Seth Alves
|
2aa3e5d418
|
re-enabled EntityItem::simulateKinematicMotion for things with parents
|
2016-04-09 09:06:18 -07:00 |
|
Brad Hefta-Gaub
|
f1f8fd8a24
|
fix export of animation properties
|
2016-04-08 14:40:06 -07:00 |
|
Seth Alves
|
95f446183f
|
use for loop rather than iterator
|
2016-04-08 13:32:33 -07:00 |
|
Seth Alves
|
6088612ce0
|
guard access to _missingParent vector with a lock to allow safe access from multiple threads
|
2016-04-08 13:16:30 -07:00 |
|
Brad Hefta-Gaub
|
e7d75cb22e
|
Merge pull request #7573 from sethalves/update-collision-hulls-of-avatar-children
Update collision hulls of avatar children
|
2016-04-07 14:47:44 -07:00 |
|
Brad Hefta-Gaub
|
7f164a7959
|
CR feedback
|
2016-04-07 08:42:40 -07:00 |
|
Seth Alves
|
5375fdd0f0
|
don't do simple kinematic simulation on things that have parents
|
2016-04-06 16:42:14 -07:00 |
|
Brad Hefta-Gaub
|
8c15116190
|
fix auto-hide logic in depthReticle
|
2016-04-06 11:00:43 -07:00 |
|
Seth Alves
|
af05b97c1e
|
put back accidently deleted line. cleanups
|
2016-04-04 17:31:59 -07:00 |
|
Seth Alves
|
d814d7b35d
|
merge from upstream
|
2016-04-04 16:32:49 -07:00 |
|
Seth Alves
|
69bb0ebd74
|
Revert "faster kinematic motion for entities"
|
2016-04-04 16:11:54 -07:00 |
|
Seth Alves
|
b8587e0711
|
update collision shapes of entities which are children of avatars
|
2016-04-04 16:06:53 -07:00 |
|
Seth Alves
|
c48a67b933
|
Merge pull request #7544 from AndrewMeadows/faster-kinematics
faster kinematic motion for entities
|
2016-04-04 15:26:32 -07:00 |
|
Andrew Meadows
|
a08ab8e127
|
restore setFlag in simulateKinematicMotion()
|
2016-04-04 11:48:45 -07:00 |
|
Andrew Meadows
|
a53cb2e532
|
use _gravity rather than _acceleration
also tweaks and comments about supporting low gravity
|
2016-04-04 11:10:50 -07:00 |
|
Andrew Meadows
|
74058ac049
|
more correct moving test for ballistic kinematics
|
2016-04-03 19:15:16 -07:00 |
|
Andrew Meadows
|
0830c55bcf
|
getLocalEverything->getLocalTransformAndVelocities
|
2016-04-01 17:48:56 -07:00 |
|
howard-stearns
|
cec4175e9d
|
whitespace
|
2016-04-01 15:00:51 -07:00 |
|
howard-stearns
|
b5cbd7720e
|
Lock entity tree on export, and clipboard on import.
|
2016-04-01 14:56:56 -07:00 |
|
Andrew Meadows
|
442b52313f
|
faster kinematic motion calculations
|
2016-04-01 13:14:03 -07:00 |
|
Zach Pomerantz
|
54b8a9278d
|
Guard model texs
|
2016-03-30 14:11:45 -07:00 |
|
Brad Hefta-Gaub
|
6fdedb8f34
|
Merge pull request #7508 from howard-stearns/import-export-parents
Make export/import and copy/paste be parent/child-clean.
|
2016-03-30 09:06:33 -07:00 |
|