David Rowe 7236ac17e2 Merge branch 'master' into 21661		2018-01-04 15:21:00 +13:00
..
assets	Fixed typo in qWarning message.	2017-10-06 18:42:02 +01:00
audio	added record wav files	2017-12-03 11:54:37 -07:00
avatar	Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back	2017-12-22 15:48:04 -08:00
commerce	IT'S WORKING!!!	2017-12-21 16:33:47 -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 tag 'RELEASE-7602' into 21661	2018-01-03 16:46:10 +13:00
scripting	changed api key variable name	2017-12-27 12:49:16 -08:00
ui	Merge branch 'master' into 21661	2018-01-04 15:21:00 +13:00
webbrowser	License header fix	2017-10-30 20:29:44 +01:00
Application.cpp	Merge branch 'master' into 21661	2018-01-04 15:21:00 +13:00
Application.h	Remove "Prefer Avatar Finger Over Stylus" setting	2018-01-04 15:12:34 +13: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	add comments	2017-12-20 17:41:08 -08:00
LODManager.h	add comments	2017-12-20 17:41:08 -08:00
main.cpp
Menu.cpp	Merge remote-tracking branch 'upstream/master' into HEAD	2017-12-18 11:17:07 -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	avatar-entities which are children of an avatar will scale with the avatar	2017-12-02 09:31:43 -08:00
Util.h	[WL21389] WL21389 PR2: Representation of collision shapes need updating (details below).	2017-10-24 14:16:17 -04:00
world.h