Commit graph

16 commits

Author SHA1 Message Date
tosh
e70efe7481 fixes improper merge / changes 2013-05-20 23:37:06 +02:00
tosh
06288e8366 Merge branch 'master' of git://github.com/worklist/hifi
Conflicts:
	interface/src/Oscilloscope.cpp
2013-05-20 23:15:06 +02:00
Stephen Birarda
6aafcc752d re-arrange member variable constructors for compiler warning 2013-05-20 12:51:21 -07:00
tosh
e99a41f41b revises oscilloscope 2013-05-19 16:28:49 +02:00
tosh
de665c2d48 adjusts names 2013-05-19 13:01:57 +02:00
tosh
4f3f5e1abe clarifies some names 2013-05-18 13:35:06 +02:00
tosh
7115975c41 Merge branch 'master' of git://github.com/worklist/hifi into 19165
Conflicts:
	interface/src/Oscilloscope.cpp
2013-05-17 12:28:34 +02:00
tosh
489a0cb844 adds comments and blank lines to clarify the code 2013-05-16 18:56:32 +02:00
Philip Rosedale
1b039c3755 Transmitter V2 drives the hand, and rendering levels with 'l' shows the hand transmitter data. Physics will need to be tuned. 2013-05-16 00:10:10 -06:00
Philip Rosedale
1a283c3ac0 Improvements to scope display, added framework for echo analysis over multiple frames 2013-05-15 21:15:55 -06:00
Philip Rosedale
2820323567 Fixes from merge 2013-05-15 13:48:55 -07:00
Philip Rosedale
76c5a74876 Added gyro pitch to view, moved onscreen displays around to look nicer. 2013-05-08 19:35:48 -07:00
tosh
41115fc0f1 reimplements oscilloscope and connects output channels 2013-04-26 04:25:58 +02:00
Philip Rosedale
4ed1971276 Made oscilloscope 2 channel, turned on by default (need to fix injecting the last audio buffer tho). 2013-02-13 10:14:31 -08:00
Philip Rosedale
53a3d1f8c9 Added audio waveform oscilloscope, fixing head rendering of other agents and self. 2013-02-12 23:27:36 -08:00
Stephen Birarda
1111e4837e intial restructuring for CMake setup 2013-02-06 18:07:36 -08:00
Renamed from Source/Oscilloscope.cpp (Browse further)