Seth Alves
cf83ca22bb
change how kinematic objects get data back to entity when an action is active
2015-10-30 15:30:54 -07:00
Andrew Meadows
f652e983a9
flag kinematic objs when changed in stepSimulation()
2015-10-30 14:53:29 -07:00
Howard Stearns
28246c1951
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-30 13:21:56 -07:00
Clément Brisset
317674c89a
Merge branch 'grab' of https://github.com/sethalves/hifi
2015-10-30 11:13:56 -07:00
Seth Alves
93503d0a21
make kinematic grab set entities kinematic in bullet and update entity position
2015-10-30 11:03:13 -07:00
Brad Hefta-Gaub
126f68114b
Merge pull request #6241 from huffman/fix-physics-substep-warning
...
Fix warning in ThreadSafeDynamicsWorld
2015-10-30 09:37:55 -07:00
Ryan Huffman
84869c512b
Fix mis-renamed method names
2015-10-30 09:30:22 -07:00
Ryan Huffman
7a4787a79c
Rename stepSimulation to stepSimulationWithSubstepCallback to fix warning
2015-10-30 09:21:13 -07:00
Brad Hefta-Gaub
a149a2dd60
fix some warnings
2015-10-30 00:19:14 -07:00
Howard Stearns
c2873ef720
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-29 22:17:31 -07:00
Clément Brisset
e818028043
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-10-29 15:53:44 -07:00
Andrew Meadows
0c5b4115ed
Merge pull request #6221 from huffman/physics-substep-fix
...
Physics substep fix
2015-10-29 12:39:15 -07:00
Howard Stearns
308fd0cf7e
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-29 11:14:31 -07:00
Ryan Huffman
49877c2dff
Move _hasOutgoingChanges in onSubStep to previous location
2015-10-29 10:19:18 -07:00
Andrew Meadows
f9012d5051
Merge pull request #6187 from sethalves/fix-actions-ttl
...
fix actions bug
2015-10-29 09:30:21 -07:00
Howard Stearns
8e83943efd
Don't play other avatar's collision sounds.
...
https://app.asana.com/0/32622044445063/61104546898252
2015-10-28 15:43:36 -07:00
Andrew Meadows
afec2a9771
fix whitespace
2015-10-28 09:42:55 -07:00
Andrew Meadows
c9cd336400
fix for bad contacts after changing avatar models
2015-10-27 15:01:48 -07:00
Andrew Meadows
43aac813da
more prep for shifting avatar during HMD motion
2015-10-27 13:15:38 -07:00
Andrew Meadows
a1f1e50431
split CharacterController btw phys and interface
2015-10-27 13:15:38 -07:00
Seth Alves
4c64da9ce5
try to avoid negative roll-over when moving to or from server time
2015-10-27 10:27:32 -07:00
Seth Alves
0dff037f56
fuck you, const!
2015-10-26 13:55:07 -07:00
Seth Alves
8d0aaed41a
fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl'
2015-10-26 13:50:21 -07:00
Ryan Huffman
837430329b
Fix collision start/end in single physics simulation to be lost
2015-10-26 13:02:17 -07:00
Seth Alves
f3c61a823e
try harder to get children flags right when something moves. added worldToLocal methods
2015-10-23 16:58:09 -07:00
Ryan Huffman
001400908d
Add automatic CCD activation to the physics engine
2015-10-23 13:37:49 -07:00
Seth Alves
6f30a3c178
new method -- ObjectMotionState::getBodyLinearVelocityGTSigma
2015-10-19 13:56:30 -07:00
Seth Alves
113321184d
if model RegistrationPoint doesn't match entityItem's, update it
2015-10-19 12:21:26 -07:00
Seth Alves
ac99005602
reverting a change to try to see sticking problem again
2015-10-19 12:13:08 -07:00
Seth Alves
f96e9eb1e8
fuck you, const!
2015-10-19 12:04:55 -07:00
Seth Alves
46e5bf0435
take entity-server clock-skew into account when handling action expiration times
2015-10-19 11:59:03 -07:00
Seth Alves
2bdcb256d8
try another way of fixing held object snagging at slow velocity
2015-10-19 10:26:37 -07:00
Seth Alves
26dcaeb056
try another way of fixing held object snagging at slow velocity
2015-10-19 10:10:43 -07:00
Seth Alves
fbe3cb9511
try another way of fixing held object snagging at slow velocity
2015-10-19 09:56:51 -07:00
Seth Alves
742e48b0c8
try another way of fixing held object snagging at slow velocity
2015-10-19 09:48:34 -07:00
Seth Alves
b18bb1e076
Merge pull request #6084 from AndrewMeadows/physics-cleanup
...
move DIRTY_FLAGS out of EntityItem namespace
2015-10-16 07:22:40 -07:00
Seth Alves
64c5cde2d2
further unmangle branch split
2015-10-15 10:33:58 -07:00
Seth Alves
e571cb7ca4
more lock adjustments
2015-10-15 10:22:25 -07:00
Andrew Meadows
fa17b77d70
move DIRTY_FLAGS out of EntityItem namespace
2015-10-15 09:34:09 -07:00
Seth Alves
d72152da87
more locking
2015-10-14 13:01:56 -07:00
Seth Alves
07a4dc3a7f
more lock fixing
2015-10-14 12:49:06 -07:00
Seth Alves
fa2bf2b2d9
tighten up locking in actions
2015-10-14 11:43:03 -07:00
Seth Alves
742cc0f511
rename a function
2015-10-14 06:17:55 -07:00
Seth Alves
fcbb107bc0
tweak
2015-10-13 14:13:53 -07:00
Seth Alves
8b72f6e7c6
tweak
2015-10-13 13:50:43 -07:00
Seth Alves
54eac099b9
tweak
2015-10-13 12:52:53 -07:00
Seth Alves
83780296de
don't send physical property updates if there's an action on the object
2015-10-13 12:12:57 -07:00
Brad Davis
6f5f6450df
Cleanup CMake files
2015-10-11 00:01:03 -07:00
Atlante45
bcd148cb87
Construct entity properties at definition
2015-10-09 12:23:19 -07:00
Andrew Meadows
76264ae704
fix formatting
2015-10-07 14:17:21 -07:00
Howard Stearns
8153ad7f44
Merge pull request #5967 from AndrewMeadows/collision-group-hack
...
allow physical objects to be set collisionless
2015-10-02 16:08:52 -07:00
Andrew Meadows
09ac01a5e7
remove cruft from old verlet avatar simulation
2015-10-01 13:44:50 -07:00
Andrew Meadows
ef7e908675
allow dynamic objects to be set collisionless
2015-10-01 08:56:04 -07:00
Seth Alves
b34ea6ded4
store action lifetime as an expires integer
2015-09-30 13:46:23 -07:00
Seth Alves
7c6846c260
add lifetime and tag arguments to actions
2015-09-30 13:09:41 -07:00
Seth Alves
e65ef93663
Merge pull request #5778 from jherico/homer
...
Fixing some entity race condition crashes
2015-09-11 17:54:53 -07:00
Howard Stearns
4ffe2d0747
Merge pull request #5786 from AndrewMeadows/ik-with-constraints
...
inverse kinematics works with rotation constraints
2015-09-11 17:34:50 -07:00
Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Brad Davis
e458eb7ae9
Merge pull request #5734 from sethalves/octree-shared-pointers
...
octree uses shared pointers
2015-09-11 16:00:04 -07:00
Andrew Meadows
334fdeefd5
remove old incorrect comment
2015-09-11 13:22:11 -07:00
Brad Davis
2a15726aaf
More PR comments
2015-09-10 22:29:40 -07:00
Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
Seth Alves
31fcd55d47
octree uses shared pointers
2015-09-08 11:59:48 -07:00
Howard Stearns
0065c64b31
Snapshot of no-judder, before cleanup.
2015-09-07 09:57:05 -07:00
Howard Stearns
d3106de7c1
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-04 14:32:58 -07:00
Brad Hefta-Gaub
21afafd4e6
fix hold action with zero offsetLength
2015-09-04 14:07:12 -07:00
Howard Stearns
8cf71f285d
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-01 16:03:40 -07:00
Seth Alves
92b5fe3457
fix thinko -- if the changes didn't happen, put them back on the list and don't clear their dirty flags
2015-08-28 10:31:28 -07:00
Howard Stearns
8e3d8cd31c
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-08-26 16:08:42 -07:00
Howard Stearns
475331a97d
Sprinkle locks everywhere.
2015-08-26 16:08:07 -07:00
Seth Alves
696e34b996
Merge branch 'linux-memory-debugger' of github.com:sethalves/hifi into polyvox
2015-08-26 11:11:41 -07:00
Seth Alves
695ffa29c7
call setup_memory_debugger from common macros rather than from every CMakeLists.txt file
2015-08-26 11:09:59 -07:00
Seth Alves
caafea6e3b
allow compound collision shapes with less than 2 sub-shapes
2015-08-25 11:46:34 -07:00
Seth Alves
dc31c7e233
back out previous attempt at theading polyvox code. lay groundwork for threading that can be reasoned about
2015-08-23 08:14:05 -07:00
Seth Alves
6db0442fda
allow for asynchronous building of collision shape
2015-08-21 10:48:26 -07:00
Seth Alves
c25082d86f
use -fsanitize=address in all code rather than just the top-level links
2015-08-20 10:14:16 -07:00
Andrew Meadows
9ee49c3e1e
Merge pull request #5551 from sethalves/quiet-compiler
...
Quiet compiler
2015-08-18 09:54:29 -07:00
Seth Alves
b25f6df7af
quiet compiler
2015-08-11 10:22:56 -07:00
Bradley Austin Davis
1db4162371
Merge branch 'master' into plugins
2015-07-23 13:42:03 -04:00
Andrew Meadows
bf3ff8daea
fix crash for convex hull of co-planar points
2015-07-22 15:06:10 -07:00
Brad Davis
5744200f64
Merge remote-tracking branch 'upstream/master' into plugins
...
Conflicts:
interface/CMakeLists.txt
interface/src/Application.cpp
interface/src/Application.h
interface/src/avatar/MyAvatar.h
2015-07-20 19:21:02 -07:00
Stephen Birarda
8b5026a817
cleanup some warnings
2015-07-15 11:20:55 -07:00
Anthony J. Thibault
aa66691a73
Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers
2015-07-14 12:37:09 -07:00
Anthony J. Thibault
dbc18ce51f
merge with plugins
2015-07-14 12:30:47 -07:00
Stephen Birarda
821c16cbc4
resolve conflicts on merge with uptream/master
2015-07-14 09:52:20 -07:00
Anthony J. Thibault
158c1c6aa8
Removed some debugging prints and drawing
2015-07-13 20:41:19 -07:00
Seth Alves
848e5bcebf
this code can be called for hold actions if they end up in an svo save. revert a line from a previous commit
2015-07-12 13:43:21 -07:00
Andrew Meadows
9ce9c541de
fix activation of object when action changes
2015-07-10 18:45:40 -07:00
Andrew Meadows
294c1ba367
always serialize ACTION_TYPE_SPRING
2015-07-10 12:25:11 -07:00
Andrew Meadows
56f00a526d
cleanup of ObjectActionSpring
2015-07-10 12:25:11 -07:00
Andrew Meadows
90ae1fea8b
handle case where action params are missing
2015-07-10 12:25:11 -07:00
Seth Alves
85f206d49d
if an action is updating its own arguments, cause updates to go out over network
2015-07-09 14:13:01 -07:00
Stephen Birarda
1b4e333c49
Merge pull request #3 from birarda/atp
...
initial networking API changes for new protocol
2015-07-09 16:51:37 -04:00
Andrew Meadows
55207a8fb1
enforce coding standards
2015-07-09 11:59:28 -07:00
Andrew Meadows
ccf14b2e50
fix syntax error typo
2015-07-09 11:43:57 -07:00
Andrew Meadows
612e9649d8
fix update logic of ObjectActionOffset
2015-07-09 11:35:54 -07:00
Andrew Meadows
46bca30698
MotionState reports zero velocity for slow objects
...
This reduces the number of updates for an Entity that is effectively
at rest due to a balance between some spring action and gravity, but
nevertheless has a slight non-zero velocity at the end of each
simulation step.
2015-07-09 11:34:27 -07:00
Stephen Birarda
da3502eb6c
resolve conflicts on merge with upstream/master
2015-07-08 18:41:48 -07:00
Andrew Meadows
58c32dbf20
remove whitespace from end of lines
2015-07-08 11:30:04 -07:00
Stephen Birarda
74940a2132
replace lingering PacketTypes in old format
2015-07-08 10:18:13 -07:00
