Seth Alves e06461ea15 Merge pull request #5724 from hyperlogic/tony/anim-debug-draw-improvements ... AnimDebugDraw Improvements		2015-09-08 17:07:51 -07:00
..
audio	remove glLineWidth completely because it s not available anymore for wide lines in core	2015-08-04 11:57:20 -07:00
avatar	AnimDebugDraw Improvements	2015-09-04 16:01:05 -07:00
devices	Fixing build problem with 3d connexion	2015-08-23 09:32:58 -07:00
octree	thread the AssetUpload so it doesn't take over main	2015-08-27 10:23:02 -07:00
scripting	Auto refresh entities list upon display of Entities tab	2015-08-27 13:32:00 -07:00
ui	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
AbstractLoggerInterface.h
Application.cpp	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-09-08 08:40:51 -07:00
Application.h	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
Bookmarks.cpp
Bookmarks.h
Camera.cpp
Camera.h
CrashHandler.cpp	Reword dialog	2015-08-25 14:24:15 -07:00
CrashHandler.h	Implement crash option that deletes Interface.ini	2015-08-24 13:36:03 -07:00
DiscoverabilityManager.cpp
DiscoverabilityManager.h
FileLogger.cpp	Use a constant log file and rollover accumulated logs to a new file based on startup, time or size	2015-09-02 21:56:58 -07:00
FileLogger.h	Use a constant log file and rollover accumulated logs to a new file based on startup, time or size	2015-09-02 21:56:58 -07:00
FileUtils.cpp
FileUtils.h
GLCanvas.cpp	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
GLCanvas.h	fix throttled rendering for the 2D display plugin	2015-08-19 21:11:48 -07:00
InterfaceActionFactory.cpp
InterfaceActionFactory.h
InterfaceLogging.cpp
InterfaceLogging.h
LODManager.cpp
LODManager.h
main.cpp	moved translation efforts into subdir	2015-08-25 01:36:19 +02:00
MainWindow.cpp
MainWindow.h
Menu.cpp	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-09-08 08:40:51 -07:00
Menu.h	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
ModelPackager.cpp	ResourceCache, NetworkGeometry and Model refactoring and optimizations.	2015-08-20 18:59:51 -07:00
ModelPackager.h	ResourceCache, NetworkGeometry and Model refactoring and optimizations.	2015-08-20 18:59:51 -07:00
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
ModelSelector.h
Physics.cpp
Physics.h
PluginContainerProxy.cpp	Fix oculus crash on switching display plugin to something else	2015-09-02 18:28:43 -07:00
PluginContainerProxy.h	Stereo rendering work	2015-08-22 16:15:10 -07:00
ScriptHighlighting.cpp
ScriptHighlighting.h
ScriptsModel.cpp
ScriptsModel.h
ScriptsModelFilter.cpp
ScriptsModelFilter.h
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
Stars.cpp	New stereo rendering implementation	2015-08-21 00:29:24 -07:00
Stars.h
UIUtil.cpp
UIUtil.h
Util.cpp	style fixes	2015-08-23 20:01:58 +02:00
Util.h
world.h