Stephen Birarda
|
2309f30762
|
another typo fix for unix reference to Oculus library
|
2013-05-10 14:21:24 -07:00 |
|
Stephen Birarda
|
4d7d6aba8b
|
use capital L for lib directory for LibOVR
|
2013-05-10 14:15:00 -07:00 |
|
ZappoMan
|
1f85a4a4c9
|
Merge pull request #279 from birarda/oculus
initial setup for oculus pitch, yaw and roll
|
2013-05-10 14:06:10 -07:00 |
|
Stephen Birarda
|
a059e44011
|
resolve conflicts on merge with upstream master
|
2013-05-10 14:01:52 -07:00 |
|
Stephen Birarda
|
9ee3f889ab
|
Merge remote-tracking branch 'upstream/master' into oculus
|
2013-05-10 14:00:10 -07:00 |
|
Stephen Birarda
|
e5fce7d83e
|
remove a useless comment
|
2013-05-10 13:55:26 -07:00 |
|
Stephen Birarda
|
f447abe03b
|
zero the yaw on oculus connect, set head yaw instead of body
|
2013-05-10 13:52:54 -07:00 |
|
Philip Rosedale
|
97f91403a3
|
Merge pull request #278 from ZappoMan/render_voxels_optimization
Implement Partial VBO strategy in copyWrittenDataToReadArrays()
|
2013-05-10 13:50:49 -07:00 |
|
Philip Rosedale
|
06edcb50c5
|
Merge pull request #277 from Ventrella/master
made some improvements to handholding
|
2013-05-10 13:49:09 -07:00 |
|
Jeffrey Ventrella
|
2032264e7e
|
pull avatar from handshake
|
2013-05-10 13:42:51 -07:00 |
|
Jeffrey Ventrella
|
ca5adb791c
|
pull avatars from handholding
|
2013-05-10 13:25:40 -07:00 |
|
ZappoMan
|
b9a023af37
|
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
|
2013-05-10 13:19:06 -07:00 |
|
ZappoMan
|
322cb2ff23
|
implemented partial VBOs support in copyWrittenDataToReadArrays()
|
2013-05-10 13:18:51 -07:00 |
|
Jeffrey Ventrella
|
939665419d
|
made some improvements to handshake
|
2013-05-10 13:04:41 -07:00 |
|
Jeffrey Ventrella
|
eb49a9e4f2
|
hand holding
|
2013-05-10 12:52:39 -07:00 |
|
Jeffrey Ventrella
|
1921e23c4c
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-10 12:46:07 -07:00 |
|
Jeffrey Ventrella
|
9db5d7e202
|
hand holding
|
2013-05-10 12:45:37 -07:00 |
|
birarda
|
aa04a74483
|
Merge pull request #276 from birarda/master
add bearing debug for audio-mixer
|
2013-05-10 12:35:37 -07:00 |
|
Stephen Birarda
|
5a1d0606ce
|
add some debugging to the mixer to track down bearing issue
|
2013-05-10 12:34:31 -07:00 |
|
Jeffrey Ventrella
|
87f8df7e7b
|
...
|
2013-05-10 12:28:46 -07:00 |
|
Jeffrey Ventrella
|
a5496ee99e
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-10 12:24:24 -07:00 |
|
Jeffrey Ventrella
|
685df2c65c
|
thingy
|
2013-05-10 12:23:58 -07:00 |
|
birarda
|
94e5a87057
|
Merge pull request #275 from ey6es/master
Very basic example of how to use Qt menus.
|
2013-05-10 12:21:17 -07:00 |
|
Jeffrey Ventrella
|
9598976894
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-10 12:20:01 -07:00 |
|
Jeffrey Ventrella
|
619c1a843f
|
working on hand holding algo
|
2013-05-10 12:18:49 -07:00 |
|
Andrzej Kapolka
|
012c2c9c9f
|
Changed "Quit" menu item to "Test" (Quit should apparently be added
automatically).
|
2013-05-10 12:11:32 -07:00 |
|
Andrzej Kapolka
|
66a8e40712
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-10 12:09:25 -07:00 |
|
birarda
|
843eba8f69
|
Merge pull request #274 from ZappoMan/master
Fixed menu behavior
|
2013-05-10 12:09:08 -07:00 |
|
Andrzej Kapolka
|
8d0fdcac06
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-10 12:08:50 -07:00 |
|
ZappoMan
|
0888a6605f
|
CR fixes
|
2013-05-10 12:08:43 -07:00 |
|
ZappoMan
|
bfa7c91a7a
|
fixed menu behavior
|
2013-05-10 12:08:03 -07:00 |
|
Andrzej Kapolka
|
5a113fd546
|
Added a stub for a Qt application class that creates a menu (which, since it's
unparented, will only appear on OS X) with a test item connected to a slot.
|
2013-05-10 12:07:47 -07:00 |
|
ZappoMan
|
e84d2696f9
|
fixed menu behavior
|
2013-05-10 12:04:52 -07:00 |
|
Jeffrey Ventrella
|
474423e33f
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-10 11:27:41 -07:00 |
|
Jeffrey Ventrella
|
40e7603e49
|
removed print statements
|
2013-05-10 11:27:07 -07:00 |
|
birarda
|
2f8a0b0c09
|
Merge pull request #273 from PhilipRosedale/master
Re-Added Head Mouse for Invensense
|
2013-05-10 11:20:18 -07:00 |
|
Philip Rosedale
|
7d69eb09c2
|
Merge remote-tracking branch 'upstream/master'
|
2013-05-10 10:55:39 -07:00 |
|
Stephen Birarda
|
2f9c16f495
|
have the oculus drive the body yaw, head pitch, and head roll
|
2013-05-10 10:55:26 -07:00 |
|
Philip Rosedale
|
f8701e6c0c
|
Re-added Head Mouse working correctly with invensense
|
2013-05-10 10:55:05 -07:00 |
|
ZappoMan
|
f9b0d7fce3
|
Merge pull request #272 from ey6es/master
Improvements to voxel editing: show what you'll be adding/removing/coloring, allow adjusting the desired size.
|
2013-05-10 10:49:20 -07:00 |
|
Andrzej Kapolka
|
501aac39da
|
Use isColored, not getShouldRender.
|
2013-05-10 10:46:04 -07:00 |
|
Andrzej Kapolka
|
e6e5b20dee
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-10 10:20:04 -07:00 |
|
Stephen Birarda
|
cc38e4c5c4
|
Merge remote-tracking branch 'upstream/master' into oculus
|
2013-05-10 10:18:36 -07:00 |
|
birarda
|
64148926ce
|
Merge pull request #271 from ZappoMan/master
Fix VoxelSystem::deleteVoxelAt() to correctly update rendered scene
|
2013-05-10 10:18:08 -07:00 |
|
Stephen Birarda
|
04447dfcbd
|
drive body yaw and render pitch with oculus when connected
|
2013-05-10 10:17:21 -07:00 |
|
Stephen Birarda
|
adbca70eba
|
expand the OculusManager to return euler angles
|
2013-05-10 10:16:23 -07:00 |
|
ZappoMan
|
3af8a1b8f4
|
code review fixes
|
2013-05-10 10:03:28 -07:00 |
|
Andrzej Kapolka
|
beadb6a93d
|
Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
interface/src/main.cpp
|
2013-05-10 10:03:05 -07:00 |
|
Andrzej Kapolka
|
f6fcdd78b2
|
Adding/removing voxels at different sizes.
|
2013-05-10 09:53:53 -07:00 |
|
ZappoMan
|
9dc09de75e
|
make VoxelSystem::deleteVoxelAt() work properly
|
2013-05-10 09:32:56 -07:00 |
|