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
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
Andrew Meadows
442b52313f
faster kinematic motion calculations
2016-04-01 13:14:03 -07:00
howard-stearns
5381be6902
Whitespace
2016-03-29 17:06:19 -07:00
howard-stearns
bcb729eac2
Abstract out globalizeProperties.
2016-03-29 15:21:06 -07:00
howard-stearns
b09b9a4a0a
snapshot after using tree from entity item.
2016-03-28 16:58:20 -07:00
Brad Hefta-Gaub
62a56ecbfa
fix typos
2016-03-23 17:45:22 -07:00
Seth Alves
1e02c8d9d3
minimize diff
2016-03-17 17:28:36 -07:00
Seth Alves
cbfde2032c
fix bug which caused observers of a parenting grab to not see the entity in the grabber's hand
2016-03-17 17:09:32 -07:00
ZappoMan
1a17de6dbb
reduce log spam
2016-03-14 14:02:25 -07:00
Brad Hefta-Gaub
35d6afbe77
Merge branch 'master' of https://github.com/highfidelity/hifi into fixSceneNotStable
2016-03-08 14:53:41 -08:00
Brad Hefta-Gaub
6d211dd4e5
first cut at fixing the scene not stable bug
2016-03-08 14:52:21 -08:00
Seth Alves
9346171695
if entity registration isn't default, adjust physics shapes to match
2016-03-04 16:47:30 -08:00
samcake
f12030c1a4
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 18:41:02 -08:00
samcake
31230e81bb
Merge branch 'master' of https://github.com/highfidelity/hifi into red
2016-02-11 10:05:58 -08:00
Seth Alves
ffce38769f
properties hold local velocities, not world-frame ones
2016-02-10 19:16:08 -08:00
Seth Alves
6a646f1c24
put isMoving back and change all uses to isMovingRelativeToParent
2016-02-10 19:01:41 -08:00
Seth Alves
3e71efcdbb
all code that asks isMoving appears to mean relative to parent
2016-02-10 18:21:44 -08:00
Seth Alves
49f2724608
don't return void
2016-02-10 13:49:03 -08:00
samcake
51bacdebdd
Trying to notify the entity changes to the render item correctly, need more work
2016-02-10 11:52:37 -08:00
Seth Alves
9d21c3d549
Merge branch 'master' of github.com:highfidelity/hifi into grab-then-equip
2016-02-10 11:35:25 -08:00
Anthony J. Thibault
727e289ecd
SpatiallyNestable: bug fixes for kinematic entities
...
* Kinematic entities were being simulated with position in the local frame but velocity in the global frame.
* Also, because getVelocity() was returning non-zero values when the parent was moving, kinematic objects were being simulated even if they should have been at rest.
* Bug fix for calculating velocity direction was incorrect, if the parent frame was rotated.
2016-02-09 17:58:54 -08:00
Seth Alves
251810edc5
only suppress location edits when they arrive over the network -- script can still update
2016-02-09 15:03:36 -08:00
Seth Alves
43592fd699
Merge pull request #7048 from hyperlogic/tony/avatar-on-moving-platform
...
Better avatar animation when attached to a moving entity
2016-02-09 14:30:02 -08:00
Anthony J. Thibault
072172b1a2
SpatiallyNestable: now with velocity support!
...
Moved velocity and angularVelocity into the SpatiallyNestable base class.
Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.
MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
2016-02-08 19:43:23 -08:00
Seth Alves
82fcfc1d64
don't apply clock-skew to a lastEdited of 0
2016-02-08 15:31:32 -08:00
Andrew Meadows
959f924b1d
flag entity as changed when changing simulatorID
2016-02-04 13:26:07 -08:00
Andrew Meadows
e3351c05a2
make some methods const
2016-02-04 13:26:06 -08:00
Brad Hefta-Gaub
49bbf42995
Merge pull request #6960 from sethalves/fix-adjust-edit-packet-for-clock-skew
...
don't adjust a time of '0 usecs since epoch' with clock skew in edit packets
2016-01-28 12:31:27 -08:00
ericrius1
cd5e81de36
Validating href for edit.js
2016-01-27 16:02:02 -08:00
Seth Alves
f2ea73d646
don't adjust a time of '0 usecs since epoch' with clock skew in edit packets
2016-01-27 14:12:03 -08:00
Andrew Meadows
a92c512c17
move collision group/mask calculus into EntityItem
2016-01-19 19:52:08 -08:00
Seth Alves
8ba800fda8
Merge pull request #6851 from AndrewMeadows/collisionless2
...
namechange "ignoreForCollisions" to "collisionless"
2016-01-19 11:33:55 -08:00
Andrew Meadows
7fb145e819
namechange ignoreForCollisions --> collisionless
2016-01-19 09:06:17 -08:00
Seth Alves
823428290d
Merge branch 'master' of github.com:highfidelity/hifi into various-fixes
2016-01-18 13:26:45 -08:00
Seth Alves
d6e3b85237
fix javascript access via localPosition and localRotation
2016-01-18 11:15:32 -08:00
Andrew Meadows
952f5b23f6
namechange collisionsWillMove --> dynamic
2016-01-15 15:21:25 -08:00
Andrew Meadows
222398e5cc
no packet version check for collision mask
2016-01-12 15:10:18 -08:00
Andrew Meadows
e1ba4ff0a8
add CollisionMask entity property
2016-01-12 15:08:52 -08:00
Seth Alves
942e77166e
merge from upstream
2016-01-05 11:11:19 -08:00
Seth Alves
40a25f859a
cleanups
2016-01-03 08:00:23 -08:00
Seth Alves
81d3571171
fix getMaximumAACube and getMinimumAACube success return values
2015-12-18 12:04:47 -08:00
Seth Alves
473212e5b7
try to be more coherent about queryAABox meaning
2015-12-17 14:29:41 -08:00
Seth Alves
45d19167c9
fix a couple of missing-parent bugs
2015-12-16 10:09:46 -08:00
Seth Alves
2b800d711f
queryAACube to and from scriptvalues
2015-12-15 15:18:43 -08:00
