Andrzej Kapolka
c7e31ec414
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
libraries/shared/src/PacketHeaders.h
2013-05-07 14:44:17 -07:00
Andrzej Kapolka
47f3566929
Wavelengths, switch for environment rendering, far plane adjustment.
2013-05-07 14:40:30 -07:00
Stephen Birarda
92daa8e6e0
revert the type squish
2013-05-07 13:43:07 -07:00
Stephen Birarda
9be92cebdd
revert type squish, spacing, code review comment
2013-05-07 13:41:48 -07:00
Stephen Birarda
d5d9479b65
make eve send her ID to identify with the avatar mixer
2013-05-07 13:38:56 -07:00
Stephen Birarda
0566330a8a
some magic number removals
2013-05-07 12:44:45 -07:00
Andrzej Kapolka
7faa9e4318
More work on atmosphere rendering; rendering now working.
2013-05-07 12:40:15 -07:00
Stephen Birarda
85dfb23fbd
add constant for UNKNOWN_AGENT_ID
2013-05-07 12:39:35 -07:00
Stephen Birarda
83e59b1aa8
more deletions
2013-05-07 12:05:32 -07:00
Stephen Birarda
5c90b4575e
trivial deletions for cleanup
2013-05-07 12:05:25 -07:00
Stephen Birarda
4eeb1ed5b1
have interface clients tell the avatar-mixer and voxel-server what their ID is
2013-05-07 12:05:19 -07:00
Philip Rosedale
be1b803656
Noise Test function, adjust chat position
2013-05-07 10:41:39 -07:00
Philip Rosedale
c7635604a9
Fixes in merge.
2013-05-07 08:40:11 -07:00
Jeffrey Ventrella
65181cb4e0
changed some spacing formatting things
2013-05-06 22:23:16 -07:00
Jeffrey Ventrella
ef76c6ba0a
Merge remote-tracking branch 'upstream/master'
2013-05-06 18:29:42 -07:00
Jeffrey Ventrella
22a0e39d6c
more work on avatar touch, reachable radius, and hand states
2013-05-06 18:29:20 -07:00
Philip Rosedale
631ee8f478
Merge remote-tracking branch 'upstream/master'
2013-05-06 18:23:06 -07:00
Stephen Birarda
55a1e26585
remove the Texture class no longer in use
2013-05-06 18:10:21 -07:00
Jeffrey Ventrella
9fc56a6230
working out avatar touch stuff
2013-05-06 16:59:43 -07:00
Philip Rosedale
ff88d1fc06
Created a drawVector() call that will draw a vector in 3-space with axes for testing
2013-05-06 16:18:27 -07:00
Andrzej Kapolka
2226d722cf
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
libraries/shared/src/PacketHeaders.h
2013-05-06 13:31:46 -07:00
Andrzej Kapolka
b4dd6b57aa
Starting on environment bits.
2013-05-06 13:30:07 -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
928beac8e0
Merge branch 'master' of github.com:worklist/hifi into invensense
2013-05-06 10:38:53 -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
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
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
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
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
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
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
ZappoMan
2b11cad1ab
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-02 22:33:41 -07:00
Philip Rosedale
9716ea9550
Ground plane moved to 0->10 and lines are exactly 1 meter
2013-05-02 22:28:41 -07:00
Philip Rosedale
581365f1f1
Fixes per code review.
2013-05-02 20:51:17 -07:00
Jeffrey Ventrella
c46fc5a861
(1) added avatar tilting while walking; (2) added avatar renderer; (3) tweaked body proportions; (4)
2013-05-02 17:46:10 -07:00
