Commit graph

23 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
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
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
7d9de6d0eb added some TODO comments and some cleanup 2015-01-28 11:03:05 -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
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
9f21b41d3f updates for new DependencyManager API 2014-12-17 18:08:41 -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