Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 18:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15802 commits 71 branches 56 tags 1.2 GiB
Commit graph

15802 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
a2e7c9b75c Update build for speechRecognizer 2014-08-13 14:53:26 -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
Andrzej Kapolka
8c42a3a848 Ray query fix. 2014-08-13 11:30:05 -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
Andrzej Kapolka
56c6c3c972 Working on the height/ray queries. 2014-08-13 11:05:48 -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
David Rowe
8c913fe8c1 Add progress dialog and ability to cancel during the model upload 2014-08-13 10:23:59 -07:00
Andrzej Kapolka
d00efe7f6d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-13 10:07:24 -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
Andrzej Kapolka
9c2d4776f9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-12 18:21:23 -07:00
Andrzej Kapolka
21d6c3c48a More work on edge rejiggery. 2014-08-12 18:21:04 -07:00
Atlante45
73a3a13c59 More recording work 2014-08-12 18:15:48 -07:00
Atlante45
792f779bbf Hooked up MyAvatar to playbacks 2014-08-12 16:16:01 -07:00
Atlante45
ff0a5df2d6 Joint rotations manipulation helper 2014-08-12 16:12:34 -07:00
Atlante45
18ff497443 Added all relevant curves to RecordingFrames 2014-08-12 16:11:53 -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
Andrzej Kapolka
ee01d85b5e Attempting to remove some number magic. 2014-08-12 12:01:07 -07:00
Andrzej Kapolka
24cc90c1db Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-12 10:57:51 -07:00
Andrzej Kapolka
2c0f8ff57e Working on rejiggering the heightfield tiles. 2014-08-12 10:56:15 -07:00
Thijs Wenker
4ff7ff61e8 OSX compatibility with SDK 0.4.1 2014-08-12 13:25:22 +02:00