Elisa Lupin-Jimenez a2e407f786 fixed merge conflicts in marketplacesInject.js		2017-08-09 15:59:20 -07:00
..
assets	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
audio
avatar	Merge pull request #11053 from hyperlogic/feature/secondary-pose-support	2017-08-07 13:11:48 -07:00
commerce	PR feedback	2017-08-09 12:41:16 -07:00
devices
java/io/highfidelity/interface
networking
octree
scripting	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
ui	Actually fix context menu	2017-08-08 16:38:12 -07:00
Application.cpp	fixed merge conflicts in marketplacesInject.js	2017-08-09 15:59:20 -07:00
Application.h	Downloading blocks from marketplace in own asset folder	2017-08-09 15:56:07 -07:00
AvatarBookmarks.cpp	Updated Comment	2017-06-29 23:18:52 +03:00
AvatarBookmarks.h	Appeasing the Linux gods	2017-06-28 00:37:18 +03:00
Bookmarks.cpp	Removed Old Comments	2017-06-25 22:01:14 +03:00
Bookmarks.h	Removed Redudant qualification from heade:>r	2017-06-26 23:04:48 +03:00
ConnectionMonitor.cpp
ConnectionMonitor.h
CrashHandler.cpp
CrashHandler.h
CrashReporter.cpp
CrashReporter.h
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	Avatar Bookmarking	2017-06-25 21:57:07 +03:00
LocationBookmarks.h	More appeasement of GNU C Compiler warnings	2017-06-28 07:09:15 +03:00
LODManager.cpp
LODManager.h
main.cpp	redo cache switch	2017-07-05 17:01:31 -07:00
Menu.cpp	use ctrl rather than alt to activate camera-mode shortcuts	2017-07-26 15:56:08 -07:00
Menu.h	Merge pull request #10898 from 1P-Cusack/21425	2017-07-07 14:01:36 -07:00
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
ScriptHighlighting.cpp
ScriptHighlighting.h
SecondaryCamera.cpp	Remove unnecessary guard	2017-06-30 15:25:33 -07:00
SecondaryCamera.h	Cleanup; no magic numbers for default cam params	2017-07-12 12:08:36 -07:00
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
UIUtil.cpp
UIUtil.h
Util.cpp	ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore	2017-06-22 17:54:16 -07:00
Util.h	ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore	2017-06-22 17:54:16 -07:00
world.h