Brad Davis 24b83aa0f1 Merge remote-tracking branch 'sam/android-gles' into windows_gles		2018-01-13 11:36:31 -08:00
..
assets
audio	added record wav files	2017-12-03 11:54:37 -07:00
avatar	Merge remote-tracking branch 'upstream/master' into android	2018-01-11 23:31:45 -08:00
commerce	remove some more	2018-01-11 13:15:34 -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	Merge remote-tracking branch 'upstream/master' into android	2018-01-10 17:31:50 -08:00
ui	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-10 13:40:12 -08:00
webbrowser	License header fix	2017-10-30 20:29:44 +01:00
Application.cpp	Merge remote-tracking branch 'sam/android-gles' into windows_gles	2018-01-13 11:36:31 -08:00
Application.h	Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles	2018-01-13 01:00:41 -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	provide more context for update perf stats	2018-01-09 12:59:32 -08:00
LODManager.h	add comments	2017-12-20 17:41:08 -08:00
main.cpp	GLES emulaton on windows	2018-01-12 19:17:35 -08:00
Menu.cpp	Merge pull request #12039 from luiscuenca/currentAPI	2018-01-10 17:55:08 -08:00
Menu.h
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
ScriptHighlighting.cpp
ScriptHighlighting.h
SecondaryCamera.cpp	Use forward pipeline for android	2018-01-03 16:38:23 -03:00
SecondaryCamera.h	Use forward pipeline for android	2018-01-03 16:38:23 -03: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