howard-stearns 16a58ddf5a Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser		2017-12-19 10:48:34 -08:00
..
assets
audio	added record wav files	2017-12-03 11:54:37 -07:00
avatar	consistent goToUser behavior in PAL, and be able to go to flying user.	2017-12-15 17:00:54 -08:00
commerce	Merge pull request #11974 from birarda/feat/staging-env-or-cl	2017-12-13 17:29:45 -08:00
devices
java/io/highfidelity/interface
networking	allow staging METAVERSE_SERVER_URL to be toggled by env	2017-12-12 16:22:08 -08:00
octree
raypick	Merge remote-tracking branch 'upstream/master' into hysteresis	2017-12-14 09:55:46 -08:00
scripting	Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js	2017-12-18 10:02:42 -08:00
ui	Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js	2017-12-18 10:02:42 -08:00
webbrowser	License header fix	2017-10-30 20:29:44 +01:00
Application.cpp	when an avatar-entity's lifetime expires, remove it from avatarEntityData	2017-12-18 14:26:25 -08:00
Application.h	expose physics simulation stats to Test JS API	2017-12-11 11:31:00 -08:00
Application_render.cpp	expose Window.getDeviceSize()	2017-11-28 16:16:30 -08: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	Tidying	2017-11-13 11:59:21 +13:00
FrameTimingsScriptingInterface.cpp
FrameTimingsScriptingInterface.h
GLCanvas.cpp
GLCanvas.h
InterfaceDynamicFactory.cpp
InterfaceDynamicFactory.h
InterfaceLogging.cpp
InterfaceLogging.h
InterfaceParentFinder.cpp
InterfaceParentFinder.h
LocationBookmarks.cpp
LocationBookmarks.h
LODManager.cpp	code review feedback	2017-11-10 10:25:29 -08:00
LODManager.h
main.cpp
Menu.cpp	remove bullet stats when physics stats disabled	2017-12-11 11:31:00 -08:00
Menu.h
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
ScriptHighlighting.cpp
ScriptHighlighting.h
SecondaryCamera.cpp	todo comment	2017-11-16 11:41:28 -08:00
SecondaryCamera.h	remove includes, fix comment	2017-11-15 13:37:15 -08:00
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
UIUtil.cpp
UIUtil.h
Util.cpp	[WL21389] Fix scaling issue when computing hull point list (details below).	2017-10-24 14:16:25 -04:00
Util.h	[WL21389] WL21389 PR2: Representation of collision shapes need updating (details below).	2017-10-24 14:16:17 -04:00
world.h