Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 02:25:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2381 commits 71 branches 56 tags 1.2 GiB
Commit graph

2381 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
a56ad3ec28 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-09 17:23:41 -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
e28c246efb Merge pull request #263 from PhilipRosedale/master 
Removed old maple serial code (we are now using Invensense), added acceleration and gravity
 2013-05-09 17:20:06 -07:00
ZappoMan
2128cb8bff get rid of dead code 2013-05-09 17:10:25 -07:00
ZappoMan
33fc9f5389 fixed partial VBO updates 2013-05-09 17:01:20 -07:00
Philip Rosedale
e631208850 Merge remote-tracking branch 'upstream/master' 2013-05-09 15:06:36 -07:00
Philip Rosedale
52337a1fae Merge remote-tracking branch 'upstream/master' 2013-05-09 15:03:45 -07:00
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
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
83bf356d06 Merge pull request #264 from Ventrella/master 
fixed menu click ooption
 2013-05-09 14:38:58 -07:00
Jeffrey Ventrella
3ba93397bd fixed a bug in menu clicking 2013-05-09 14:37:13 -07:00
ZappoMan
3aa862fa34 removed some debug messages 2013-05-09 14:19:42 -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
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
Philip Rosedale
44c5f51f73 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-09 11:07:08 -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
Philip Rosedale
62b8a0760e Merge branch 'master' of https://github.com/worklist/hifi 2013-05-09 10:45:43 -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