Burt Sloane 4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi		2017-07-26 13:30:57 -07:00
..
assets
audio
avatar	Rename identifiers	2017-06-15 09:20:55 +12:00
devices	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
java/io/highfidelity/interface
networking	Fixing dangling thread issues, consolidating thread management	2017-06-06 15:02:16 -07:00
octree
scripting	fix no audio device from previously removed audio device	2017-06-15 09:24:14 -07:00
ui	Merge pull request #10628 from jherico/qt59	2017-06-08 16:51:08 -07:00
Application.cpp	Merge branch 'master' of https://github.com/burtsloane/hifi into midi	2017-07-26 13:30:57 -07:00
Application.h	Resolved two issues:	2017-06-06 22:31:14 +05:30
AvatarBookmarks.cpp	Resolved FB#5009	2017-06-09 10:23:53 -07:00
AvatarBookmarks.h	Resolved FB#5009	2017-06-09 10:23:53 -07:00
Bookmarks.cpp
Bookmarks.h
ConnectionMonitor.cpp
ConnectionMonitor.h
CrashHandler.cpp	Fixed Ubuntu warning	2017-06-12 10:47:55 -07:00
CrashHandler.h	Resolved FB5087	2017-06-09 13:33:46 -07:00
CrashReporter.cpp
CrashReporter.h
DiscoverabilityManager.cpp	Changed the DEFAULT_DISCOVERABILITY_MODE to Connections	2017-05-31 10:46:04 -07:00
DiscoverabilityManager.h
FancyCamera.cpp	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
FancyCamera.h	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
FrameTimingsScriptingInterface.cpp
FrameTimingsScriptingInterface.h
GLCanvas.cpp
GLCanvas.h
InterfaceDynamicFactory.cpp	add deprecation log for DYNAMIC_TYPE_SPRING	2017-05-16 10:34:39 -07:00
InterfaceDynamicFactory.h
InterfaceLogging.cpp
InterfaceLogging.h
InterfaceParentFinder.cpp
InterfaceParentFinder.h
LocationBookmarks.cpp
LocationBookmarks.h
LODManager.cpp
LODManager.h
main.cpp	Merge pull request #10590 from huffman/fix/running-marker	2017-06-02 15:57:44 -07:00
Menu.cpp	Add dev menu option to wipe KTX cache on next launch	2017-06-02 11:19:43 -07:00
Menu.h	Add dev menu option to wipe KTX cache on next launch	2017-06-02 11:19:43 -07:00
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
ScriptHighlighting.cpp
ScriptHighlighting.h
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
UIUtil.cpp
UIUtil.h
Util.cpp	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Util.h	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
world.h