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

15627 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
3e2095332f make SkeletonRagdoll::updateMuscles() protected 2014-08-18 12:50:07 -07:00
Andrew Meadows
fe5f9f8fe5 use relative mass when enforcing ContactPoint 2014-08-18 12:49:47 -07:00
Andrew Meadows
54851c5ced add Ragdoll::_accumulatedMovement 2014-08-18 12:49:12 -07:00
Andrew Meadows
432c14408c removed hackery from ContactPoint enforcement 2014-08-14 15:29:57 -07:00
Andrew Meadows
98d27ad2b5 more correct names for ContactPoint API 
renamed (and disabled) the useless enforce() to applyFriction()
changed the buildConstraints() method to more correct name: enforce()
will eventually change how ContactPoint actually works, but later
 2014-08-14 15:17:03 -07:00
Andrew Meadows
60d411ead5 cleanup Ragdoll API (less "ragdoll" qualifiers) 2014-08-14 14:41:51 -07:00
Andrew Meadows
46c91052c9 split SkeletonModel and Ragdoll classes apart 2014-08-14 14:29:03 -07:00
Andrew Meadows
ca4a23e532 use "visible joint positions" for MyAvatar only 2014-08-14 09:21:15 -07:00
Andrew Meadows
ee0d0a1566 remove ragdoll from simulation in dtor 2014-08-14 09:20:53 -07:00
Philip Rosedale
395f643f1b Merge pull request #3277 from AndrewMeadows/ragdoll 
Ragdoll Part 10: a little more stability
 2014-08-13 19:05:01 -07:00
Leonardo Murillo
f3576a74d0 Merge pull request #3279 from birarda/buffer-fix 
change both send and receive socket buffers
 2014-08-13 15:59:53 -07:00
Stephen Birarda
ec260dbab2 change both send and receive socket buffers 2014-08-13 15:50:11 -07:00
Andrew Meadows
f66398d366 adding comment about parameter's purpose 2014-08-13 15:06:34 -07:00
Andrew Meadows
7852321152 merge upstream/master into andrew/ragdoll 2014-08-13 14:52:14 -07:00
Andrew Meadows
3d107cc7e5 less variability in verlet simulation loop count 2014-08-13 14:51:16 -07:00
Andrew Meadows
b177686f74 minor tweak to how ContactPoint is updated 2014-08-13 14:50:25 -07:00
Andrew Meadows
2f1a56a87c ContactPoint tries to help maintain collisions 
so that collision events will continue to update the contact
 2014-08-13 13:48:04 -07:00
Andrew Meadows
bc432aa8e8 use relative masses for ContactPoint contsrtaint 2014-08-13 11:29:54 -07:00
Andrew Meadows
4de43b7cbe cleanup and reordering of code 2014-08-13 11:19:32 -07:00
Leonardo Murillo
08382327b4 Merge pull request #3274 from wangyix/leo_stats 
Added domain setting to make AudioMixer print audiostream stats to stdout every second;  Added per-report prints to jittertester
 2014-08-13 10:43:20 -07:00
Leonardo Murillo
ab4cd71028 Merge pull request #3275 from birarda/oculus-dk2 
integration of Oculus 0.4.1 for DK2 positional tracking
 2014-08-13 09:36:59 -07:00
Stephen Birarda
b055e07d72 look for atls not atl in FindATL 2014-08-13 09:29:49 -07:00
Stephen Birarda
c5ee81f99f Merge branch 'master' of https://github.com/highfidelity/hifi into oculus-dk2 2014-08-13 09:28:10 -07:00
Stephen Birarda
715aa3b8b9 Merge pull request #3276 from birarda/qxmpp-fix 
require QXMPP_LIBRARY to be found for FindQXMPP to succeed
 2014-08-13 09:27:57 -07:00
Stephen Birarda
da7f3d18e4 require QXMPP_LIBRARY to be found for FindQXMPP to succeed 2014-08-13 09:27:44 -07:00
Stephen Birarda
83952cb85c add the FindATL cmake module 2014-08-13 09:22:07 -07:00
Stephen Birarda
1ee58b7bd0 find the ATL library on windows for LibOVR 2014-08-13 09:19:45 -07:00
Stephen Birarda
acda466c76 add atls as requirement for LibOVR 2014-08-13 09:11:46 -07:00
wangyix
737228e7bb another newline 2014-08-12 15:40:58 -07:00
wangyix
3c73fd5e0b forgot newline 2014-08-12 15:39:03 -07:00
wangyix
53d6cdd67c forgot more lines 2014-08-12 15:36:51 -07:00
wangyix
d43c39fd57 forgot a line 2014-08-12 15:28:36 -07:00
wangyix
dc46d6b80f added stdev to jitter tester 2014-08-12 15:27:17 -07:00
Stephen Birarda
4dce4c4919 link to ws2_32.lib if LibOVR is being linked to 2014-08-12 15:23:12 -07:00
Stephen Birarda
4bf7bbe0df if enable VR mode is re-checked then attempt to re-connect to Oculus 2014-08-12 15:20:04 -07:00
wangyix
69d8156f12 merge upstream 2014-08-12 14:52:26 -07:00
Stephen Birarda
ac4d20bb43 repairs to FindLibOVR for OS X new structure 2014-08-12 14:49:30 -07:00
Stephen Birarda
00087e81d8 remove a line of debug that shouldn't have made its way in 2014-08-12 14:44:49 -07:00
Stephen Birarda
a8e17e19a4 resolve conflicts on merge with upstream master 2014-08-12 14:43:30 -07:00
Stephen Birarda
1b5c229dd6 Merge pull request #3273 from PhilipRosedale/master 
Fix bug with first person camera being laggy when flying
 2014-08-12 14:42:07 -07:00
wangyix
184e4b8bde sestets added to jitter tester 2014-08-12 14:38:28 -07:00
Philip Rosedale
9933c011d7 Remove filtered eye position from head 2014-08-12 14:31:40 -07:00
Leonardo Murillo
e12cf9015f Merge pull request #3271 from birarda/take-out-the-trash 
allow CL specific that an optional external be required
 2014-08-12 14:30:17 -07:00
Philip Rosedale
a68af15b82 DDE Face tracker tweaks to start adding long term averaging 2014-08-12 14:26:14 -07:00
Stephen Birarda
75aedae300 integration of positional tracking with DK2 2014-08-12 14:12:13 -07:00
wangyix
406be72f41 per-report stats added to jitter tests 2014-08-12 13:46:55 -07:00
wangyix
0007104b6a stats working 2014-08-12 12:58:30 -07:00
wangyix
446c888242 AudioMixer print added; untested 2014-08-12 12:22:32 -07:00
Thijs Wenker
4ff7ff61e8 OSX compatibility with SDK 0.4.1 2014-08-12 13:25:22 +02:00
Thijs Wenker
87abc6b66a Merge branch 'master' of https://github.com/worklist/hifi 2014-08-12 13:17:32 +02:00