Andrew Meadows
b4edfe2390
no expiry for simulation ownership
2016-02-25 12:07:20 -08:00
Anthony J. Thibault
73ac47724a
Rig: Prevent the hand IK targets from entering the body.
...
Use a 2d circle/circle intersection test to keep the hands outside of the body.
2016-02-17 16:23:18 -08:00
Andrew Meadows
2b91a31919
check for nullptr to avoid crashes
2016-02-11 13:53:01 -08:00
Chris Collins
a4afa03fe5
Merge pull request #7077 from sethalves/clean-up-grab-signaling
...
Clean up grab signaling + various fixes
2016-02-11 10:20:56 -08:00
Seth Alves
6a646f1c24
put isMoving back and change all uses to isMovingRelativeToParent
2016-02-10 19:01:41 -08:00
Andrew Meadows
ac60917b54
sigh... protect againt null MotionStates
2016-02-10 17:58:38 -08:00
Andrew Meadows
fed03edde3
manually removing contact manifolds was a bad idea
2016-02-10 17:58:38 -08:00
Andrew Meadows
532f0683e8
remove all contact info before removing objects
2016-02-10 17:58:38 -08:00
Andrew Meadows
84fb983da7
don't forget to remove from _outgoingChanges
2016-02-10 10:36:35 -08:00
Andrew Meadows
4bcb7b1ba9
more correct profiling
2016-02-10 10:36:34 -08:00
Andrew Meadows
9b467e94da
constify and explicit override
2016-02-10 10:36:34 -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
Seth Alves
d5f3447fbc
when updating queryAACubes for children, use the lastEdited from the parent's properties
2016-02-08 16:22:41 -08:00
Anthony J. Thibault
97bcc54360
CharacterController: separate target velocity from parent velocity.
...
Also, disable damping on the rigidBody used by the CharacterController.
2016-02-08 16:01:36 -08:00
Seth Alves
eb1c159c7e
only setLastEdited on properties to be sent
2016-02-08 15:16:04 -08:00
Seth Alves
5b5ddebb1a
set last-edited when updating a child's queryAACube
2016-02-08 15:09:51 -08:00
Brad Hefta-Gaub
3f0ebf7732
Merge pull request #7031 from AndrewMeadows/simulation-ownership
...
server can clear simulation ownership
2016-02-06 19:19:39 -08:00
Anthony J. Thibault
f13e31c7fc
CharacterController: removed unnecessary code.
2016-02-05 10:53:58 -08:00
Anthony J. Thibault
8ca8550f26
MyAvatar: Standing Takeoff and In-Air Animations
...
Now there are two sets of of jump takeoff and in-air animations.
* Run - Used when the character jumps or falls with a small forward velocity.
* Standing - Used when the character jumps or falls in-place or backward.
CharacterController
* increased takeoff duration to 250 ms
* increased takeoff to fly duration to 1100 ms
* added standing jump and in-air animations
* added 250 milisecond delay between ground and hover, to prevent going into hover when walking over cracks.
* take-off to in-air transitions now use the new snapshotPrev interp type for a smoother tweening.
2016-02-04 17:56:07 -08:00
Andrew Meadows
2da46ff26a
server-side release ownership
2016-02-04 13:26:07 -08:00
Andrew Meadows
91a2f86482
update some comments
2016-02-04 13:26:06 -08:00
Andrew Meadows
e51edaa117
update some comments
2016-02-04 13:26:06 -08:00
Andrew Meadows
861082964e
Merge pull request #7017 from hyperlogic/tony/fly
...
MyAvatar: Improved Jump / InAir / Fly behavior
2016-02-03 12:22:30 -08:00
Stephen Birarda
93530fca72
fix the last of the current override warnings for OS X
2016-02-03 11:08:41 -08:00
Anthony J. Thibault
fff603e4e2
Removed comment
2016-02-03 10:21:27 -08:00
Anthony J. Thibault
6cc3b2b47f
Fixed unused variable warnings on OSX and Linux
2016-02-02 15:04:28 -08:00
Anthony J. Thibault
c4e1509aa2
CharacterController: better debug support of internal state machine
...
Head is no longer visible when flying fast, in first-person HMD mode.
2016-02-02 11:26:18 -08:00
Anthony J. Thibault
8b5cf3e49a
CharacterController: refined state machine.
2016-02-02 11:26:17 -08:00
Anthony J. Thibault
47f3ce3786
CharacterController jump is more reliable.
2016-02-02 11:26:16 -08:00
Anthony J. Thibault
2936811484
Added takeoff animation, WIP
...
Character controller still has some jump/in-air bugs.
2016-02-02 11:26:15 -08:00
Anthony J. Thibault
61c55ebf6c
Updated character controller with a state enumeration
...
Also, adjusted checkForSupport logic such that very slanted walls are not considered support.
2016-02-02 11:26:15 -08:00
Anthony J. Thibault
e9fd439ffd
Added inAir animations
2016-02-02 11:23:46 -08:00
Andrew Meadows
7b5c221ceb
Merge pull request #6956 from hyperlogic/tony/velocity-fix
...
MyAvatar: copy body velocity + hmd follow velocity onto avatar
2016-01-27 14:59:46 -08:00
Anthony J. Thibault
c771c925c8
MyAvatar: copy body velocity + hmd follow velocity onto avatar
...
This was inadvertently removed in a previous PR.
https://github.com/highfidelity/hifi/pull/6895
Also, renamed Velocity stat to Speed.
2016-01-27 11:20:32 -08:00
Seth Alves
1cc0aa18bb
Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube
2016-01-26 13:31:07 -08:00
Anthony J. Thibault
bc9621baab
CharacterController: Improve ground support detection
...
In addition to the existing line probe ground check, also check if the bottom sphere of the capsule is contact with any geometry before going into hover mode.
This should prevent going into the fly animation when standing or walking on collision shapes with small gaps between elements.
2016-01-25 21:54:35 -08:00
Andrew Meadows
86162094c1
Merge pull request #6895 from hyperlogic/tony/hmd-recenter-on-rotation
...
MyAvatar: Recenter when the head turns away from the hips
2016-01-22 14:07:40 -08:00
Andrew Meadows
200676ac68
Merge pull request #6896 from AndrewMeadows/another-crash-fix
...
fix crash when deleting entities quickly
2016-01-22 14:04:46 -08:00
Anthony J. Thibault
8bfa80d5fc
Merge remote-tracking branch 'upstream/master' into tony/hmd-recenter-on-rotation
2016-01-22 13:37:43 -08:00
Anthony J. Thibault
61b760038a
Address feedback from code review
2016-01-22 11:54:28 -08:00
Seth Alves
b6af8ee0cc
Merge branch 'master' of github.com:highfidelity/hifi into avatar-updates-query-cube
2016-01-22 11:46:17 -08:00
Seth Alves
7a3401a8d7
Merge pull request #6867 from AndrewMeadows/collision-group-prep
...
cleanup in preparation for smarter collision grouping
2016-01-22 11:45:42 -08:00
Andrew Meadows
d8fb61e820
fix crash when deleting entities quickly
2016-01-22 10:25:10 -08:00
Anthony J. Thibault
ca8a832818
CharacterController: added hard limit to follow displacement
...
To prevent tunneling when the rigid body cannot reach it's target due to being blocked by a wall or some other obstacle.
Also, added unit tests for physics/BulletUtil rotateVector and clampLength functions.
2016-01-21 17:27:45 -08:00
Brad Hefta-Gaub
1a98ab3fba
Merge pull request #6877 from AndrewMeadows/crash-fix
...
fix interface crash when deleting lots of objects at once
2016-01-21 16:49:21 -08:00
Anthony J. Thibault
a91c181a89
MyAvatar: Recenter when the head turns away from the hips
...
Compute HMD facing moving average.
When the moving average diverges from the hips by more then 45 degrees, recenter the body.
Also, the follow code has been changed, instead of a follow velocity being passed to the CharacterController
a desired target is passed. The CharacterController homes toward it's target based on the time remaining.
Any follow deltas applied to move the avatar's position closer to it's target is stored and re-applied
to the bodySensorMatrix. This centralizes the moving/homing code to one place, the CharacterContoller.
A new FollowHelper class was also introduced, it groups together the data and logic necessary to perform the
re-centering/follow procedure. This "hopefully" makes it easier to maintain.
2016-01-21 16:38:42 -08:00
Seth Alves
872a00d518
entities that are children shouldn't (at this point) be dynamic.
2016-01-21 15:53:47 -08:00
Leonardo Murillo
098b7a4ff3
Merge pull request #6870 from birarda/console
...
Your Stack Manager is now a Server Console
2016-01-21 14:31:34 -06:00
Andrew Meadows
e77189fb1b
keep reference to removed entity until next frame
2016-01-20 17:09:37 -08:00
Andrew Meadows
a92c512c17
move collision group/mask calculus into EntityItem
2016-01-19 19:52:08 -08:00
