[rbdoom3bfg] 02/06: Merge tag 'upstream/1.1.0_preview3+repack1+git20160807'
Tobias Frost
tobi at moszumanska.debian.org
Tue Oct 11 06:12:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
tobi pushed a commit to branch master
in repository rbdoom3bfg.
commit 3d38c4c88b0dc0bcc7c5bf43d0aafd4dea756631
Merge: 70282a9 55722b3
Author: Tobias Frost <tobi at coldtobi.de>
Date: Sun Oct 9 16:14:04 2016 +0200
Merge tag 'upstream/1.1.0_preview3+repack1+git20160807'
Upstream version 1.1.0~preview3+repack1+git20160807
# gpg: Signatur vom So 09 Okt 2016 16:14:00 CEST
# gpg: mittels RSA-Schlüssel 9164FA1D17BD5D36
# gpg: Aussteller "tobi at coldtobi.de"
# gpg: Korrekte Signatur von "Tobias Frost <tobi at coldtobi.de>" [ultimativ]
# gpg: alias "Tobias Frost <tobi at frost.de>" [ultimativ]
# gpg: alias "[jpeg image of size 5939]" [ultimativ]
# gpg: alias "Tobias Frost <tobi at debian.org>" [ultimativ]
ChangeLog | 716 +
README.txt | 73 +-
RELEASE-NOTES.txt | 23 +
base/renderprogs/AmbientOcclusion_AO.pixel | 449 +
...rtex_color.pixel => AmbientOcclusion_AO.vertex} | 18 +-
base/renderprogs/AmbientOcclusion_blur.pixel | 388 +
...ex_color.pixel => AmbientOcclusion_blur.vertex} | 18 +-
base/renderprogs/AmbientOcclusion_minify.pixel | 82 +
..._color.pixel => AmbientOcclusion_minify.vertex} | 18 +-
base/renderprogs/BRDF.inc | 135 +
base/renderprogs/DeepGBufferRadiosity_blur.pixel | 378 +
...olor.pixel => DeepGBufferRadiosity_blur.vertex} | 18 +-
.../DeepGBufferRadiosity_radiosity.pixel | 557 +
...pixel => DeepGBufferRadiosity_radiosity.vertex} | 18 +-
base/renderprogs/SMAA.inc | 1382 ++
...inned.pixel => SMAA_blending_weight_calc.pixel} | 58 +-
...gui.vertex => SMAA_blending_weight_calc.vertex} | 43 +-
...postprocess.pixel => SMAA_edge_detection.pixel} | 46 +-
...{bink_gui.vertex => SMAA_edge_detection.vertex} | 40 +-
...exture_color_skinned.pixel => SMAA_final.pixel} | 48 +-
.../{bink_gui.vertex => SMAA_final.vertex} | 33 +-
base/renderprogs/_manifest.lua | 42 +-
.../{interaction.pixel => ambient_lighting.pixel} | 55 +-
...{interaction.vertex => ambient_lighting.vertex} | 21 +-
base/renderprogs/bink_gui.vertex | 2 +-
base/renderprogs/bumpyenvironment.pixel | 2 +-
base/renderprogs/bumpyenvironment_skinned.pixel | 2 +-
base/renderprogs/environment.pixel | 2 +-
base/renderprogs/environment.vertex | 2 +-
base/renderprogs/environment_skinned.pixel | 2 +-
base/renderprogs/fog.pixel | 2 +-
base/renderprogs/fog_skinned.pixel | 2 +-
.../{bumpyenvironment.pixel => gbuffer.pixel} | 39 +-
.../{interaction.vertex => gbuffer.vertex} | 97 +-
base/renderprogs/global.inc | 70 +-
base/renderprogs/gui.vertex | 2 +-
base/renderprogs/hdr_glare_chromatic.pixel | 128 +
...{bink_gui.vertex => hdr_glare_chromatic.vertex} | 21 +-
base/renderprogs/heatHazeWithMask.pixel | 2 +-
base/renderprogs/heatHazeWithMaskAndVertex.pixel | 2 +-
base/renderprogs/heathaze.pixel | 2 +-
base/renderprogs/interaction.pixel | 124 +-
base/renderprogs/interaction.vertex | 9 +-
base/renderprogs/interactionAmbient.pixel | 23 +-
base/renderprogs/interactionAmbient_skinned.pixel | 18 +-
base/renderprogs/interactionSM.pixel | 131 +-
base/renderprogs/interactionSM.vertex | 17 +-
base/renderprogs/postprocess.pixel | 129 +-
.../{postprocess.pixel => screen.pixel} | 14 +-
.../renderprogs/{bink_gui.vertex => screen.vertex} | 21 +-
base/renderprogs/skybox.pixel | 2 +-
base/renderprogs/texture.pixel | 2 +
base/renderprogs/texture_color.pixel | 2 +-
base/renderprogs/texture_color_skinned.pixel | 2 +-
base/renderprogs/texture_color_texgen.pixel | 2 +-
base/renderprogs/tonemap.pixel | 216 +
.../{bink_gui.vertex => tonemap.vertex} | 21 +-
base/renderprogs/vertex_color.pixel | 2 +-
base/renderprogs/wobblesky.pixel | 2 +-
.../scripts/addons/io_export_rbdoom_map_json.py | 175 +
.../scripts/addons/io_import_rbdoom_map_json.py | 356 +
doomclassic/doom/d_main.cpp | 4 +-
doomclassic/doom/i_sound_win32.cpp | 2 +-
neo/CMakeLists.txt | 137 +-
neo/astyle-code.bat | 5 +
neo/cm/CollisionModel_load.cpp | 109 +-
neo/cm/CollisionModel_local.h | 4 +
neo/cmake-vs2015-32bit-windows10.bat | 6 +
neo/cmake-vs2015-32bit.bat | 6 +
neo/cmake-vs2015-64bit-windows10.bat | 6 +
neo/cmake-vs2015-64bit.bat | 6 +
neo/d3xp/Game.h | 11 +-
neo/d3xp/Game_local.cpp | 75 +
neo/d3xp/Game_local.h | 13 +
neo/d3xp/Game_network.cpp | 4 +
neo/d3xp/gamesys/SysCmds.cpp | 2 +-
neo/d3xp/menus/MenuScreen.h | 1 +
neo/d3xp/menus/MenuScreen_Shell_Credits.cpp | 2 +-
neo/d3xp/menus/MenuScreen_Shell_GameOptions.cpp | 15 +
neo/d3xp/menus/MenuScreen_Shell_SystemOptions.cpp | 59 +-
neo/framework/CmdSystem.h | 6 +
neo/framework/Common.cpp | 2 +
neo/framework/Common.h | 2 +
neo/framework/Common_demos.cpp | 122 +-
neo/framework/Common_mapconvert.cpp | 670 +
neo/framework/Console.cpp | 7 +-
neo/framework/DeclEntityDef.cpp | 7 +-
neo/framework/DeclManager.cpp | 61 +
neo/framework/DemoFile.h | 3 +
neo/framework/FileSystem.cpp | 2 +-
neo/framework/Licensee.h | 2 +-
neo/framework/PlayerProfile.cpp | 1 +
neo/framework/common_frame.cpp | 12 +-
neo/idlib/Dict.cpp | 27 +
neo/idlib/Dict.h | 5 +
neo/idlib/Lexer.cpp | 28 +
neo/idlib/Lexer.h | 3 +
neo/idlib/MapFile.cpp | 1241 +-
neo/idlib/MapFile.h | 160 +-
neo/idlib/math/MatX.h | 1 -
neo/idlib/precompiled.h | 3 +
neo/idlib/sys/sys_assert.h | 4 +
neo/idlib/sys/sys_defines.h | 3 +-
neo/libs/irrxml/changes.txt | 33 +
neo/libs/irrxml/doc/irrXML.chm | Bin 0 -> 63988 bytes
neo/libs/irrxml/doc/readme.txt | 2 +
neo/libs/irrxml/example/Makefile | 24 +
neo/libs/irrxml/example/config.xml | 26 +
neo/libs/irrxml/example/irrXML.dev | 76 +
neo/libs/irrxml/example/irrXML.dsp | 124 +
neo/libs/irrxml/example/irrXML.dsw | 29 +
neo/libs/irrxml/example/irrxml.sln | 21 +
neo/libs/irrxml/example/irrxml.vcproj | 147 +
neo/libs/irrxml/example/test.cpp | 40 +
neo/libs/irrxml/readme.txt | 110 +
neo/libs/irrxml/src/CXMLReaderImpl.h | 806 +
neo/libs/irrxml/src/fast_atof.h | 139 +
neo/libs/irrxml/src/heapsort.h | 73 +
neo/libs/irrxml/src/irrArray.h | 444 +
neo/libs/irrxml/src/irrString.h | 664 +
neo/libs/irrxml/src/irrTypes.h | 101 +
neo/libs/irrxml/src/irrXML.cpp | 165 +
neo/libs/irrxml/src/irrXML.h | 547 +
neo/libs/rapidjson/CHANGELOG.md | 79 +
neo/libs/rapidjson/CMakeLists.txt | 114 +
neo/libs/rapidjson/example/CMakeLists.txt | 29 +
.../rapidjson/example/capitalize/capitalize.cpp | 66 +
neo/libs/rapidjson/example/condense/condense.cpp | 32 +
.../example/messagereader/messagereader.cpp | 96 +
neo/libs/rapidjson/example/pretty/pretty.cpp | 30 +
.../rapidjson/example/prettyauto/prettyauto.cpp | 56 +
neo/libs/rapidjson/example/serialize/serialize.cpp | 157 +
neo/libs/rapidjson/example/simpledom/simpledom.cpp | 29 +
.../example/simplereader/simplereader.cpp | 38 +
.../example/simplewriter/simplewriter.cpp | 35 +
neo/libs/rapidjson/example/tutorial/tutorial.cpp | 151 +
neo/libs/rapidjson/include/rapidjson/allocators.h | 261 +
neo/libs/rapidjson/include/rapidjson/document.h | 2014 +++
.../rapidjson/include/rapidjson/encodedstream.h | 261 +
neo/libs/rapidjson/include/rapidjson/encodings.h | 625 +
neo/libs/rapidjson/include/rapidjson/error/en.h | 65 +
neo/libs/rapidjson/include/rapidjson/error/error.h | 146 +
.../rapidjson/include/rapidjson/filereadstream.h | 88 +
.../rapidjson/include/rapidjson/filewritestream.h | 91 +
.../include/rapidjson/internal/biginteger.h | 280 +
.../rapidjson/include/rapidjson/internal/diyfp.h | 247 +
.../rapidjson/include/rapidjson/internal/dtoa.h | 217 +
.../rapidjson/include/rapidjson/internal/ieee754.h | 77 +
.../rapidjson/include/rapidjson/internal/itoa.h | 304 +
.../rapidjson/include/rapidjson/internal/meta.h | 181 +
.../rapidjson/include/rapidjson/internal/pow10.h | 55 +
.../rapidjson/include/rapidjson/internal/stack.h | 179 +
.../rapidjson/include/rapidjson/internal/strfunc.h | 39 +
.../rapidjson/include/rapidjson/internal/strtod.h | 270 +
.../rapidjson/include/rapidjson/memorybuffer.h | 70 +
.../rapidjson/include/rapidjson/memorystream.h | 61 +
.../include/rapidjson/msinttypes/inttypes.h | 316 +
.../include/rapidjson/msinttypes/stdint.h | 300 +
.../rapidjson/include/rapidjson/prettywriter.h | 207 +
neo/libs/rapidjson/include/rapidjson/rapidjson.h | 654 +
neo/libs/rapidjson/include/rapidjson/reader.h | 1452 ++
.../rapidjson/include/rapidjson/stringbuffer.h | 93 +
neo/libs/rapidjson/include/rapidjson/writer.h | 395 +
neo/libs/rapidjson/license.txt | 57 +
neo/libs/rapidjson/readme.md | 129 +
neo/renderer/Cinematic.cpp | 8 +-
neo/renderer/Framebuffer.cpp | 310 +-
neo/renderer/Framebuffer.h | 56 +-
neo/renderer/GLMatrix.cpp | 17 +
neo/renderer/GLMatrix.h | 1 +
neo/renderer/GraphicsAPIWrapper.h | 5 +-
neo/renderer/Image.h | 23 +-
neo/renderer/ImageOpts.h | 13 +-
neo/renderer/Image_intrinsic.cpp | 285 +-
neo/renderer/Image_load.cpp | 189 +-
neo/renderer/Interaction.cpp | 3 +-
neo/renderer/Material.cpp | 37 +-
neo/renderer/Material.h | 34 +-
neo/renderer/Model.cpp | 662 +-
neo/renderer/Model.h | 4 +
neo/renderer/ModelDecal.cpp | 140 +-
neo/renderer/ModelDecal.h | 15 +-
neo/renderer/ModelManager.cpp | 40 +-
neo/renderer/ModelOverlay.cpp | 98 +-
neo/renderer/ModelOverlay.h | 6 +
neo/renderer/Model_ColladaHelper.h | 623 +
neo/renderer/Model_ColladaParser.cpp | 3196 ++++
neo/renderer/Model_ColladaParser.h | 353 +
neo/renderer/Model_local.h | 7 +
neo/renderer/OpenGL/gl_GraphicsAPIWrapper.cpp | 23 +-
neo/renderer/OpenGL/gl_Image.cpp | 75 +-
neo/renderer/OpenGL/gl_backend.cpp | 10 +-
neo/renderer/RenderEntity.cpp | 196 +
neo/renderer/RenderLog.cpp | 29 +-
neo/renderer/RenderLog.h | 1 +
neo/renderer/RenderProgs.cpp | 84 +-
neo/renderer/RenderProgs.h | 142 +-
neo/renderer/RenderProgs_GLSL.cpp | 34 +-
neo/renderer/RenderProgs_embedded.h | 9833 +++++++++---
neo/renderer/RenderSystem.cpp | 40 +-
neo/renderer/RenderSystem.h | 13 +-
neo/renderer/RenderSystem_init.cpp | 183 +-
neo/renderer/RenderWorld.cpp | 18 +-
neo/renderer/RenderWorld_demo.cpp | 659 +-
neo/renderer/RenderWorld_load.cpp | 6 +-
neo/renderer/RenderWorld_local.h | 10 +-
neo/renderer/SMAA/AreaTex.h | 14981 +++++++++++++++++++
neo/renderer/SMAA/SearchTex.h | 133 +
neo/renderer/VertexCache.h | 2 +-
neo/renderer/tr_backend_draw.cpp | 4850 ++++--
neo/renderer/tr_frontend_addlights.cpp | 8 +-
neo/renderer/tr_frontend_addmodels.cpp | 488 +-
neo/renderer/tr_frontend_main.cpp | 5 +
neo/renderer/tr_local.h | 63 +-
neo/sound/snd_emitter.cpp | 9 +
neo/sound/snd_local.h | 9 +-
neo/sound/snd_shader.cpp | 5 +
neo/sound/snd_world.cpp | 40 +-
neo/swf/SWF.h | 32 +
neo/swf/SWF_File.cpp | 376 +
neo/swf/SWF_File.h | 107 +
neo/swf/SWF_Image.cpp | 27 +-
neo/swf/SWF_Load.cpp | 1250 ++
neo/swf/SWF_Main.cpp | 183 +-
neo/swf/SWF_Names.cpp | 35 +
neo/swf/SWF_PlaceObject.cpp | 16 -
neo/swf/SWF_Render.cpp | 563 +-
neo/swf/SWF_ScriptFunction.cpp | 1525 +-
neo/swf/SWF_ScriptFunction.h | 25 +
neo/swf/SWF_ScriptVar.cpp | 12 +-
neo/swf/SWF_ScriptVar.h | 24 +-
neo/swf/SWF_SpriteInstance.cpp | 4 +-
neo/swf/SWF_SpriteInstance.h | 22 +
neo/swf/SWF_Sprites.cpp | 550 +
neo/swf/SWF_Sprites.h | 18 +
neo/swf/SWF_Types.h | 68 +
neo/swf/SWF_Zlib.cpp | 38 +
neo/sys/sdl/sdl_events.cpp | 172 +-
neo/tools/compilers/aas/AASBuild.cpp | 4 +
neo/tools/compilers/dmap/dmap.cpp | 38 +
neo/tools/compilers/dmap/dmap.h | 51 +-
neo/tools/compilers/dmap/facebsp.cpp | 59 +-
neo/tools/compilers/dmap/glfile.cpp | 498 +-
neo/tools/compilers/dmap/map.cpp | 154 +-
neo/tools/compilers/dmap/output.cpp | 21 +-
neo/tools/compilers/dmap/portals.cpp | 159 +-
neo/tools/compilers/dmap/tritjunction.cpp | 4 +-
neo/tools/compilers/dmap/ubrush.cpp | 9 +-
neo/tools/compilers/dmap/usurface.cpp | 118 +-
249 files changed, 61645 insertions(+), 5353 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/rbdoom3bfg.git
More information about the Pkg-games-commits
mailing list