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

7941 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
b3bb33e48c Merge remote-tracking branch 'upstream/master' 2013-12-17 20:12:31 -08:00
Philip Rosedale
e6847961f5 reduced damping for thrown balls, turned off screen flash 2013-12-17 20:11:53 -08:00
ZappoMan
634eb29c65 Merge pull request #1399 from ey6es/metavoxels 
First pass at/proof of concept of "metavoxels."
 2013-12-17 19:08:51 -08:00
Andrzej Kapolka
45c31cece3 Removed insertion test code. 2013-12-17 18:23:12 -08:00
Andrzej Kapolka
a90dbe314b Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 18:10:39 -08:00
ZappoMan
a443570106 Merge pull request #1397 from birarda/master 
fix for 8 channel audio output
 2013-12-17 18:04:12 -08:00
Andrzej Kapolka
f7aa464bf2 Somehow, I overwrote this value in Camera. 2013-12-17 17:21:56 -08:00
Andrzej Kapolka
ff2b77d311 Back to a more modest depth. 2013-12-17 17:16:09 -08:00
Andrzej Kapolka
8ddf6297a5 Fixed Xcode warnings. 2013-12-17 17:13:41 -08:00
Andrzej Kapolka
6cffce5b31 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 16:57:25 -08:00
Andrzej Kapolka
e6a41b2003 Proof of concept sphere thing for metavoxels. 2013-12-17 16:56:52 -08:00
Stephen Birarda
c6dc93c28e fix for 8 channel output devices (HDMI capture) 2013-12-17 16:08:38 -08:00
Philip Rosedale
f08354c853 higher speed collisions to trigger a bounce sound 2013-12-17 15:36:26 -08:00
Stephen Birarda
82f035c018 Merge pull request #1394 from ZappoMan/agent_script_engine_refactor 
make Agent class use common ScriptEngine class
 2013-12-17 14:36:35 -08:00
ZappoMan
f469553b8c CR feedback 2013-12-17 14:27:54 -08:00
ZappoMan
88c319a0da remove dead code 2013-12-17 14:15:34 -08:00
ZappoMan
7b3a778fb4 get Agent working with ScriptEngine 2013-12-17 14:13:16 -08:00
ZappoMan
43054ad893 cleanup 2013-12-17 13:56:07 -08:00
ZappoMan
ccd6058412 get abstract menu class to work 2013-12-17 13:55:17 -08:00
Andrzej Kapolka
a5c8531aa1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2013-12-17 13:46:44 -08:00
Andrzej Kapolka
d535d3b115 More progress on getting values in and out of scripts. 2013-12-17 13:44:56 -08:00
ZappoMan
5c946090db Merge branch 'master' of https://github.com/worklist/hifi into agent_script_engine_refactor 2013-12-17 13:34:13 -08:00
ZappoMan
77d29153b6 Merge pull request #1390 from PhilipRosedale/slaps 
throwing from fingertips, less gravity, lighter target rendering
 2013-12-17 13:02:05 -08:00
Philip Rosedale
64d8c7a2e6 Merge pull request #1389 from ZappoMan/particle_blinky_bug 
Particle blinky bug
 2013-12-17 12:55:49 -08:00
Philip Rosedale
ae1cc99f3d throwing from fingertips, less gravity, lighter target rendering 2013-12-17 12:48:59 -08:00
ZappoMan
b724dcf0ba Merge branch 'master' of https://github.com/worklist/hifi into particle_blinky_bug 2013-12-17 12:41:23 -08:00
ZappoMan
11a5ff2eb8 added edited times to particles and don't change local tree if particle has not been edited 2013-12-17 12:39:35 -08:00
Philip Rosedale
1c46b6d482 Merge pull request #1388 from birarda/master 
fix sample delay pull with negative index
 2013-12-17 11:49:37 -08:00
Stephen Birarda
ff0d31857a correct sample delay pulls with negative index 2013-12-17 11:47:50 -08:00
ZappoMan
a2f1b3e325 Merge branch 'master' of https://github.com/worklist/hifi into particle_blinky_bug 2013-12-17 11:35:49 -08:00
ZappoMan
4852aca86c Merge pull request #1386 from PhilipRosedale/slaps 
Hand games are now menu options, hydra hands in fixed L/R orientation, added slaps game
 2013-12-17 11:34:43 -08:00
Philip Rosedale
965f7e5698 Merge pull request #1382 from ZappoMan/particle_palm_collisions 
fix spelling error
 2013-12-17 11:33:12 -08:00
ZappoMan
74d9c05c44 added particle server details to voxel stats dialog 2013-12-17 11:32:20 -08:00
Philip Rosedale
610d0f4680 Merge pull request #1385 from birarda/master 
audio fixes for clipping and off-axis
 2013-12-17 11:25:55 -08:00
Stephen Birarda
bbe525412f fix pulling of delayed samples in audio mixer 2013-12-17 11:22:34 -08:00
Philip Rosedale
35e7cfddba Made drumming and slaps into menu choices from ‘Hand Options’ 2013-12-17 11:20:26 -08:00
Stephen Birarda
8ece758107 spacing fix in Audio.cpp 2013-12-17 11:13:45 -08:00
Philip Rosedale
d6efcce28e Debugging render call for head/hand positions, debugging for ball injection 2013-12-17 11:08:38 -08:00
ZappoMan
95639c7ce7 first cut, not working yet 2013-12-17 10:58:36 -08:00
Stephen Birarda
cc5c04c82f remove doubling of right channel for injected audio 2013-12-17 10:31:32 -08:00
Stephen Birarda
a634881477 have linearResampling handle mono to stereo 48KHz conversion 2013-12-17 09:52:42 -08:00
Stephen Birarda
964558d514 add a QAudioOutput object for local loopback 2013-12-17 09:41:28 -08:00
Philip Rosedale
fc28034f37 hydra hands hard coded to LH and RH controllers, ball debugging 2013-12-17 09:41:13 -08:00
ZappoMan
524a847aa5 fix spelling error 2013-12-17 08:39:23 -08:00
Philip Rosedale
d4bad3421f fix: get velocity from either hand or fingertip according to where ball is thrown from 2013-12-16 21:49:15 -08:00
Philip Rosedale
14d198f930 Merge remote-tracking branch 'upstream/master' into slaps 2013-12-16 21:20:05 -08:00
Philip Rosedale
a159e08850 Merge pull request #1381 from ZappoMan/particle_palm_collisions 
Particle palm collisions
 2013-12-16 21:19:01 -08:00
ZappoMan
e969331f5c implement catching of particles 2013-12-16 20:29:28 -08:00
ZappoMan
8f1fbec057 added versioning to SVO files and Particle inHand support 2013-12-16 19:49:22 -08:00
Andrzej Kapolka
07ed688a8a A few more script bits. 2013-12-16 18:13:29 -08:00