David Rowe 033b85a3a8 Merge branch 'master' into remove-deprecated-items ... # Conflicts: # scripts/system/libraries/entitySelectionTool.js		2018-02-13 09:42:40 +13:00
..
assets
audio
avatar	save avatarUrl when setting new skeletonModelUrl	2018-02-09 09:35:24 -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 branch 'master' into remove-deprecated-items	2018-02-13 09:42:40 +13:00
ui	Merge branch 'master' into remove-deprecated-items	2018-02-13 09:42:40 +13:00
webbrowser
Application.cpp	Merge branch 'master' into remove-deprecated-items	2018-02-13 09:42:40 +13:00
Application.h	Move backtrace to interface	2018-01-30 11:39:48 -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
AvatarBookmarks.h
AvatarEntitiesBookmarks.cpp	remove debug statement	2018-01-29 11:26:28 -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	Remove Menu.addActionGroup() and removeActionGroup() from JavaScript API	2018-02-04 15:16:20 +13: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	Integrating the tag flags to the render item key and adding configration of the render pipelien with the Tag information	2018-01-29 12:20:51 -08: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