Commit graph

8152 commits

Author SHA1 Message Date
Stojce Slavkovski
ee1eb25dfa replace LogDisplay with File logger
- added abstract logger interface
2013-12-22 18:56:53 +01:00
Stojce Slavkovski
3d44ab9939 Dialog layout 2013-12-22 15:06:40 +01:00
Philip Rosedale
9b3973c2e4 removed headers 2013-12-21 18:07:40 -08:00
Philip Rosedale
58a73dfede yet again remove the test _balls now that we have a particle server 2013-12-21 18:06:04 -08:00
ZappoMan
fdb1bf5622 Merge pull request #1426 from PhilipRosedale/master
Fixed chat height
2013-12-21 10:42:58 -08:00
Philip Rosedale
03d192574d typo 2013-12-20 22:57:35 -08:00
Philip Rosedale
bad47bd527 Fixed chat height 2013-12-20 15:33:56 -08:00
Stephen Birarda
10eb8985f4 remove the double catch sound 2013-12-20 15:29:12 -08:00
Stephen Birarda
87ed91677c Merge pull request #1421 from birarda/master
remove bottle options from qt5 formula
2013-12-20 11:03:09 -08:00
Stephen Birarda
276ab3741b remove all bottle options from formula 2013-12-20 11:02:46 -08:00
Stephen Birarda
eadf39872e Merge pull request #1420 from birarda/injected-audio
updated patched qt5 homebrew formula
2013-12-20 10:58:44 -08:00
Stephen Birarda
c116cc0a88 update homebrew qt5 formula with patched 5.2.0 stable 2013-12-20 10:58:23 -08:00
ZappoMan
7a08f6b9a1 Merge pull request #1417 from PhilipRosedale/master
Cleanup and tweaks to make throw/catch better
2013-12-20 08:55:15 -08:00
Philip Rosedale
cf3dc47c18 debug off 2013-12-19 23:16:04 -08:00
Philip Rosedale
b6ac73bb57 merge 2013-12-19 23:12:11 -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
Stephen Birarda
a01a17c30a hook throw and catch sounds to Hand class ball tests 2013-12-19 17:24:30 -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
ZappoMan
979f0936cc Merge pull request #1413 from ZappoMan/bugfixes
CR feedback and remove debug
2013-12-19 15:41:42 -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
3f4b4178ff remove the test injector code from Application 2013-12-19 15:25:39 -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
Philip Rosedale
38b59f96d3 Merge pull request #1412 from ZappoMan/bugfixes
Implement support for adjusting particles to clock skew
2013-12-19 15:01:01 -08:00
Philip Rosedale
9f7e79e3c1 bigger catch radius, tweak sounds, different new ball button 2013-12-19 14:59:15 -08:00
ZappoMan
d71bc248f4 support adjusting particles based on clockSkew 2013-12-19 14:49:58 -08:00
Leonardo Murillo
e1e38eb01a Merge pull request #1411 from murillodigital/master
Missing line feed
2013-12-19 14:32:16 -08:00
Leonardo Murillo
44a24496cc Missing line feed 2013-12-19 16:31:38 -06: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
Philip Rosedale
4a44d798c8 Merge pull request #1410 from ZappoMan/bugfixes
Bug fixes
2013-12-19 10:52:18 -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
Philip Rosedale
77751df992 Revert "Switched voxel size (back) to key +,- because ZoomIn and ZoomOut don’t seem to trigger (at least on my mac)"
This reverts commit d68a551940.
2013-12-19 10:01:55 -08:00