This is an automated email from the git hooks/post-receive script. tobi pushed a commit to branch master in repository darkradiant.
commit 3c7a23dc965add56d53ee5ece5b28723b9d6293e Merge: 715ccdc 3758686 Author: Tobias Frost <[email protected]> Date: Tue May 3 08:28:03 2016 +0200 Merge tag 'upstream/2.0.3' Upstream version 2.0.3 .gitignore | 1 + ChangeLog | 8321 -------------------- Makefile.in | 6 +- aclocal.m4 | 60 +- configure | 21 +- configure.ac | 3 +- include/ibrush.h | 3 +- include/ieclass.h | 4 +- include/ientity.h | 171 +- include/ieventmanager.h | 47 +- include/igl.h | 7 + include/ilayer.h | 20 +- include/imap.h | 37 +- include/imapresource.h | 5 +- include/imodule.h | 24 +- include/inode.h | 13 +- include/iparticles.h | 2 +- include/ipatch.h | 3 +- include/irender.h | 3 - include/iscenegraph.h | 5 +- include/ishaders.h | 57 +- include/isound.h | 3 +- include/itextstream.h | 186 +- include/iuimanager.h | 5 - include/iundo.h | 7 +- include/mapfile.h | 35 +- include/modelskin.h | 29 +- include/precompiled_interfaces.h | 2 +- include/version.h | 2 +- include/warnings.h | 31 - install/bitmaps/texture_pick.png | Bin 0 -> 411 bytes install/darkradiant.desktop.in | 2 +- install/games/darkmod.game | 1 + install/games/doom3-demo.game | 1 + install/games/doom3.game | 1 + install/games/quake3.game | 1 + install/games/xreal.game | 5 + install/menu.xml | 1 + install/scripts/commands/ase_export.py | 16 +- install/scripts/commands/ase_export_blend.py | 81 +- .../scripts/commands/convert_to_ase_and_replace.py | 4 +- install/ui/findandreplacedialog.fbp | 198 +- install/ui/findandreplacedialog.xrc | 25 +- install/ui/objectiveseditor.fbp | 4 +- install/ui/objectiveseditor.xrc | 2 +- install/ui/renderpreview.fbp | 129 +- install/ui/renderpreview.xrc | 26 + install/user.xml | 3 +- libs/ObservedUndoable.h | 35 +- libs/SelectableNode.h | 4 +- libs/SurfaceShader.h | 231 + libs/ThreadedDefLoader.h | 104 + libs/Transformable.h | 37 +- libs/UndoFileChangeTracker.h | 99 + libs/archivelib.h | 32 +- libs/debugging/ScenegraphUtils.h | 3 +- libs/debugging/ScopedDebugTimer.h | 15 +- libs/entitylib.h | 16 +- libs/gamelib.h | 21 + libs/moduleobservers.h | 10 +- libs/os/dir.h | 2 +- libs/registry/Widgets.h | 2 +- libs/render/ShaderStateRenderer.h | 25 +- libs/scene/BasicRootNode.h | 73 + libs/scene/Node.cpp | 19 +- libs/scene/Node.h | 18 +- libs/scene/TraversableNodeSet.cpp | 20 +- libs/scene/TraversableNodeSet.h | 7 +- libs/scenelib.h | 5 +- libs/wxutil/ConsoleView.cpp | 92 +- libs/wxutil/ConsoleView.h | 9 + libs/wxutil/FreezePointer.cpp | 7 +- libs/wxutil/GLWidget.cpp | 11 +- libs/wxutil/Makefile.am | 73 +- libs/wxutil/Makefile.in | 76 +- libs/wxutil/ModalProgressDialog.cpp | 5 +- libs/wxutil/ModalProgressDialog.h | 2 +- libs/wxutil/SerialisableWidgets.cpp | 6 +- libs/wxutil/TreeModel.cpp | 35 + libs/wxutil/TreeModel.h | 23 + libs/wxutil/TreeView.cpp | 22 + libs/wxutil/TreeView.h | 6 + libs/wxutil/VFSTreePopulator.cpp | 37 +- libs/wxutil/VFSTreePopulator.h | 41 +- libs/wxutil/WindowPosition.cpp | 28 +- libs/wxutil/WindowPosition.h | 5 + libs/wxutil/dialog/Dialog.cpp | 19 +- libs/wxutil/dialog/Dialog.h | 6 + libs/wxutil/dialog/MessageBox.cpp | 16 +- libs/wxutil/dialog/MessageBox.h | 5 + libs/wxutil/preview/ModelPreview.cpp | 84 +- libs/wxutil/preview/ModelPreview.h | 22 +- libs/wxutil/preview/ParticlePreview.cpp | 47 +- libs/wxutil/preview/ParticlePreview.h | 13 +- libs/wxutil/preview/RenderPreview.cpp | 411 +- libs/wxutil/preview/RenderPreview.h | 55 +- libs/xmlutil/Document.cpp | 7 +- libs/xmlutil/Makefile.am | 3 +- libs/xmlutil/Makefile.in | 4 +- libs/xmlutil/Node.cpp | 20 + libs/xmlutil/Node.h | 10 +- ltmain.sh | 4 +- m4/boost.m4 | 504 +- plugins/archivezip/DeflatedArchiveTextFile.h | 8 +- plugins/archivezip/ZipArchive.cpp | 73 +- plugins/archivezip/ZipArchive.h | 7 +- .../dm.conversation/ConversationKeyExtractor.cpp | 3 +- plugins/dm.conversation/ConversationKeyExtractor.h | 10 +- plugins/dm.editing/SpawnargReplacer.h | 35 +- plugins/dm.gui/Makefile.am | 1 + plugins/dm.gui/Makefile.in | 1 + plugins/dm.gui/ReadableEditorDialog.cpp | 37 +- plugins/dm.gui/ReadableEditorDialog.h | 3 + plugins/dm.gui/ReadableReloader.h | 6 +- plugins/dm.gui/XData.cpp | 4 +- plugins/dm.gui/XDataLoader.cpp | 4 +- plugins/dm.gui/XDataLoader.h | 8 +- plugins/dm.gui/gui/GuiManager.cpp | 44 +- plugins/dm.gui/gui/GuiManager.h | 29 +- plugins/dm.gui/gui/GuiView.cpp | 3 + plugins/dm.gui/gui/RenderableText.cpp | 2 +- plugins/dm.gui/gui/Variable.cpp | 10 + plugins/dm.gui/plugin.cpp | 4 +- plugins/dm.objectives/ComponentsDialog.cpp | 6 +- plugins/dm.objectives/ObjectiveEntity.cpp | 2 +- plugins/dm.objectives/ObjectiveKeyExtractor.cpp | 2 +- plugins/dm.objectives/ObjectiveKeyExtractor.h | 10 +- plugins/dm.objectives/ObjectivesEditor.cpp | 20 +- plugins/dm.objectives/TargetList.h | 28 +- .../dm.objectives/ce/AIFindBodyComponentEditor.cpp | 2 + .../dm.objectives/ce/AIFindItemComponentEditor.cpp | 2 + plugins/dm.objectives/ce/AlertComponentEditor.cpp | 2 + plugins/dm.objectives/ce/ComponentEditor.h | 8 + plugins/dm.objectives/ce/ComponentEditorBase.h | 25 +- .../ce/CustomClockedComponentEditor.cpp | 2 + plugins/dm.objectives/ce/CustomComponentEditor.cpp | 2 + .../dm.objectives/ce/DestroyComponentEditor.cpp | 2 + .../dm.objectives/ce/DistanceComponentEditor.cpp | 2 + .../ce/InfoLocationComponentEditor.cpp | 2 + plugins/dm.objectives/ce/ItemComponentEditor.cpp | 2 + plugins/dm.objectives/ce/KillComponentEditor.cpp | 5 +- .../dm.objectives/ce/KnockoutComponentEditor.cpp | 2 + .../dm.objectives/ce/LocationComponentEditor.cpp | 2 + .../dm.objectives/ce/PickpocketComponentEditor.cpp | 2 + .../ce/ReadableClosedComponentEditor.cpp | 2 + .../ce/ReadableOpenedComponentEditor.cpp | 2 + .../ce/ReadablePageReachedComponentEditor.cpp | 2 + plugins/dm.stimresponse/SREntity.cpp | 10 +- plugins/dm.stimresponse/SRPropertyLoader.cpp | 3 +- plugins/dm.stimresponse/SRPropertyLoader.h | 10 +- plugins/dm.stimresponse/SRPropertyRemover.cpp | 3 +- plugins/dm.stimresponse/SRPropertyRemover.h | 12 +- plugins/dm.stimresponse/StimTypes.cpp | 15 +- plugins/dm.stimresponse/StimTypes.h | 9 +- plugins/eclassmgr/Doom3EntityClass.cpp | 2 +- plugins/eclassmgr/EClassManager.cpp | 107 +- plugins/eclassmgr/EClassManager.h | 44 +- plugins/eclassmgr/Makefile.am | 2 +- plugins/eclassmgr/Makefile.in | 2 +- plugins/entity/Doom3Entity.cpp | 53 +- plugins/entity/Doom3Entity.h | 16 +- plugins/entity/EntityCreator.cpp | 11 +- plugins/entity/EntityCreator.h | 5 +- plugins/entity/EntityNode.cpp | 28 +- plugins/entity/EntityNode.h | 4 +- plugins/entity/KeyValue.cpp | 10 +- plugins/entity/KeyValue.h | 4 +- plugins/entity/Makefile.am | 6 +- plugins/entity/Makefile.in | 33 +- plugins/entity/ModelKey.cpp | 51 +- plugins/entity/ModelKey.h | 3 + plugins/entity/NamespaceManager.cpp | 54 +- plugins/entity/RotationKey.cpp | 51 + plugins/entity/RotationKey.h | 35 + plugins/entity/RotationMatrix.cpp | 147 + plugins/entity/RotationMatrix.h | 57 + plugins/entity/angle.h | 5 +- plugins/entity/doom3group/Doom3Group.h | 4 +- plugins/entity/doom3group/Doom3GroupNode.cpp | 16 +- plugins/entity/doom3group/Doom3GroupNode.h | 8 +- plugins/entity/eclassmodel/EclassModel.h | 7 +- plugins/entity/eclassmodel/EclassModelNode.h | 4 +- plugins/entity/generic/GenericEntity.h | 4 +- plugins/entity/generic/GenericEntityNode.h | 4 +- plugins/entity/light/Light.h | 6 +- plugins/entity/light/LightNode.cpp | 8 +- plugins/entity/light/LightNode.h | 8 +- plugins/entity/rotation.cpp | 23 - plugins/entity/rotation.h | 236 - plugins/entity/speaker/SpeakerNode.h | 4 +- .../entity/target/RenderableTargetInstances.cpp | 35 - plugins/entity/target/RenderableTargetInstances.h | 50 - plugins/entity/target/RenderableTargetLines.h | 166 +- plugins/entity/target/Target.h | 22 +- plugins/entity/target/TargetKey.cpp | 32 +- plugins/entity/target/TargetKey.h | 23 +- plugins/entity/target/TargetKeyCollection.cpp | 48 +- plugins/entity/target/TargetKeyCollection.h | 32 +- plugins/entity/target/TargetManager.cpp | 12 +- plugins/entity/target/TargetManager.h | 46 +- plugins/entity/target/TargetableNode.cpp | 70 +- plugins/entity/target/TargetableNode.h | 11 +- plugins/entitylist/EntityList.cpp | 18 +- plugins/entitylist/GraphTreeModel.cpp | 4 + plugins/entitylist/GraphTreeModel.h | 6 +- plugins/eventmanager/Accelerator.cpp | 563 +- plugins/eventmanager/Accelerator.h | 125 +- plugins/eventmanager/Event.h | 129 +- plugins/eventmanager/EventManager.cpp | 110 +- plugins/eventmanager/EventManager.h | 8 +- plugins/eventmanager/GlobalKeyEventFilter.cpp | 22 +- plugins/eventmanager/GlobalKeyEventFilter.h | 4 +- plugins/eventmanager/KeyEvent.h | 62 +- plugins/eventmanager/Makefile.am | 2 +- plugins/eventmanager/Makefile.in | 2 +- plugins/eventmanager/RegistryToggle.h | 77 +- plugins/eventmanager/SaveEventVisitor.h | 72 +- plugins/eventmanager/Statement.cpp | 32 + plugins/eventmanager/Statement.h | 70 +- plugins/eventmanager/Toggle.cpp | 32 + plugins/eventmanager/Toggle.h | 9 +- plugins/eventmanager/WidgetToggle.cpp | 5 + plugins/eventmanager/WidgetToggle.h | 39 +- plugins/filters/BasicFilterSystem.cpp | 15 +- plugins/filters/ShaderUpdateWalker.h | 28 - plugins/fonts/FontManager.cpp | 26 +- plugins/fonts/FontManager.h | 21 +- plugins/fonts/Makefile.am | 1 + plugins/fonts/Makefile.in | 1 + plugins/image/DDSImage.cpp | 4 +- plugins/mapdoom3/Doom3MapWriter.cpp | 29 +- plugins/model/RenderablePicoSurface.cpp | 4 + plugins/particles/Makefile.am | 1 + plugins/particles/Makefile.in | 1 + plugins/particles/ParticlesManager.cpp | 70 +- plugins/particles/ParticlesManager.h | 47 +- plugins/scenegraph/SceneGraph.cpp | 125 +- plugins/scenegraph/SceneGraph.h | 53 +- plugins/script/ScriptingSystem.cpp | 16 +- plugins/script/interfaces/EntityInterface.cpp | 10 +- plugins/script/interfaces/EntityInterface.h | 13 +- plugins/script/interfaces/SceneGraphInterface.h | 2 +- .../script/interfaces/ShaderSystemInterface.cpp | 6 +- plugins/script/interfaces/ShaderSystemInterface.h | 21 +- plugins/shaders/CameraCubeMapDecl.cpp | 6 +- plugins/shaders/Doom3ShaderLayer.cpp | 4 +- plugins/shaders/Doom3ShaderSystem.cpp | 153 +- plugins/shaders/Doom3ShaderSystem.h | 101 +- plugins/shaders/Makefile.am | 1 + plugins/shaders/Makefile.in | 1 + plugins/shaders/MapExpression.cpp | 2 +- plugins/shaders/ShaderFileLoader.cpp | 4 +- plugins/shaders/ShaderFileLoader.h | 13 +- plugins/shaders/ShaderLibrary.cpp | 55 +- plugins/shaders/ShaderLibrary.h | 28 +- plugins/skins/Doom3SkinCache.cpp | 131 +- plugins/skins/Doom3SkinCache.h | 81 +- plugins/skins/Makefile.am | 2 +- plugins/skins/Makefile.in | 2 +- plugins/sound/Makefile.am | 3 +- plugins/sound/Makefile.in | 3 +- plugins/sound/SoundManager.cpp | 59 +- plugins/sound/SoundManager.h | 37 +- plugins/sound/SoundPlayer.cpp | 2 +- plugins/uimanager/MenuItem.cpp | 34 - plugins/uimanager/MenuItem.h | 5 - plugins/uimanager/MenuManager.cpp | 8 - plugins/uimanager/MenuManager.h | 5 - plugins/uimanager/ToolbarManager.cpp | 2 +- plugins/uimanager/UIManager.cpp | 4 + plugins/undo/StackFiller.h | 34 +- plugins/undo/UndoSystem.cpp | 6 + plugins/vfspk3/Doom3FileSystem.cpp | 2 +- plugins/xmlregistry/XMLRegistry.cpp | 131 +- plugins/xmlregistry/XMLRegistry.h | 13 +- radiant/Makefile.am | 3 +- radiant/Makefile.in | 59 +- radiant/RadiantModule.cpp | 18 +- radiant/brush/Brush.cpp | 174 +- radiant/brush/Brush.h | 39 +- radiant/brush/BrushNode.cpp | 31 +- radiant/brush/BrushNode.h | 10 +- radiant/brush/ContentsFlagsValue.h | 55 - radiant/brush/Face.cpp | 202 +- radiant/brush/Face.h | 75 +- radiant/brush/FaceInstance.cpp | 4 +- radiant/brush/FaceShader.cpp | 192 - radiant/brush/FaceShader.h | 119 - radiant/brush/FaceTexDef.cpp | 12 +- radiant/brush/FaceTexDef.h | 13 +- radiant/brush/TextureProjection.cpp | 3 +- radiant/brush/csg/CSG.cpp | 94 +- radiant/camera/CamWnd.cpp | 14 +- radiant/camera/CamWnd.h | 1 + radiant/camera/GlobalCamera.cpp | 17 + radiant/camera/GlobalCamera.h | 1 + radiant/camera/tools/ShaderClipboardTools.h | 8 +- radiant/layers/LayerSystem.cpp | 18 +- radiant/layers/LayerSystem.h | 2 +- radiant/log/Console.cpp | 16 +- radiant/log/LogFile.cpp | 73 +- radiant/log/LogFile.h | 8 +- radiant/log/LogStream.cpp | 46 +- radiant/log/LogStream.h | 53 +- radiant/log/LogStreamBuf.cpp | 39 +- radiant/log/LogStreamBuf.h | 2 +- radiant/log/LogWriter.cpp | 17 +- radiant/log/LogWriter.h | 9 +- radiant/log/PIDFile.h | 2 +- radiant/log/StringLogDevice.cpp | 2 +- radiant/main.cpp | 44 +- radiant/main.h | 25 - radiant/map/AutoSaver.cpp | 4 +- radiant/map/BasicContainer.h | 48 - radiant/map/Map.cpp | 29 +- radiant/map/Map.h | 4 +- radiant/map/MapResource.cpp | 74 +- radiant/map/MapResource.h | 14 +- radiant/map/RootNode.cpp | 74 +- radiant/map/RootNode.h | 43 +- radiant/map/ShaderBreakdown.h | 19 +- radiant/map/StartupMapLoader.cpp | 3 +- radiant/map/UndoFileChangeTracker.h | 95 - radiant/map/algorithm/InfoFileExporter.cpp | 26 +- radiant/map/algorithm/Skins.cpp | 2 +- radiant/modulesystem/ApplicationContextImpl.cpp | 25 +- radiant/modulesystem/ApplicationContextImpl.h | 21 +- radiant/modulesystem/DynamicLibrary.cpp | 15 +- radiant/modulesystem/DynamicLibraryLoader.cpp | 10 +- radiant/modulesystem/ModuleLoader.cpp | 2 +- radiant/modulesystem/ModuleRegistry.cpp | 107 +- radiant/modulesystem/ModuleRegistry.h | 28 +- radiant/modulesystem/StaticModule.h | 32 +- radiant/patch/Patch.cpp | 183 +- radiant/patch/Patch.h | 31 +- radiant/patch/PatchNode.cpp | 27 +- radiant/patch/PatchNode.h | 8 +- radiant/patch/PatchSavedState.h | 13 +- radiant/referencecache/ModelCache.cpp | 2 +- radiant/render/OpenGLModule.cpp | 15 +- radiant/render/OpenGLModule.h | 33 +- radiant/render/OpenGLRenderSystem.cpp | 39 +- radiant/render/OpenGLRenderSystem.h | 24 +- radiant/render/backend/GLProgramFactory.cpp | 73 +- radiant/render/backend/GLProgramFactory.h | 43 +- radiant/render/backend/OpenGLShader.cpp | 103 +- radiant/render/backend/OpenGLShader.h | 73 +- radiant/render/backend/OpenGLShaderPass.h | 4 +- radiant/render/backend/OpenGLShaderPassAdd.h | 43 - .../render/backend/glprogram/GLSLBumpProgram.cpp | 4 +- .../backend/glprogram/GLSLDepthFillProgram.cpp | 5 +- .../render/backend/glprogram/GenericVFPProgram.cpp | 39 + .../render/backend/glprogram/GenericVFPProgram.h | 37 + radiant/selection/RadiantSelectionSystem.cpp | 1 + radiant/selection/algorithm/Shader.cpp | 15 +- radiant/selection/algorithm/Transformation.cpp | 17 +- .../selection/shaderclipboard/ShaderClipboard.cpp | 23 +- .../selection/shaderclipboard/ShaderClipboard.h | 13 +- radiant/settings/Game.cpp | 4 +- radiant/settings/GameManager.cpp | 4 +- radiant/settings/LanguageManager.cpp | 3 +- radiant/settings/Win32Registry.cpp | 4 +- radiant/textool/item/BrushItem.cpp | 25 +- radiant/textool/item/FaceItem.cpp | 4 +- radiant/ui/animationpreview/AnimationPreview.cpp | 44 +- radiant/ui/animationpreview/AnimationPreview.h | 14 +- radiant/ui/commandlist/CommandList.cpp | 5 - radiant/ui/common/MapPreview.cpp | 12 +- radiant/ui/common/MapPreview.h | 10 +- radiant/ui/common/SoundChooser.cpp | 50 +- radiant/ui/einspector/EntityInspector.cpp | 5 +- radiant/ui/einspector/LightTextureChooser.cpp | 5 + radiant/ui/einspector/LightTextureChooser.h | 5 + radiant/ui/einspector/ModelPropertyEditor.cpp | 37 +- radiant/ui/einspector/TexturePropertyEditor.cpp | 2 + radiant/ui/findshader/FindShader.cpp | 115 +- radiant/ui/findshader/FindShader.h | 18 +- radiant/ui/layers/LayerContextMenu.cpp | 12 +- radiant/ui/layers/LayerContextMenu.h | 4 +- radiant/ui/layers/LayerControlDialog.cpp | 135 +- radiant/ui/mainframe/EmbeddedLayout.cpp | 3 +- radiant/ui/mainframe/FloatingLayout.cpp | 3 +- radiant/ui/mainframe/MainFrame.cpp | 3 - radiant/ui/mainframe/RegularLayout.cpp | 4 +- radiant/ui/mainframe/ScreenUpdateBlocker.cpp | 7 +- radiant/ui/mainframe/SplitPaneLayout.cpp | 3 +- radiant/ui/mediabrowser/MediaBrowser.cpp | 27 + radiant/ui/mediabrowser/MediaBrowser.h | 1 + radiant/ui/mediabrowser/TextureDirectoryLoader.h | 4 + radiant/ui/modelselector/ModelDataInserter.h | 2 + radiant/ui/modelselector/ModelFileFunctor.h | 84 - radiant/ui/modelselector/ModelPopulator.h | 157 + radiant/ui/modelselector/ModelSelector.cpp | 210 +- radiant/ui/modelselector/ModelSelector.h | 30 +- radiant/ui/prefabselector/PrefabSelector.cpp | 91 +- radiant/ui/prefabselector/PrefabSelector.h | 6 + radiant/ui/prefdialog/PrefPage.cpp | 2 +- radiant/ui/splash/Splash.cpp | 88 +- radiant/ui/splash/Splash.h | 24 +- radiant/ui/surfaceinspector/SurfaceInspector.cpp | 4 +- radiant/ui/texturebrowser/TextureBrowser.cpp | 1005 +-- radiant/ui/texturebrowser/TextureBrowser.h | 111 +- .../ui/texturebrowser/TextureBrowserManager.cpp | 116 + radiant/ui/texturebrowser/TextureBrowserManager.h | 44 + radiant/xyview/FloatingOrthoView.cpp | 11 +- radiant/xyview/FloatingOrthoView.h | 10 +- radiant/xyview/XYWnd.cpp | 7 +- tools/innosetup/darkradiant.iss | 6 +- tools/innosetup/darkradiant.x64.iss | 6 +- tools/msvc2013/DarkRadiant.sln | 6 +- tools/msvc2013/DarkRadiant.vcxproj | 13 +- tools/msvc2013/DarkRadiant.vcxproj.filters | 39 +- tools/msvc2013/entity.vcxproj | 8 +- tools/msvc2013/entity.vcxproj.filters | 24 +- tools/msvc2013/filters.vcxproj | 1 - tools/msvc2013/filters.vcxproj.filters | 3 - tools/msvc2013/include.vcxproj | 1 - tools/msvc2013/libs.vcxproj | 11 +- tools/msvc2013/libs.vcxproj.filters | 3 + tools/msvc2013/properties/DarkRadiant Base.props | 3 + tools/msvc2013/properties/ftgl.props | 2 +- tools/msvc2013/scenelib.vcxproj | 1 + tools/msvc2013/scenelib.vcxproj.filters | 3 + tools/msvc2013/wxutillib.vcxproj | 12 + tools/scripts/compile_release_package.x64.cmd | 3 +- tools/scripts/compile_release_package.x86.cmd | 3 +- 426 files changed, 8433 insertions(+), 14347 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/darkradiant.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
