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 |
|
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 |
|
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
|
369fdc5771
|
move audio toolbox into its own class
|
2014-12-16 15:24:57 -08:00 |
|