Stephen Birarda
|
339ef93fc4
|
remove no longer needed QDebug includes
|
2014-01-03 09:41:01 -08:00 |
|
Stephen Birarda
|
f24eff33fe
|
open up ASI playSound method to ScriptEngine
|
2014-01-03 09:38:05 -08:00 |
|
Stephen Birarda
|
443c94a88f
|
repairs to AudioMixer and audio injection flow
|
2014-01-02 17:15:46 -08:00 |
|
Stephen Birarda
|
594bd58774
|
add AudioScriptingInterface to expose playSound to JS
|
2014-01-02 15:35:28 -08:00 |
|
Stephen Birarda
|
845176bbc6
|
expose Sound to ScriptEngine
|
2014-01-02 15:14:28 -08:00 |
|
Stephen Birarda
|
8cc4a33ad3
|
repair AudioInjector threading
|
2014-01-02 13:35:56 -08:00 |
|
Stephen Birarda
|
3a45fb8533
|
cleanup new API for sound injection
|
2014-01-02 12:31:01 -08:00 |
|
Stephen Birarda
|
674c19a570
|
leverage new AudioInjector API for throw and catch sounds
|
2014-01-02 12:17:18 -08:00 |
|
Stephen Birarda
|
3123b83d0b
|
audio API changes to allow multiple injections of single sound
|
2014-01-02 11:53:33 -08:00 |
|
Stephen Birarda
|
591876eaf3
|
notify for node kill on NodeList clear
|
2014-01-02 10:01:47 -08:00 |
|
ZappoMan
|
48b2d7d3fa
|
scripting for particle to voxel collisions
|
2013-12-31 11:33:43 -08:00 |
|
ZappoMan
|
651d2d0c81
|
rename voxels and particles scripting interfaces
|
2013-12-31 09:41:35 -08:00 |
|
ZappoMan
|
5057517b78
|
pass scriptable particle on collisions
|
2013-12-30 16:35:58 -08:00 |
|
ZappoMan
|
cd11545613
|
change to setScript() since it does more than update
|
2013-12-30 15:55:46 -08:00 |
|
ZappoMan
|
8e6f924c73
|
add access to Voxels and Particles inside of collision scripts
|
2013-12-30 15:48:50 -08:00 |
|
ZappoMan
|
f4b28041fa
|
first cut at running scripts on particle collisions
|
2013-12-30 14:59:00 -08:00 |
|
Philip Rosedale
|
f4a28850cf
|
Merge remote-tracking branch 'upstream/master'
|
2013-12-19 23:05:37 -08:00 |
|
Philip Rosedale
|
e29b366b7e
|
Merge pull request #1415 from birarda/injected-audio
hook throw and catch sounds to Hand ball tests
|
2013-12-19 17:37:17 -08:00 |
|
Philip Rosedale
|
a6c2334f49
|
Merge pull request #1414 from birarda/injected-audio
C++ API for Audio Injection of samples from URL
|
2013-12-19 16:41:55 -08:00 |
|
Stephen Birarda
|
87e5579e52
|
reinstate delete for starved but started audio ring buffers
|
2013-12-19 15:51:14 -08:00 |
|
Stephen Birarda
|
0446aeb4d3
|
loopback injected sound effects to the node by default
|
2013-12-19 15:44:47 -08:00 |
|
Stephen Birarda
|
80a2bd0844
|
move _shouldLoopbackForNode to PositionalAudioRingBuffer for access in injector
|
2013-12-19 15:44:04 -08:00 |
|
Stephen Birarda
|
8681e66ed3
|
default to max volume, add a bool flag for loopback
|
2013-12-19 15:30:33 -08:00 |
|
Stephen Birarda
|
534010347b
|
add a volume setter to the AudioInjector
|
2013-12-19 15:28:10 -08:00 |
|
Stephen Birarda
|
7ed609633a
|
complete the test injector stub
|
2013-12-19 15:23:31 -08:00 |
|
ZappoMan
|
90a2fd31ef
|
fixed spacing
|
2013-12-19 15:17:29 -08:00 |
|
Stephen Birarda
|
0eb22fdc60
|
Merge branch 'master' of https://github.com/worklist/hifi into injected-audio
|
2013-12-19 15:17:10 -08:00 |
|
Stephen Birarda
|
bdf8c4b9b2
|
implement threaded send for AudioInjector
|
2013-12-19 15:17:03 -08:00 |
|
ZappoMan
|
98e511a71c
|
removed extra debug messages
|
2013-12-19 15:16:43 -08:00 |
|
Philip Rosedale
|
6a941a024d
|
Merge remote-tracking branch 'upstream/master'
|
2013-12-19 15:01:58 -08:00 |
|
ZappoMan
|
d71bc248f4
|
support adjusting particles based on clockSkew
|
2013-12-19 14:49:58 -08:00 |
|
Stephen Birarda
|
2409b5f784
|
complete inital test of AudioInjector API
|
2013-12-19 13:46:37 -08:00 |
|
ZappoMan
|
72649f1ac9
|
adjust flight times correctly in stats tracking
|
2013-12-19 13:29:45 -08:00 |
|
ZappoMan
|
bfbaf265dd
|
first cut at added clockSkew support to nodes and PING/PING_REPLY
|
2013-12-19 13:14:14 -08:00 |
|
Stephen Birarda
|
4c15c54535
|
Merge branch 'master' of https://github.com/worklist/hifi into injected-audio
|
2013-12-19 12:42:06 -08:00 |
|
Stephen Birarda
|
b035f74f94
|
fix for build busters with changed AbstractAudioInterface
|
2013-12-19 12:39:57 -08:00 |
|
Stephen Birarda
|
eac3b6be65
|
add AudioInjector class to pull samples from URL and inject
|
2013-12-19 12:28:37 -08:00 |
|
Philip Rosedale
|
c0f3ec5b6a
|
merge fix
|
2013-12-19 10:55:00 -08:00 |
|
ZappoMan
|
864fc10d3a
|
debug cleanup and change to Particle::update() to handle clock skew slightly better
|
2013-12-19 10:39:42 -08:00 |
|
Stephen Birarda
|
9c39bcba4c
|
Merge branch 'master' of https://github.com/worklist/hifi into injected-audio
|
2013-12-19 10:23:33 -08:00 |
|
ZappoMan
|
26366e9fe7
|
cleanup debug
|
2013-12-19 10:05:20 -08:00 |
|
Philip Rosedale
|
c287e37691
|
Reverted key mapping change since Andrzej fixed the underlying problem.
|
2013-12-19 10:02:43 -08:00 |
|
ZappoMan
|
b48161ae26
|
cleanup debug
|
2013-12-19 09:59:36 -08:00 |
|
ZappoMan
|
e2b7e08398
|
revert back to timestamps, fix a couple other bugs
|
2013-12-19 09:50:53 -08:00 |
|
ZappoMan
|
d430558ea9
|
fix expectedBytes() mismatch between edit packets and normal packets
|
2013-12-18 21:08:34 -08:00 |
|
Philip Rosedale
|
9980065659
|
Merge pull request #1406 from ZappoMan/particle_blinky_bug
Fix Particle Blinkiness on Clock Skew, and remove all global time stamps from wire formats
|
2013-12-18 20:02:38 -08:00 |
|
ZappoMan
|
95df772707
|
make really old 30 seconds not 300
|
2013-12-18 19:36:34 -08:00 |
|
ZappoMan
|
5b36953e81
|
cleanup clockSkew debug options and remove some chatty logs
|
2013-12-18 19:33:52 -08:00 |
|
ZappoMan
|
6e2c0032b5
|
removed dead code
|
2013-12-18 19:22:15 -08:00 |
|
ZappoMan
|
c6933239d9
|
fixed comment
|
2013-12-18 19:21:30 -08:00 |
|