Commit graph

15903 commits

Author SHA1 Message Date
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
wangyix
7f53ae0e4f fixed warnings 2014-08-12 12:22:13 -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
wangyix
8565e93ba4 more test code (10% drop both directions) 2014-08-12 10:50:34 -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
Philip Rosedale
0e72c6a0b6 Merge pull request #3269 from ey6es/metavoxels
Script access for heightfield heights, ray intersection against heightfields, basic color and height brush tools.
2014-08-12 00:40:14 -07:00
Philip Rosedale
32c4039e53 Merge branch 'master' of https://github.com/worklist/hifi 2014-08-12 00:21:47 -07:00
David Rowe
fbaeeef014 Merge branch 'master' into 19840
Resolved conflicts in editModels.js
2014-08-11 20:59:37 -07:00
Ryan Huffman
cb76e3ead0 Merge branch 'master' of github.com:highfidelity/hifi into 19907 2014-08-11 18:44:31 -07:00
Ryan Huffman
4852fcc034 Add red border to main window when not connected to domain 2014-08-11 18:43:49 -07:00
Ryan Huffman
0296d0deeb Add domain connection status to window title 2014-08-11 18:43:26 -07:00
Ryan Huffman
d1672b510d Add DomainHandler::disconnectedFromDomain signal 2014-08-11 18:41:07 -07:00
wangyix
a31d53544b repetition-with-fade seems good; continue testing 2014-08-11 17:58:01 -07:00
Ryan Huffman
6437ca1b50 Update commands for speechControl.js 2014-08-11 16:52:06 -07:00
wangyix
e276d15ed4 repetition-with-fade implemented; testing interface crash 2014-08-11 16:25:43 -07:00
Andrzej Kapolka
10315f15d4 Simplify image loading. 2014-08-11 15:15:33 -07:00
Andrew Meadows
2918feddf0 reduce acceptable error for ragdoll simulation 2014-08-11 14:51:42 -07:00
Andrzej Kapolka
ffe87ad8c6 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-08-11 14:32:24 -07:00
Andrzej Kapolka
8804fa3710 Switch to PNG encoding, send only the changed portion of the image for deltas. 2014-08-11 14:29:53 -07:00
Atlante45
96ee9e3f75 Work on Recording structure 2014-08-11 13:54:36 -07:00
AndrewMeadows
0650169c25 Merge pull request #3270 from chansensturm/audio-filter
Added support for biquad, parametric, and multi-band filter eq
2014-08-11 12:22:40 -07:00
Craig Hansen-Sturm
3d95f28fb9 added apache licensing/removed implicit double<->float conversions/addressed style guide issues 2014-08-11 11:51:49 -07:00
wangyix
1f011bfe9d repetition-with-fade option added, not implemented 2014-08-11 11:22:37 -07:00
David Rowe
53602c2ef2 Miscellaneous tidying 2014-08-11 10:55:31 -07:00
David Rowe
0b979d2e1e Disabled SVO model uploading: server doesn't support SVO file uploads 2014-08-11 10:54:46 -07:00