Philip Rosedale
eefd0c36f1
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-09 22:06:57 -07:00
Philip Rosedale
527b65f6a4
Log cleanup. removed star field meridians.
2013-05-09 22:06:32 -07:00
Jeffrey Ventrella
6dfa20976d
Merge remote-tracking branch 'upstream/master'
2013-05-09 17:24:50 -07:00
Philip Rosedale
cdab62c10c
Merge pull request #265 from ZappoMan/render_voxels_optimization
...
Optimized Voxel Rendering Performance by implementing blended VBO strategy
2013-05-09 17:21:05 -07:00
ZappoMan
33fc9f5389
fixed partial VBO updates
2013-05-09 17:01:20 -07:00
Jeffrey Ventrella
c2deba6e39
improved avatar touch code
2013-05-09 15:15:28 -07:00
Philip Rosedale
52337a1fae
Merge remote-tracking branch 'upstream/master'
2013-05-09 15:03:45 -07:00
ZappoMan
7b22300164
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-09 14:39:41 -07:00
Jeffrey Ventrella
3ba93397bd
fixed a bug in menu clicking
2013-05-09 14:37:13 -07:00
ZappoMan
c73d4ddfa4
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-09 14:06:42 -07:00
ZappoMan
f490f3ed53
More work on partial VBO updates still not working 100% correctly
2013-05-09 14:04:08 -07:00
Philip Rosedale
ef1848a68c
Merge remote-tracking branch 'upstream/master'
2013-05-09 14:03:03 -07:00
Philip Rosedale
dd33cedf8d
Removed old serial code for Maple ADC
2013-05-09 14:01:22 -07:00
Jeffrey Ventrella
17c61c88c7
cleaned up avatar slow-down upon nearness; fixed mouse pressed bug;
2013-05-09 13:04:22 -07:00
Andrzej Kapolka
dcd42096a5
Tabs -> spaces.
2013-05-09 10:56:08 -07:00
Andrzej Kapolka
7ff8b84f4c
Return the box face, as well as the distance, from the ray intersection test.
...
Use it to determine which voxel neighbor we create when adding.
2013-05-09 10:46:52 -07:00
Andrzej Kapolka
4a0657fead
Set up the lights after applying the camera transform so that they will be in
...
world, not view, space.
2013-05-09 10:29:15 -07:00
Andrzej Kapolka
0cff127082
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-09 09:56:58 -07:00
Andrzej Kapolka
785e55e06f
Working on voxel editing.
2013-05-09 09:56:35 -07:00
Philip Rosedale
ddc97a6ac9
Merge remote-tracking branch 'upstream/master'
2013-05-08 19:36:45 -07:00
Philip Rosedale
76c5a74876
Added gyro pitch to view, moved onscreen displays around to look nicer.
2013-05-08 19:35:48 -07:00
Jeffrey Ventrella
fc549b73bd
fixed merge conflict
2013-05-08 19:25:23 -07:00
Jeffrey Ventrella
bbd85664d6
Merge remote-tracking branch 'upstream/master'
2013-05-08 19:24:07 -07:00
Jeffrey Ventrella
7a24c50063
put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar renderer
2013-05-08 19:22:21 -07:00
ZappoMan
bf81587e1b
Merge pull request #243 from PhilipRosedale/master
...
Procedural noise support added on client, adds a bit of noise when moving
2013-05-08 17:44:15 -07:00
Philip Rosedale
5052f4af5e
Added render option for avatars, code cleanup.
2013-05-08 17:26:44 -07:00
Philip Rosedale
ebf06187b7
Merge remote-tracking branch 'upstream/master'
2013-05-08 16:16:27 -07:00
Andrzej Kapolka
caeccf59ec
When the stars and the atmosphere are both on, adjust the stars' alpha value
...
based on the distance from the atmosphere.
2013-05-08 13:13:56 -07:00
Andrzej Kapolka
8a21823469
Render the stars, when enabled, before the atmosphere.
2013-05-08 12:11:48 -07:00
Andrzej Kapolka
c34b6df2f4
Merge branch 'master' of https://github.com/worklist/hifi
...
Conflicts:
voxel-server/src/main.cpp
2013-05-08 11:56:03 -07:00
Philip Rosedale
de6627f922
Merge remote-tracking branch 'upstream/master'
2013-05-08 10:40:05 -07:00
Andrzej Kapolka
8d4a74cf03
Render environment -> render atmosphere.
2013-05-08 10:00:31 -07:00
Philip Rosedale
355cff21c5
Merge remote-tracking branch 'upstream/master'
2013-05-08 09:06:13 -07:00
Philip Rosedale
baf64c07dc
Added Procedural audio noise when moving, scaled to velocity
2013-05-08 09:04:38 -07:00
ZappoMan
de969891d8
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 01:19:35 -07:00
ZappoMan
ddf49ffdec
removed addRandomSphere() which was dead code
2013-05-08 00:46:02 -07:00
Andrzej Kapolka
80cdd597f4
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 17:53:27 -07:00
ZappoMan
085bfa384a
Merge pull request #225 from PhilipRosedale/master
...
Added perlin noise example function noiseTest()
2013-05-07 17:53:07 -07:00
ZappoMan
005b2fce35
Merge pull request #223 from Ventrella/master
...
cleaned up a bunch of spacings inside of parentheses
2013-05-07 17:51:43 -07:00
Andrzej Kapolka
7c8a06ed4d
Added wrapper classes for shaders/shader programs to ease the process of
...
compiling, linking, assigning uniforms, etc. They're modeled after the ones
included in QtOpenGL, which we can't use at the moment because they require
a Qt OpenGL context.
2013-05-07 17:40:55 -07:00
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
Philip Rosedale
0ae700d746
Merge remote-tracking branch 'upstream/master'
2013-05-07 12:53:19 -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
