Stephen Birarda
|
23f861f5e2
|
fixes per code review comments
|
2013-05-09 13:30:11 -07:00 |
|
Stephen Birarda
|
cd69297af2
|
some refactoring for member variables in AudioRingBuffer
|
2013-05-09 13:04:42 -07:00 |
|
Stephen Birarda
|
a8eb9187f1
|
underscore the sample length variables in AudioRingBuffer
|
2013-05-09 12:48:20 -07:00 |
|
Stephen Birarda
|
0a6adc7ed3
|
make the audio mixer socket non-blocking so it doesn't halt waiting for data
|
2013-05-09 12:46:59 -07:00 |
|
Stephen Birarda
|
812f877984
|
resolve conflicts on merge with upstream master
|
2013-05-09 12:37:39 -07:00 |
|
Stephen Birarda
|
5ce9b27789
|
Merge remote-tracking branch 'upstream/master' into mixer-crash
|
2013-05-09 12:37:04 -07:00 |
|
Stephen Birarda
|
9ef409b2ef
|
perform send of audio buffer on main thread
|
2013-05-09 12:34:14 -07:00 |
|
birarda
|
b3fb5684b2
|
Merge pull request #260 from birarda/mixer-crash
more fixes for audio mixer crashing:
|
2013-05-09 12:06:24 -07:00 |
|
Stephen Birarda
|
42a50e9bab
|
make sure that the AudioRingBuffer exists before trying to use it
|
2013-05-09 12:05:48 -07:00 |
|
ZappoMan
|
8ef78fde83
|
Merge pull request #259 from birarda/mixer-crash
fix the audio-mixer crash for uninitialized _shouldLoopbackForAgent variable
|
2013-05-09 11:49:42 -07:00 |
|
Stephen Birarda
|
a92571bdee
|
initialize the _shouldLoopbackForAgent variable
|
2013-05-09 11:45:59 -07:00 |
|
birarda
|
983964f5bf
|
Merge pull request #258 from birarda/stacktraces
remove the current un-helpful stacktrace setup
|
2013-05-09 11:22:15 -07:00 |
|
Stephen Birarda
|
d9a5bba1d1
|
remove the unhelpful stack trace setup, using gdb on server for now
|
2013-05-09 11:21:16 -07:00 |
|
ZappoMan
|
a476c8362c
|
Merge pull request #254 from PhilipRosedale/master
Fixed bug with bodies springing into view on startup
|
2013-05-09 11:01:33 -07:00 |
|
ZappoMan
|
4180e92927
|
Merge pull request #257 from ey6es/master
Fix for lighting (move to world space); very beginnings of voxel editing.
|
2013-05-09 11:00:58 -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
|
2b9c2ca9a2
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2013-05-09 10:42:59 -07:00 |
|
Philip Rosedale
|
06a1a41672
|
Merge pull request #256 from birarda/accel
read accelerometer data from the invensense board
|
2013-05-09 10:41:49 -07:00 |
|
Stephen Birarda
|
1c073c1c71
|
correct the accelerometer sensitivity
|
2013-05-09 10:38:02 -07:00 |
|
Stephen Birarda
|
f95ba24f21
|
also read accelerometer data from invensense boards
|
2013-05-09 10:34:40 -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
|
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
|
39c35ea5c4
|
spacing
|
2013-05-08 21:19:33 -07:00 |
|
Philip Rosedale
|
5db7b74c1e
|
spacing
|
2013-05-08 21:19:15 -07:00 |
|
Philip Rosedale
|
2bf9b3e6fd
|
Fixed problem with springy body repositioning on startup
|
2013-05-08 21:18:10 -07: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 |
|