Seth Alves fffff817a3 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui		2017-03-10 10:20:40 -08:00
..
assets
audio
avatar	Basically rebase and squash	2017-03-06 10:03:41 -08:00
devices	uuid keys for overlays appears to work	2017-02-16 21:22:23 -08:00
java/io/highfidelity/interface
networking
octree
scripting	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-10 10:20:40 -08:00
ui	Merge branch 'tablet-ui' into 21197	2017-03-09 09:31:15 -08:00
Application.cpp	Merge branch 'tablet-ui' into 21197	2017-03-09 09:31:15 -08:00
Application.h	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-08 17:35:58 +13:00
Bookmarks.cpp
Bookmarks.h
Camera.cpp	snapshot working, before button change	2017-02-21 13:14:45 -08:00
Camera.h	Cleanup camera docs	2016-11-14 13:51:51 -08:00
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	Make Steamworks a plugin	2016-12-14 15:37:49 -08:00
DiscoverabilityManager.h
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	Merge branch 'tablet-ui-edit-js' into 21197	2017-03-08 17:35:58 +13:00
Menu.h	Remove Developer > Network > Bandwith Details dialog	2017-03-07 15:02:26 +13: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