[darkradiant] 10/11: Merge tag 'upstream/2.0.4'
Tobias Frost
tobi at moszumanska.debian.org
Thu Aug 4 16:30:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository darkradiant.
commit ac0757a00abd850730b13a7fad5b20545089a5ad
Merge: 2882578 41cd039
Author: Tobias Frost <tobi at coldtobi.de>
Date: Sat Jun 25 22:01:09 2016 +0200
Merge tag 'upstream/2.0.4'
Upstream version 2.0.4
# gpg: Unterschrift vom Sa 25 Jun 2016 22:01:05 CEST
# gpg: mittels RSA-Schlüssel 9164FA1D17BD5D36
# gpg: Korrekte Unterschrift von "Tobias Frost <tobi at coldtobi.de>"
# gpg: alias "Tobias Frost <tobi at frost.de>"
# gpg: alias "[jpeg image of size 5939]"
# gpg: alias "Tobias Frost <tobi at debian.org>"
aclocal.m4 | 60 +-
configure | 863 +++++++++++++----
configure.ac | 1 -
include/iinteractiveview.h | 3 +
include/imainframe.h | 3 +-
include/imousetool.h | 36 +-
include/inode.h | 1 +
include/iorthoview.h | 11 +-
include/itransformable.h | 11 +
include/version.h | 2 +-
install/i18n/darkradiant.pot | 958 ++++++++++---------
install/i18n/de/LC_MESSAGES/darkradiant.mo | Bin 96548 -> 97427 bytes
install/i18n/de/LC_MESSAGES/darkradiant.po | 1000 ++++++++++----------
install/menu.xml | 2 +-
install/scripts/commands/export_obj.py | 268 ++++++
install/user.xml | 4 +-
libs/Transformable.h | 50 +-
libs/debugging/ScenegraphUtils.h | 1 +
libs/entitylib.h | 2 +-
libs/scene/Node.h | 2 +-
libs/scenelib.h | 12 +-
libs/wxutil/FreezePointer.cpp | 30 +-
libs/wxutil/FreezePointer.h | 21 +-
libs/wxutil/Makefile.am | 1 +
libs/wxutil/Makefile.in | 4 +-
libs/wxutil/MouseButton.h | 54 +-
libs/wxutil/MouseToolHandler.cpp | 343 +++++++
libs/wxutil/MouseToolHandler.h | 66 ++
libs/wxutil/event/KeyEventFilter.h | 24 +-
ltmain.sh | 4 +-
plugins/Makefile.am | 1 -
plugins/Makefile.in | 6 +-
plugins/dm.editing/AIEditingPanel.cpp | 17 +-
plugins/eclassmgr/EClassManager.cpp | 8 +-
plugins/entity/AngleKey.cpp | 35 +
plugins/entity/AngleKey.h | 59 ++
plugins/entity/EntityNode.cpp | 10 +-
plugins/entity/EntitySettings.cpp | 4 +-
plugins/entity/EntitySettings.h | 8 +-
plugins/entity/Makefile.am | 4 +-
plugins/entity/Makefile.in | 31 +-
plugins/entity/RotationKey.cpp | 7 +-
plugins/entity/RotationKey.h | 7 +-
plugins/entity/RotationMatrix.cpp | 2 +-
plugins/entity/angle.cpp | 23 -
plugins/entity/angle.h | 83 --
plugins/entity/doom3group/Doom3Group.cpp | 27 +-
plugins/entity/doom3group/Doom3Group.h | 10 +-
plugins/entity/doom3group/Doom3GroupNode.cpp | 15 +-
plugins/entity/doom3group/Doom3GroupNode.h | 3 +
plugins/entity/eclassmodel/EclassModel.cpp | 137 ---
plugins/entity/eclassmodel/EclassModel.h | 79 --
plugins/entity/eclassmodel/EclassModelNode.cpp | 128 ++-
plugins/entity/eclassmodel/EclassModelNode.h | 39 +-
plugins/entity/generic/GenericEntity.cpp | 26 +-
plugins/entity/generic/GenericEntity.h | 3 +-
plugins/entity/generic/GenericEntityNode.cpp | 57 +-
plugins/entity/generic/GenericEntityNode.h | 17 +
plugins/entity/light/Light.cpp | 5 +
plugins/entity/light/Light.h | 2 +
plugins/entity/light/LightNode.cpp | 5 +
plugins/entity/light/LightNode.h | 3 +
plugins/entity/target/RenderableTargetLines.h | 5 +
plugins/entity/target/TargetKeyCollection.cpp | 6 +
plugins/entity/target/TargetLineNode.cpp | 65 ++
plugins/entity/target/TargetLineNode.h | 47 +
plugins/entity/target/TargetableNode.cpp | 46 +-
plugins/entity/target/TargetableNode.h | 27 +-
plugins/entitylist/GraphTreeModelPopulator.h | 2 +-
plugins/mapdoom3/Quake3MapReader.cpp | 12 +-
plugins/mapdoom3/primitiveparsers/BrushDef.cpp | 134 +++
plugins/mapdoom3/primitiveparsers/BrushDef.h | 20 +-
plugins/md5model/MD5Surface.cpp | 25 +-
plugins/md5model/MD5Surface.h | 3 +
plugins/particles/editor/ParticleEditor.cpp | 8 +-
plugins/script/ScriptCommand.h | 19 +-
plugins/script/ScriptMenu.cpp | 23 +-
plugins/wavefront/Makefile.am | 9 -
plugins/wavefront/Makefile.in | 730 --------------
plugins/wavefront/WaveFrontExporter.cpp | 143 ---
plugins/wavefront/WaveFrontExporter.h | 39 -
plugins/wavefront/WaveFrontModule.cpp | 94 --
plugins/wavefront/WaveFrontModule.h | 25 -
plugins/wavefront/plugin.cpp | 19 -
plugins/wavefront/wavefront.def | 7 -
radiant/Makefile.am | 3 +-
radiant/Makefile.in | 47 +-
radiant/brush/Brush.cpp | 54 +-
radiant/brush/Brush.h | 13 +-
radiant/brush/BrushNode.cpp | 30 +-
radiant/brush/BrushNode.h | 8 +
radiant/brush/Face.cpp | 129 ++-
radiant/brush/Face.h | 26 +-
radiant/brush/FaceTexDef.cpp | 102 --
radiant/brush/FaceTexDef.h | 74 --
.../{BrushPrimitTexDef.cpp => TextureMatrix.cpp} | 45 +-
.../brush/{BrushPrimitTexDef.h => TextureMatrix.h} | 28 +-
radiant/brush/TextureProjection.cpp | 51 +-
radiant/brush/TextureProjection.h | 41 +-
radiant/brush/csg/BrushByPlaneClipper.cpp | 109 +--
radiant/brush/csg/BrushByPlaneClipper.h | 4 +-
radiant/brush/csg/CSG.cpp | 3 -
radiant/camera/CamWnd.cpp | 191 ++--
radiant/camera/CamWnd.h | 37 +-
radiant/camera/CameraSettings.cpp | 13 +-
radiant/camera/GlobalCamera.cpp | 10 +-
radiant/camera/tools/FreeMoveTool.h | 74 +-
radiant/camera/tools/JumpToObjectTool.h | 10 +-
radiant/camera/tools/ShaderClipboardTools.h | 34 +-
radiant/layers/LayerSystem.cpp | 6 +-
radiant/map/RegionManager.cpp | 6 +-
radiant/map/algorithm/AssignLayerMappingWalker.h | 23 +-
radiant/patch/Patch.cpp | 167 ++--
radiant/patch/Patch.h | 9 +-
radiant/patch/PatchNode.cpp | 24 +-
radiant/patch/PatchNode.h | 8 +
radiant/render/OpenGLRenderSystem.cpp | 9 +
radiant/selection/ManipulateMouseTool.cpp | 15 +-
radiant/selection/ManipulateMouseTool.h | 4 +-
radiant/selection/RadiantSelectionSystem.cpp | 46 +-
radiant/selection/SceneWalkers.h | 2 +-
radiant/selection/SelectionMouseTools.cpp | 18 +-
radiant/selection/SelectionMouseTools.h | 6 +-
radiant/selection/TransformationVisitors.cpp | 77 +-
radiant/selection/TransformationVisitors.h | 27 +-
radiant/selection/algorithm/General.cpp | 9 +-
radiant/selection/algorithm/General.h | 13 +-
radiant/selection/algorithm/Group.cpp | 44 +-
radiant/selection/algorithm/Primitives.cpp | 16 +-
radiant/selection/algorithm/Shader.cpp | 149 ++-
radiant/selection/algorithm/Shader.h | 49 +-
radiant/selection/algorithm/Transformation.cpp | 6 +-
.../shaderclipboard/ClosestTexturableFinder.cpp | 2 +-
radiant/textool/item/FaceItem.cpp | 30 +-
radiant/textool/item/FaceItem.h | 4 +
radiant/textool/item/FaceVertexItem.cpp | 4 +-
radiant/ui/einspector/ColourPropertyEditor.cpp | 2 +-
radiant/ui/einspector/ModelPropertyEditor.cpp | 2 +-
radiant/ui/lightinspector/LightInspector.cpp | 2 +-
radiant/ui/mainframe/MainFrame.cpp | 14 +-
radiant/ui/mainframe/MainFrame.h | 26 +-
radiant/ui/mousetool/BindToolDialog.cpp | 11 +-
radiant/ui/ortho/OrthoContextMenu.cpp | 2 +-
radiant/ui/surfaceinspector/SurfaceInspector.cpp | 69 +-
radiant/ui/texturebrowser/TextureBrowser.cpp | 2 -
radiant/xyview/GlobalXYWnd.cpp | 18 +-
radiant/xyview/GlobalXYWnd.h | 19 +-
radiant/xyview/XYWnd.cpp | 277 +++---
radiant/xyview/XYWnd.h | 39 +-
radiant/xyview/tools/BrushCreatorTool.cpp | 14 +-
radiant/xyview/tools/BrushCreatorTool.h | 16 +-
radiant/xyview/tools/CameraAngleTool.h | 15 +-
radiant/xyview/tools/CameraMoveTool.h | 15 +-
radiant/xyview/tools/ClipperTool.h | 12 +-
radiant/xyview/tools/MoveViewTool.h | 12 +-
radiant/xyview/tools/ZoomTool.h | 12 +-
tools/i18n/darkradiant.pot | 958 ++++++++++---------
tools/innosetup/darkradiant.iss | 9 +-
tools/innosetup/darkradiant.x64.iss | 9 +-
tools/msvc2013/DarkRadiant.sln | 14 -
tools/msvc2013/DarkRadiant.vcxproj | 6 +-
tools/msvc2013/DarkRadiant.vcxproj.filters | 18 +-
tools/msvc2013/entity.vcxproj | 8 +-
tools/msvc2013/entity.vcxproj.filters | 24 +-
tools/msvc2013/wxutillib.vcxproj | 2 +
tools/msvc2013/wxutillib.vcxproj.filters | 2 +
tools/scripts/compile_release_package.ps1 | 86 ++
tools/scripts/compile_release_package.x64.cmd | 8 +-
tools/scripts/compile_release_package.x86.cmd | 8 +-
tools/scripts/compile_release_package_all.cmd | 4 -
170 files changed, 5249 insertions(+), 4601 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/darkradiant.git
More information about the Pkg-games-commits
mailing list