Vladyslav Stelmakhovskyi 072e024d9a Fixed warning in JSConsole		2017-04-04 16:10:37 +02: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	Expose Avatar skeletons to JavaScript	2017-03-30 17:27:40 -07:00
devices	uuid keys for overlays appears to work	2017-02-16 21:22:23 -08:00
java/io/highfidelity/interface
networking	Merge pull request #10095 from druiz17/tablet-webView2.0	2017-04-01 08:33:09 -07:00
octree
scripting	Merge pull request #9873 from highfidelity/PAL_v2	2017-03-31 17:00:41 -07:00
ui	Fixed warning in JSConsole	2017-04-04 16:10:37 +02:00
Application.cpp	Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView2.0	2017-04-01 00:58:37 +01:00
Application.h	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
Bookmarks.cpp
Bookmarks.h
Camera.cpp	snapshot working, before button change	2017-02-21 13:14:45 -08:00
Camera.h
ConnectionMonitor.cpp
ConnectionMonitor.h
CrashHandler.cpp	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-11-21 13:05:08 -08:00
CrashHandler.h
CrashReporter.cpp
CrashReporter.h
DiscoverabilityManager.cpp	restore lost code	2017-03-31 13:28:14 -07:00
DiscoverabilityManager.h	Adjust reporting of availability to metaverse.	2017-03-29 16:12:50 -07:00
FrameTimingsScriptingInterface.cpp
FrameTimingsScriptingInterface.h
GLCanvas.cpp
GLCanvas.h
InterfaceActionFactory.cpp
InterfaceActionFactory.h
InterfaceLogging.cpp
InterfaceLogging.h
InterfaceParentFinder.cpp	allow overlays to be parents	2017-02-17 09:36:00 -08:00
InterfaceParentFinder.h
LODManager.cpp
LODManager.h
main.cpp	Remove non relevant changes	2017-03-06 22:11:46 +01:00
Menu.cpp	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
Menu.h	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
Physics.cpp
Physics.h
ScriptHighlighting.cpp
ScriptHighlighting.h
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
UIUtil.cpp
UIUtil.h
Util.cpp
Util.h
world.h