Jeffrey Ventrella
c1ac3eb320
improving the code for detecting collisions, hand movement and handholding
2013-05-06 15:14:13 -07:00
Jeffrey Ventrella
114dfeacf6
thingy
2013-05-06 14:22:01 -07:00
Jeffrey Ventrella
40771e4c47
thingy
2013-05-06 14:18:14 -07:00
Jeffrey Ventrella
bc15bc2292
Merge remote-tracking branch 'upstream/master'
2013-05-06 13:53:16 -07:00
Stephen Birarda
784fa5882a
closing of serial interface should be conditional on __APPLE__
2013-05-06 13:36:58 -07:00
Stephen Birarda
250df35bc1
resolve conflicts on merge with upstream master
2013-05-06 13:31:50 -07:00
Stephen Birarda
6666229d83
close the serial file descriptor in destructor
2013-05-06 13:25:49 -07:00
Stephen Birarda
49042046de
remove duplicated constructor after merge
2013-05-06 13:20:13 -07:00
Stephen Birarda
6d91e4721e
Merge remote-tracking branch 'upstream/master' into domain-rfd
2013-05-06 13:18:34 -07:00
Stephen Birarda
ee4c55afe7
move SerialInterface constructor to header file
2013-05-06 13:18:06 -07:00
Stephen Birarda
0b810fa4c2
if we fail to open SerialInterface twice then don't keep trying
2013-05-06 13:09:15 -07:00
Stephen Birarda
f3a9dcf777
if we fail to open SerialInterface twice then don't keep trying
2013-05-06 13:08:45 -07:00
Jeffrey Ventrella
6273594f51
made a call to initializeBodySprings at the end of initializeSkeleton
2013-05-06 12:56:31 -07:00
Jeffrey Ventrella
2a1bbcc168
improved avatar gravity code and moved source of gravity vector to main.cpp
2013-05-06 12:35:52 -07:00
Jeffrey Ventrella
40213dfedd
Merge remote-tracking branch 'upstream/master'
2013-05-06 11:31:33 -07:00
Jeffrey Ventrella
5c7fd0fe7d
a few small formatting and glitch fixes
2013-05-06 11:29:18 -07:00
Stephen Birarda
37f1360542
fix spacing for gravity vector
2013-05-06 10:39:36 -07:00
Stephen Birarda
928beac8e0
Merge branch 'master' of github.com:worklist/hifi into invensense
2013-05-06 10:38:53 -07:00
ZappoMan
24dee12d67
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-04 08:25:35 -07:00
ZappoMan
7d1e271c39
fix bug in bogus avatar data file
2013-05-04 08:23:06 -07:00
ZappoMan
5253485261
added TREE_SCALE to default camera farClip
2013-05-04 07:46:42 -07:00
Jeffrey Ventrella
f8762c5e37
added avatar data file stuff that got lost during a merge or something
2013-05-03 16:58:52 -07:00
Jeffrey Ventrella
707d513dac
Merge remote-tracking branch 'upstream/master'
2013-05-03 16:12:01 -07:00
Jeffrey Ventrella
cb8e68f300
fixed a physics bug in avatar body spring (forgot to use deltaTime) - and adjusted various physics constants accordingly.
2013-05-03 16:11:35 -07:00
Stephen Birarda
66e2771135
some cleanup in interface main
2013-05-03 15:58:55 -07:00
Andrzej Kapolka
bc0c1cf5f9
Fixed bug with rendering stars on OS X: was using some weird extension on
...
Apple rather than standard VBOs.
2013-05-03 15:44:51 -07:00
Andrzej Kapolka
c1a3478954
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-03 15:44:14 -07:00
Stephen Birarda
24c1ea5e7f
resolve conflicts on merge with upstream master
2013-05-03 15:37:22 -07:00
Jeffrey Ventrella
85ad5601d7
added avatar shadow
2013-05-03 15:22:01 -07:00
Stephen Birarda
bd3c902b68
remove logging of audio stats
2013-05-03 15:13:38 -07:00
Stephen Birarda
31e9c18346
couple of extra line deletions in main.cpp
2013-05-03 15:09:44 -07:00
Stephen Birarda
da93b596de
some deletion cleanup in main.cpp
2013-05-03 15:08:48 -07:00
Stephen Birarda
1a8564f9d9
store avatar position and yaw in file to restore on relaunch
2013-05-03 15:05:28 -07:00
Stephen Birarda
90a08b4dd8
cleanup in Audio and Util
2013-05-03 14:45:47 -07:00
Andrzej Kapolka
8923057d0e
Compile fix, need to use integer GL uniform.
2013-05-03 13:00:48 -07:00
ZappoMan
8e7dd4ba8f
Merge pull request #187 from ey6es/master
...
Fix for Oculus rendering: we need to resize the render texture when the display is resized.
2013-05-03 12:24:54 -07:00
ZappoMan
f78c59f828
Merge pull request #189 from birarda/pairing
...
basic version of the pairing server
2013-05-03 12:24:29 -07:00
Jeffrey Ventrella
8457b91fe0
cleaned up a bunch of leftover tabs and converted each to 4 spaces
2013-05-03 11:15:49 -07:00
Stephen Birarda
5f26d44fd8
Merge remote-tracking branch 'upstream/master' into pairing
2013-05-03 10:59:34 -07:00
Stephen Birarda
bd6f0d9885
couple of line deletions
2013-05-03 10:58:57 -07:00
Andrzej Kapolka
9dfc6c6590
Fix for fullscreen mode switching: when we reshape, we need to resize the
...
render texture (if it exists).
2013-05-03 10:57:51 -07:00
Jeffrey Ventrella
026ee4345c
Merge remote-tracking branch 'upstream/master'
2013-05-03 10:54:07 -07:00
Jeffrey Ventrella
e0b33e56da
couple of small code cleanups
2013-05-03 10:52:44 -07:00
Andrzej Kapolka
346f213e3b
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/Avatar.cpp
interface/src/Avatar.h
interface/src/main.cpp
2013-05-03 10:31:40 -07:00
Philip Rosedale
f05451b4f1
Merge pull request #186 from ZappoMan/render_voxels_optimization
...
Some more tweaks to test pipeline
2013-05-03 10:27:56 -07:00
Andrzej Kapolka
08350a5d3a
Rather than a command line parameter, provide a menu option for switching
...
to/from fullscreen mode.
2013-05-03 10:22:10 -07:00
Philip Rosedale
1fbc13941d
Fixes per merge (Ventrella)
2013-05-03 10:16:58 -07:00
Andrzej Kapolka
43b5e9430f
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
interface/src/main.cpp
2013-05-03 10:04:50 -07:00
ZappoMan
5710dd750d
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-03 10:01:37 -07:00
ZappoMan
a4f2dc283d
various changes to help debug render pipeline
...
- fixing some cases where TREE_SCALE was not using constant in prep for making TREE_SCALE larger
- added createLine() to VoxelTree
- added axis lines made of voxels to scene
- added corner points made of voxels to scene
2013-05-03 09:58:52 -07:00
