Dante Ruiz d65c0dfbac Merge branch 'master' of github.com:highfidelity/hifi into controller-ui		2017-06-15 16:24:59 +01:00
..
assets
audio	add various scriping interfaces for managing the audio scope and detecting noise gate transitions	2017-03-10 17:08:19 -08:00
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	Merge pull request #10646 from ZappoMan/debugAudioProblems	2017-06-10 11:32:42 -10:00
ui	saving work	2017-06-12 17:31:02 +01:00
Application.cpp	Merge branch 'master' of github.com:highfidelity/hifi into controller-ui	2017-06-15 16:24:59 +01: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	change increment operator	2017-04-07 18:21:43 +01:00
Bookmarks.h	remove dead code	2017-03-30 19:47:50 +01:00
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	Adjust reporting of availability to metaverse.	2017-03-29 16:12:50 -07:00
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	rename base action classes to dynamics, start on constraints	2017-04-11 20:39:13 -07:00
InterfaceLogging.cpp
InterfaceLogging.h
InterfaceParentFinder.cpp
InterfaceParentFinder.h
LocationBookmarks.cpp	remove dead code	2017-03-30 19:47:50 +01:00
LocationBookmarks.h	fix crash when pressing "Bookmark Avatar" button	2017-04-04 18:05:00 +01:00
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	fixing merge conflicts	2017-06-06 16:42:08 +01: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