samcake 1cd662acdb Merge branch 'master' of https://github.com/highfidelity/hifi into workload		2018-04-13 14:43:11 -07:00
..
assets
audio
avatar	Merge pull request #12679 from FlameSoulis/getAnimatationRoles-fix	2018-04-12 10:32:09 -07:00
commerce	Clean up failResponse to make it better	2018-04-06 11:41:17 -07:00
devices
java/io/highfidelity/interface
networking
octree	move all entity items to main thread	2018-02-21 15:54:07 -08:00
raypick	make resquested changes	2018-04-02 10:51:39 -07:00
scripting	Merge pull request #12835 from NissimHadar/speedUp1	2018-04-12 11:48:09 -07:00
ui	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-12 18:11:18 -07:00
webbrowser
workload	More featuers for the view of the workload and test scrtpts to stress the system)	2018-04-09 17:27:40 -07:00
Application.cpp	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-13 14:43:11 -07:00
Application.h	merge with upstream	2018-03-30 18:08:38 -07:00
Application_render.cpp	Some slight cleanup in Application_render	2018-02-23 18:13:08 +01:00
AvatarBookmarks.cpp	remove menu option for booking marking avatar entities	2018-02-23 10:45:59 -08:00
AvatarBookmarks.h	remove menu option for booking marking avatar entities	2018-02-23 10:45:59 -08:00
Bookmarks.cpp
Bookmarks.h
ConnectionMonitor.cpp
ConnectionMonitor.h
CrashHandler.cpp
CrashHandler.h
Crashpad.cpp	Fix spaces	2018-01-30 12:04:01 -08:00
Crashpad.h	Fix spaces	2018-01-30 12:04:01 -08:00
DiscoverabilityManager.cpp	add new address accessor for 'public' addresses, use it for snapshot and stream	2018-04-05 13:39:51 -07:00
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
LocationBookmarks.h
LODManager.cpp	Code review fixes	2018-04-02 15:50:18 -07:00
LODManager.h	changing the Increase LOD gap to 10 to start upping earlier	2018-02-06 16:00:49 -08:00
main.cpp	gather together the url scheme constants, name them consistently	2018-03-02 20:39:38 -08:00
Menu.cpp	Adding more budget options for memory texture	2018-04-03 18:08:43 -07:00
Menu.h	Adding more budget options for memory texture	2018-04-03 18:08:43 -07:00
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
ScriptHighlighting.cpp
ScriptHighlighting.h
SecondaryCamera.cpp	Merged with master	2018-02-19 17:28:39 +01: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
Util.h
world.h