Commit graph

48 commits

Author SHA1 Message Date
Sam Gateau
d07ab353fc remove glLineWidth completely because it s not available anymore for wide lines in core 2015-08-04 11:57:20 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
ZappoMan
695470b1c1 fix audio scope 2015-07-17 16:30:10 -07:00
ZappoMan
398075e45a hacking on more naked GL 2015-07-16 16:26:28 -07:00
ZappoMan
e39ea72daf removed dead code 2015-07-14 21:25:49 -07:00
Sam Gateau
98f10e72ec fix the wrong function name that happened missing a merge 2015-07-10 15:20:49 -07:00
Brad Davis
a92a7980d7 Restore audio scope 2015-07-09 17:49:25 -07:00
Brad Davis
99c217184b Fixing the mic/camera buttons and the mirror UI buttons 2015-06-19 14:46:39 -07:00
Brad Davis
48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Brad Davis
00d8fe75ab Breaking up overlay into rendering and compositing classes 2015-06-13 17:36:08 -07:00
Atlante45
a44054f9db Make TextureCache::getImageTexture static 2015-05-23 03:24:26 +02:00
Bradley Austin Davis
fc73676b4d Merge branch 'master' into plugins_pt1 2015-05-06 11:43:25 -07:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
David Rowe
bc05159504 Add face tracking toggle button beside microphone toggle button 2015-04-30 23:14:22 -07:00
ZappoMan
af43ba3444 used a registered quad for the audio box since its color constantly changes 2015-02-25 15:21:24 -08:00
ZappoMan
a89691fc66 switch GLCanvas back to being owned by Application 2015-02-25 12:11:35 -08:00
Andrew Meadows
599ef68df8 fix for scratchy audio on windows 2015-02-20 08:26:11 -08:00
Andrew Meadows
57797329d1 do sample size arithmetic before scaling by sizeof 2015-02-16 12:14:03 -08:00
Atlante45
4562c29be8 Merge branch 'master' of https://github.com/highfidelity/hifi into android
Conflicts:
	interface/src/avatar/Hand.cpp
2015-01-30 12:02:11 -08:00
ZappoMan
2f4e98082b remove glColor calls related to text rendering 2015-01-28 13:54:48 -08:00
ZappoMan
7d9de6d0eb added some TODO comments and some cleanup 2015-01-28 11:03:05 -08:00
Stephen Birarda
b2a9cdde8b migrate Audio header in AudioToolBox 2015-01-21 12:04:33 -08:00
Stephen Birarda
429d660dd6 migrate Audio includes to AudioClient 2015-01-21 12:04:06 -08:00
Stephen Birarda
0eced09f1d intial removal of Audio to audio-client 2015-01-21 11:49:06 -08:00
ZappoMan
bddb7856af more work 2015-01-19 13:34:09 -08:00
ZappoMan
db94949649 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
2015-01-14 17:55:03 -08:00
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