overte/interface/src
Brad Davis 48b27acc79 Merge remote-tracking branch 'upstream/master' into overlay
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/ApplicationOverlay.cpp
2015-06-18 18:17:59 -07:00
..
audio Merge remote-tracking branch 'upstream/master' into overlay 2015-06-18 18:17:59 -07:00
avatar Merge remote-tracking branch 'upstream/master' into overlay 2015-06-18 18:17:59 -07:00
devices Merge remote-tracking branch 'upstream/master' into overlay 2015-06-18 18:17:59 -07:00
octree Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
scripting Merge remote-tracking branch 'upstream/master' into overlay 2015-06-18 18:17:59 -07:00
starfield
ui Merge remote-tracking branch 'upstream/master' into overlay 2015-06-18 18:17:59 -07:00
AbstractLoggerInterface.h
Application.cpp Merge remote-tracking branch 'upstream/master' into overlay 2015-06-18 18:17:59 -07:00
Application.h Merge remote-tracking branch 'upstream/master' into overlay 2015-06-16 21:01:00 -07:00
Bookmarks.cpp Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
Bookmarks.h Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
Camera.cpp Breaking up overlay into rendering and compositing classes 2015-06-13 17:36:08 -07:00
Camera.h Breaking up overlay into rendering and compositing classes 2015-06-13 17:36:08 -07:00
DatagramProcessor.cpp log connection times for eventual stats display 2015-05-26 10:37:44 -07:00
DatagramProcessor.h
DiscoverabilityManager.cpp
DiscoverabilityManager.h
FileLogger.cpp
FileLogger.h
FileUtils.cpp
FileUtils.h
GLCanvas.cpp enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
GLCanvas.h
InterfaceActionFactory.cpp git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point 2015-06-17 11:22:10 -07:00
InterfaceActionFactory.h make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus. 2015-06-10 12:04:44 -07:00
InterfaceLogging.cpp
InterfaceLogging.h
LODManager.cpp enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
LODManager.h Set shouldRender method 2015-06-02 19:26:39 +02:00
main.cpp don't force use of Settings to all QCoreApplication 2015-05-08 16:24:39 -07:00
MainWindow.cpp more indentation changes 2015-06-03 14:59:07 -07:00
MainWindow.h Final fixes. Snapshot should be good now 2015-06-03 15:09:45 -07:00
Menu.cpp Merge pull request #5134 from birarda/master 2015-06-16 13:50:20 -07:00
Menu.h add fixed back/forward, buttons to menu 2015-06-16 08:41:21 -07:00
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
Physics.cpp
Physics.h
ScriptHighlighting.cpp
ScriptHighlighting.h
ScriptsModel.cpp
ScriptsModel.h quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
ScriptsModelFilter.cpp
ScriptsModelFilter.h
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
Stars.cpp enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Stars.h
UIUtil.cpp enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
UIUtil.h
Util.cpp enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Util.h CR feedback 2015-06-08 14:36:31 -07:00
world.h