Stephen Birarda 769d5677b1 Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings		2018-02-16 17:41:14 -08:00
..
assets
audio
avatar	Merge pull request #12399 from samcake/blue	2018-02-14 15:38:52 -08:00
commerce	Fix MacOS Security Pic visibility; fix incorrect button state when changing pic	2018-01-24 17:03:16 -08:00
devices
java/io/highfidelity/interface
networking
octree
raypick	Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes	2018-01-29 14:02:38 -08:00
scripting	Merge pull request #12386 from cain-kilgore/21668	2018-02-16 06:57:03 -08:00
ui	Add entity file sync and domain content backups	2018-02-15 10:09:20 -08:00
webbrowser
Application.cpp	Cleanup entity -> ds persist	2018-02-15 10:09:21 -08:00
Application.h	Merge pull request #12272 from elisa-lj11/2d-images	2018-02-13 11:44:02 -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	Misc bug fixes	2018-02-02 13:10:49 -08:00
AvatarBookmarks.h
AvatarEntitiesBookmarks.cpp	Misc bug fixes	2018-02-02 13:10:49 -08:00
AvatarEntitiesBookmarks.h	update file dates and remove debug state	2018-01-19 11:31:13 -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	Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back	2018-01-30 16:09:30 -08:00
Menu.cpp	AddressBar trigger implemented. Fixed warnings on non existing context properties. Fixed warnings about non notifyable property	2018-01-31 23:05:38 +01:00
Menu.h	Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark	2018-01-29 11:25:26 -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
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
UIUtil.cpp
UIUtil.h
Util.cpp
Util.h
world.h