Stephen Birarda 9cc348ef27 Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings		2018-02-27 09:59:37 -08:00
..
assets
audio
avatar	Merge pull request #12485 from dback2/avatarMotors	2018-02-26 11:03:30 -08:00
commerce	Don't use eventLoop, since that will block the UI	2018-02-23 10:19:00 -08:00
devices
java/io/highfidelity/interface
networking
octree	move all entity items to main thread	2018-02-21 15:54:07 -08:00
raypick	Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes	2018-01-29 14:02:38 -08:00
scripting	Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix	2018-02-26 09:39:16 -08:00
ui	Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings	2018-02-27 09:59:37 -08:00
webbrowser
Application.cpp	Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings	2018-02-27 09:59:37 -08:00
Application.h	Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix	2018-02-26 09:39:16 -08:00
Application_render.cpp	Don't trigger a backtrace exception on quitting while in HMD	2018-02-07 15:28:04 -08: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
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	FIxing the get***LODIncreaseFPS functions evaluation of the threshold FPS for starting increasing LOD again	2018-02-06 15:52:32 -08:00
LODManager.h	changing the Increase LOD gap to 10 to start upping earlier	2018-02-06 16:00:49 -08:00
main.cpp	Create a standard function to init Hifi Apps	2018-02-22 17:06:09 -08:00
Menu.cpp	Merge pull request #12407 from NissimHadar/shadowControlsOffZvork	2018-02-26 10:13:40 -08:00
Menu.h	Merge pull request #12407 from NissimHadar/shadowControlsOffZvork	2018-02-26 10:13:40 -08:00
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
ScriptHighlighting.cpp
ScriptHighlighting.h
SecondaryCamera.cpp	Shadow task now uses LOD culling from main view task	2018-02-06 11:47: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