John Conklin II 9dcef996c5 Merge pull request #12684 from vladest/assetserver_wrong_dialog ... Fix invalid message if cancel adding asset to AssetServer		2018-04-02 15:28:46 -07:00
..
assets
audio	added record wav files	2017-12-03 11:54:37 -07:00
avatar	Merge pull request #12727 from amantley/triggerRecenterBehaviour	2018-04-02 14:42:21 -07:00
commerce	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-13 13:42:42 -07: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	move all entity items to main thread	2018-02-21 15:54:07 -08:00
raypick	time-box Picks and solve in round-robin sequence	2018-03-09 08:35:18 -08:00
scripting	Merge pull request #12684 from vladest/assetserver_wrong_dialog	2018-04-02 15:28:46 -07:00
ui	Merge pull request #12726 from jherico/fix/rc66_crashes	2018-03-29 09:37:23 -07:00
webbrowser
Application.cpp	Merge pull request #12726 from jherico/fix/rc66_crashes	2018-03-29 09:37:23 -07:00
Application.h	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-22 16:29:16 -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	look offline when visiting a serverless domain	2018-02-22 13:43:41 -08: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	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	gather together the url scheme constants, name them consistently	2018-03-02 20:39:38 -08:00
Menu.cpp	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-13 10:08:00 -07:00
Menu.h	Fixing the menu for Shadow and AO to do the correct path to engine config	2018-03-09 15:04:14 -08: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	avatar-entities which are children of an avatar will scale with the avatar	2017-12-02 09:31:43 -08:00
Util.h
world.h