Commit graph

2360 commits

Author SHA1 Message Date
Philip Rosedale
c0a54eca14 Added head lean to broadcast data packets, lean now being set from invensense accelerometers. 2013-05-09 15:03:19 -07:00
Philip Rosedale
ef1848a68c Merge remote-tracking branch 'upstream/master' 2013-05-09 14:03:03 -07:00
ZappoMan
3bb40b53cb Merge pull request #262 from Ventrella/master
lots of fixes and a lean fix for Philip...
2013-05-09 14:02:42 -07:00
Philip Rosedale
dd33cedf8d Removed old serial code for Maple ADC 2013-05-09 14:01:22 -07:00
Jeffrey Ventrella
03a24266eb Merge remote-tracking branch 'upstream/master' 2013-05-09 14:01:14 -07:00
Jeffrey Ventrella
8ecfbce15e fixed some small formatting things 2013-05-09 14:00:40 -07:00
ZappoMan
a1a0bf320f Merge pull request #261 from birarda/mixer-crash
de-thread the audio mixer to hopefully resolve its constant restarts
2013-05-09 13:53:16 -07:00
Jeffrey Ventrella
14d47d87d8 thingy 2013-05-09 13:52:03 -07:00
Jeffrey Ventrella
14b943f1f7 added lean code for Philip... 2013-05-09 13:48:05 -07:00
Stephen Birarda
23f861f5e2 fixes per code review comments 2013-05-09 13:30:11 -07:00
Philip Rosedale
dbdd4160cc Added acceleration reading, gravity baseline, and line displays to invensense 2013-05-09 13:29:09 -07:00
Jeffrey Ventrella
b61a9687f8 thingy 2013-05-09 13:14:08 -07:00
Jeffrey Ventrella
07eba1ae88 Merge remote-tracking branch 'upstream/master' 2013-05-09 13:04:45 -07:00
Stephen Birarda
cd69297af2 some refactoring for member variables in AudioRingBuffer 2013-05-09 13:04:42 -07:00
Jeffrey Ventrella
17c61c88c7 cleaned up avatar slow-down upon nearness; fixed mouse pressed bug; 2013-05-09 13:04:22 -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
Jeffrey Ventrella
7cfc9844a3 Merge remote-tracking branch 'upstream/master' 2013-05-09 11:22:55 -07:00
Jeffrey Ventrella
e923f5446d clean up 2013-05-09 11:22:24 -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
d2cccce80a Merge branch 'master' of https://github.com/worklist/hifi 2013-05-09 10:42:36 -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
7a0e582b4f Merge remote-tracking branch 'upstream/master' 2013-05-09 08:49:47 -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
Jeffrey Ventrella
a75f655e40 Merge remote-tracking branch 'upstream/master' 2013-05-08 22:46:57 -07:00
Jeffrey Ventrella
0ac2765b09 cleaned up a few small code thingies; added a check for where avatar velocity updates avatar position; 2013-05-08 22:45:28 -07: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