Stephen Birarda 41c6220731 resolve conflicts on merge with upstream/master		2015-07-31 17:27:23 -07:00
..
audio
avatar	Remove avatar->shift hips for idle animations.	2015-07-29 15:27:50 -07:00
devices	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-29 14:04:20 -07:00
octree	resolve conflicts on merge with upstream/master	2015-07-31 17:27:23 -07:00
scripting	Fix setting WebWindow's width and height	2015-07-24 10:43:24 -07:00
ui	resolve conflicts on merge with upstream/master	2015-07-31 17:27:23 -07:00
AbstractLoggerInterface.h
Application.cpp	resolve conflicts on merge with upstream/master	2015-07-31 17:27:23 -07:00
Application.h	resolve conflicts on merge with upstream/master	2015-07-24 15:40:35 -07:00
Bookmarks.cpp
Bookmarks.h
Camera.cpp
Camera.h
DiscoverabilityManager.cpp
DiscoverabilityManager.h
FileLogger.cpp
FileLogger.h
FileUtils.cpp
FileUtils.h
GLCanvas.cpp
GLCanvas.h	REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend	2015-07-30 15:07:36 -07:00
InterfaceActionFactory.cpp
InterfaceActionFactory.h
InterfaceLogging.cpp
InterfaceLogging.h
LODManager.cpp
LODManager.h
main.cpp
MainWindow.cpp
MainWindow.h
Menu.cpp	Remove avatar->shift hips for idle animations.	2015-07-29 15:27:50 -07:00
Menu.h	Remove avatar->shift hips for idle animations.	2015-07-29 15:27:50 -07:00
ModelPackager.cpp	Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives.	2015-07-22 22:34:45 +02:00
ModelPackager.h
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
Physics.cpp
Physics.h
ScriptHighlighting.cpp
ScriptHighlighting.h
ScriptsModel.cpp
ScriptsModel.h
ScriptsModelFilter.cpp
ScriptsModelFilter.h
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
Stars.cpp	fixing the stars again	2015-07-29 16:27:45 -07:00
Stars.h
UIUtil.cpp
UIUtil.h
Util.cpp	remove non-batch versions of GeometryCache renderXYZ() methods	2015-07-23 07:42:58 -07:00
Util.h	remove non-batch versions of GeometryCache renderXYZ() methods	2015-07-23 07:42:58 -07:00
world.h