Stephen Birarda
f95ba24f21
also read accelerometer data from invensense boards
2013-05-09 10:34:40 -07:00
Philip Rosedale
507e4241b1
Merge pull request #255 from tschw/19188
...
removes equator, achieves uniform distribution of stars
2013-05-09 08:48:22 -07:00
tosh
395e4a7852
removes equator, achieves uniform distribution of stars implementing rejection sampling, adds UNIX script header
2013-05-09 12:08:19 +02:00
Philip Rosedale
408a21b515
Fixed Eve's missing mouth and the bad triangles!
2013-05-08 20:26:38 -07:00
Philip Rosedale
14f0ecdc51
Lowered avatar drag to allow faster flight, increased drag when near others
2013-05-08 20:07:27 -07:00
Philip Rosedale
4bb8f49132
Added new cooler movement sound that is velocity sensitive.
2013-05-08 20:02:29 -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
ZappoMan
77750a6a54
Merge pull request #252 from Ventrella/master
...
moved orientation back to avatar (let's review the overall architecture of 'shared' things at some point)
2013-05-08 19:30:15 -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
b9781c2191
Merge pull request #251 from ZappoMan/render_voxels_optimization
...
Fix Ryan's render problem (hopefully) and don't crash with too many voxels
2013-05-08 18:50:30 -07:00
ZappoMan
cadc07c63d
merge conflict fix
2013-05-08 18:07:33 -07:00
ZappoMan
5cfbcc5caa
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 18:06:30 -07:00
ZappoMan
244b4a17f7
lowered voxel count so Ryan can run, and handle too many voxels case slightly more gracefully than crashing
2013-05-08 18:06:13 -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
08c48bf6a7
Merge remote-tracking branch 'upstream/master'
2013-05-08 17:27:31 -07:00
Philip Rosedale
5052f4af5e
Added render option for avatars, code cleanup.
2013-05-08 17:26:44 -07:00
Philip Rosedale
af79118468
Merge pull request #248 from ZappoMan/render_voxels_optimization
...
Optimization to removeOutOfView()
2013-05-08 16:58:00 -07:00
Philip Rosedale
ebf06187b7
Merge remote-tracking branch 'upstream/master'
2013-05-08 16:16:27 -07:00
ZappoMan
9bde92fe78
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 15:35:09 -07:00
ZappoMan
4e789dcfbf
Merge pull request #250 from ey6es/master
...
Directory fix for shaders on OS X.
2013-05-08 15:34:55 -07:00
Andrzej Kapolka
da822e5299
We need to adjust the directory on OS X before we attempt to load the shaders.
2013-05-08 15:33:39 -07:00
ZappoMan
b35c88029e
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 15:07:24 -07:00
ZappoMan
4301506f0c
Merge pull request #249 from ey6es/master
...
Fix for build error on OS X.
2013-05-08 15:07:08 -07:00
Andrzej Kapolka
1f58e28b36
Need the ARB suffix on this. I'm surprised it compiled for me!
2013-05-08 15:05:35 -07:00
ZappoMan
5f55d511c5
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 15:01:50 -07:00
Philip Rosedale
5e450827d8
Merge pull request #237 from ey6es/master
...
Added basic environment data and atmosphere rendering.
2013-05-08 15:01:12 -07:00
ZappoMan
9a04f2c00c
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 14:57:20 -07:00
Philip Rosedale
ad25150d62
Merge remote-tracking branch 'upstream/master'
2013-05-08 14:51:52 -07:00
Philip Rosedale
fd5789abb8
Merge remote-tracking branch 'upstream/master'
2013-05-08 14:40:53 -07:00
Philip Rosedale
a9882d054f
Invensense gyros now correctly controlling head motion, code cleanups.
2013-05-08 14:39:41 -07:00
ZappoMan
cb5ccee1e4
CR cleanup
2013-05-08 14:32:55 -07:00
ZappoMan
ed30a03b2e
CR cleanup
2013-05-08 14:30:18 -07:00
ZappoMan
ad67c363ec
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 14:27:37 -07:00
ZappoMan
70557cd51c
Optimized removeOutOfView()
...
- don't recurse down trees that are fully INSIDE of the view frustum, because those nodes
are guaranteed to also be INSIDE
- changes to extraData of the recurse operation to make this possible
- adding debug stats to track how many nodes are inside, outside, intersect
- change call to removeOutOfView() to not call if last elapsed time has not
yet passed since last call (similar to treeToArrays() logic)
2013-05-08 14:24:08 -07:00
ZappoMan
66e416d4dd
added VoxelNode::inFrustum() which returns OUTSIDE, INTERSECT, INSIDE to allow more optimal frustum analysis
2013-05-08 14:23:36 -07:00
ZappoMan
24501e5c68
added contains() and remove() methods
2013-05-08 14:22:03 -07:00
Andrzej Kapolka
1c8b835bb8
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 13:15:21 -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
ZappoMan
0b873dddc8
Merge pull request #244 from Ventrella/master
...
moved Orientation class to shared folder
2013-05-08 12:51:26 -07:00
ZappoMan
ed9a7ae900
Merge pull request #247 from ZappoMan/render_voxels_optimization
...
Use different voxel persist files for local or server mode
2013-05-08 12:22:03 -07:00
ZappoMan
2f3a7f8ea8
use different voxel persist files for local or server mode
2013-05-08 12:19:27 -07:00
Andrzej Kapolka
8a21823469
Render the stars, when enabled, before the atmosphere.
2013-05-08 12:11:48 -07:00
Andrzej Kapolka
4ed7176ff6
Move the sun back up again to match the lighting.
2013-05-08 12:07:21 -07:00
ZappoMan
7a5ce57b4e
added alwaysDisplay mode to PerformanceWarnings class
2013-05-08 12:01:55 -07:00
Andrzej Kapolka
4defeb9feb
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 11:56:27 -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
ZappoMan
22740ade40
Merge pull request #246 from ZappoMan/master
...
debug server file loading
2013-05-08 11:55:53 -07:00
