samcake 934364ec59 Merge branch 'master' of https://github.com/highfidelity/hifi into blue		2017-09-11 09:55:47 -07:00
..
assets
audio
avatar	Merge pull request #11005 from Armads/WL21424	2017-09-05 13:04:14 -07:00
commerce	warning, plus salting passphrase now	2017-09-07 19:24:31 -07:00
devices
java/io/highfidelity/interface
networking
octree
raypick	fix flag bits	2017-08-23 12:20:30 -07:00
scripting	Merge pull request #10937 from kencooke/zzmp-audio/peak-values	2017-09-07 11:58:50 -07:00
ui	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-08 09:13:29 -07:00
Application.cpp	Fix potential crash on asynchronous QML loads	2017-09-07 09:53:21 -07:00
Application.h	Merge pull request #11243 from SamGondelman/sharks	2017-08-25 09:01:14 -07:00
AvatarBookmarks.cpp
AvatarBookmarks.h
Bookmarks.cpp
Bookmarks.h
ConnectionMonitor.cpp
ConnectionMonitor.h
CrashHandler.cpp
CrashHandler.h
CrashReporter.cpp
CrashReporter.h
DiscoverabilityManager.cpp
DiscoverabilityManager.h
FancyCamera.cpp
FancyCamera.h
FrameTimingsScriptingInterface.cpp
FrameTimingsScriptingInterface.h
GLCanvas.cpp
GLCanvas.h
InterfaceDynamicFactory.cpp
InterfaceDynamicFactory.h
InterfaceLogging.cpp
InterfaceLogging.h
InterfaceParentFinder.cpp
InterfaceParentFinder.h
LocationBookmarks.cpp	Create home path for new content sets loaded in	2017-08-23 17:38:24 -07:00
LocationBookmarks.h	Create home path for new content sets loaded in	2017-08-23 17:38:24 -07:00
LODManager.cpp
LODManager.h
main.cpp	Various Mac fixes	2017-09-07 14:45:35 -07:00
Menu.cpp	Merge pull request #10625 from humbletim/21180-C++	2017-08-30 07:20:00 -07:00
Menu.h	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-08-24 16:23:47 -04:00
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
ScriptHighlighting.cpp
ScriptHighlighting.h
SecondaryCamera.cpp
SecondaryCamera.h	Cleanup; no magic numbers for default cam params	2017-07-12 12:08:36 -07:00
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
UIUtil.cpp
UIUtil.h
Util.cpp
Util.h
world.h