Commit graph

71 commits

Author SHA1 Message Date
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Atlante45
38729c5790 Made dependencies inherit from Dependency 2015-01-13 20:38:01 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
ZappoMan
873403a333 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
	interface/src/Audio.cpp
	interface/src/Audio.h
	interface/src/Menu.cpp
	interface/src/Menu.h
2015-01-06 12:27:16 -08:00
Stephen Birarda
5fadfa8c17 remove doubled friend declaration, is in macro 2015-01-06 09:35:11 -08:00
Stephen Birarda
9f21b41d3f updates for new DependencyManager API 2014-12-17 18:08:41 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -08:00
Stephen Birarda
a99589f6a4 fix some indentation and a conditional 2014-12-16 17:06:59 -08:00
Stephen Birarda
b7099442c1 repair interaction between AudioNoiseGate and Audio 2014-12-16 16:50:13 -08:00
Stephen Birarda
9491b8230b remove AudioNoiseGate destructor 2014-12-16 16:39:57 -08:00
Stephen Birarda
d83718fe8d cleanup separated AudioNoiseGate 2014-12-16 16:39:18 -08:00
Stephen Birarda
be184719b5 move the audio noise gate to its own class 2014-12-16 16:31:29 -08:00
Stephen Birarda
369fdc5771 move audio toolbox into its own class 2014-12-16 15:24:57 -08:00
Stephen Birarda
0f18a9651b replace audio with AudioIOStatsRenderer in ApplicationOverlay 2014-12-16 14:53:36 -08:00
Stephen Birarda
1db12453d4 move audio stats into member of Audio 2014-12-16 14:47:24 -08:00
Stephen Birarda
60447e48cb handle input from Audio class in AudioScope 2014-12-16 13:29:42 -08:00
Stephen Birarda
3c6c37710d hook AudioScope to new Dependency Audio 2014-12-16 13:03:46 -08:00
Stephen Birarda
a9eaa4b9f7 more decoupling of Audio from Interface 2014-12-16 12:43:06 -08:00
Stephen Birarda
6fd55e6f42 make Audio class use DependencyManager 2014-12-16 12:31:01 -08:00
Stephen Birarda
fba256692f rename variables in AudioScope 2014-12-16 12:04:26 -08:00
Stephen Birarda
c734bc89a3 move the audio scope into its own class 2014-12-16 11:54:59 -08:00