Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 09:18:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33997 commits 25 branches 0 tags 1.1 GiB
Commit graph

677 commits

Author SHA1 Message Date
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
Andrew Meadows
0c5b4115ed Merge pull request #6221 from huffman/physics-substep-fix 
Physics substep fix
 2015-10-29 12:39:15 -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
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
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