Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 12:35:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/interface/src
History
Brad Davis 7f6a49688a Merge branch 'master' into plugins 
Conflicts:
	interface/resources/qml/AddressBarDialog.qml
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Environment.cpp
	interface/src/Environment.h
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationOverlay.h
	interface/src/ui/overlays/LocalModelsOverlay.cpp
2015-06-10 14:21:48 -07:00
..
audio Make TextureCache::getImageTexture static 2015-05-23 03:24:26 +02:00
avatar Merge branch 'master' into plugins 2015-06-10 14:21:48 -07:00
devices Merge branch 'master' into plugins 2015-06-10 14:21:48 -07:00
octree Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
scripting client decides on new entity-ids, keep EntityItemID class 2015-05-20 10:42:19 -07:00
starfield
ui Merge branch 'master' into plugins 2015-06-10 14:21:48 -07:00
AbstractLoggerInterface.h
Application.cpp Merge branch 'master' into plugins 2015-06-10 14:21:48 -07:00
Application.h Merge branch 'master' into plugins 2015-06-10 14:21:48 -07:00
Bookmarks.cpp
Bookmarks.h
Camera.cpp Working on display plugins 2015-05-26 17:32:41 -07:00
Camera.h Working on display plugins 2015-05-26 17:32:41 -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
DisplayPlugins.cpp Working on display plugins 2015-06-03 17:15:00 -07:00
DisplayPlugins.h Consolidating GL display plugins 2015-05-31 00:24:19 -07:00
Environment.cpp Trying to transfer the rnedering from displaySide to RenderDeferredTask 2015-06-01 17:31:00 -07:00
Environment.h Merge branch 'master' into plugins 2015-06-10 14:21:48 -07:00
FileLogger.cpp
FileLogger.h
FileUtils.cpp
FileUtils.h
GLCanvas.cpp Consolidating GL display plugins 2015-05-31 00:24:19 -07:00
GLCanvas.h Consolidating GL display plugins 2015-05-31 00:24:19 -07:00
InterfaceLogging.cpp
InterfaceLogging.h
LODManager.cpp Set shouldRender method 2015-06-02 19:26:39 +02:00
LODManager.h Set shouldRender method 2015-06-02 19:26:39 +02:00
main.cpp Working on display plugins 2015-05-21 18:50:11 -07:00
MainWindow.cpp Working on display plugins 2015-06-05 00:00:57 -07:00
MainWindow.h Final fixes. Snapshot should be good now 2015-06-03 15:09:45 -07:00
Menu.cpp Remove circular login dialog variation 2015-06-05 15:37:25 -07:00
Menu.h Remove circular login dialog variation 2015-06-05 15:37:25 -07:00
ModelPackager.cpp
ModelPackager.h
ModelPropertiesDialog.cpp
ModelPropertiesDialog.h
ModelSelector.cpp
ModelSelector.h
Physics.cpp
Physics.h
ScriptHighlighting.cpp
ScriptHighlighting.h
ScriptsModel.cpp
ScriptsModel.h
ScriptsModelFilter.cpp
ScriptsModelFilter.h
SpeechRecognizer.cpp
SpeechRecognizer.h
SpeechRecognizer.mm
Stars.cpp
Stars.h
UIUtil.cpp
UIUtil.h
Util.cpp CR feedback 2015-06-08 14:36:31 -07:00
Util.h CR feedback 2015-06-08 14:36:31 -07:00
world.h