Seth Alves
|
508ae276c6
|
enable -Wdouble-promotion
|
2015-06-16 18:23:10 -07: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
|
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
|
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
|
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 |
|