This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository blockattack.
commit e4eda8fdcb1713ad3fc8945c00b271f2a4d6ad4a Merge: 034a3a6 caa8812 Author: Markus Koschany <[email protected]> Date: Mon Jun 26 17:27:50 2017 +0200 Merge tag 'upstream/2.1.1' Upstream version 2.1.1 # gpg: Signatur vom Mo 26 Jun 2017 17:27:49 CEST # gpg: mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4 # gpg: Korrekte Signatur von "Markus Koschany <[email protected]>" [ultimativ] # gpg: alias "Markus Koschany <[email protected]>" [ultimativ] # gpg: alias "Markus Koschany <[email protected]>" [ultimativ] .dockerignore | 7 + .gitignore | 6 + .travis.yml | 25 +- CMakeLists.txt | 29 +- Game/data/sprites/blockattack.sprite | 10 +- Game/data/sprites/blockattack1.sprite | 93 +- Game/data/textures/dialogbox.png | Bin 9894 -> 0 bytes Game/data/textures/fileDialogbox.png | Bin 10310 -> 0 bytes README.md | 44 +- ReleaseNotes-2.0.0.txt | 31 - ReleaseNotes-2.0.1.txt | 12 - ReleaseNotes-2.1.1.txt | 39 + man/README | 3 +- man/blockattack.man | 14 +- source/AUTH | 183 +- source/code/BallManager.hpp | 138 + source/code/BlockAttackWin32.dev | 479 --- source/code/BlockGame.cpp | 201 +- source/code/BlockGame.hpp | 122 +- source/code/BlockGameSdl.inc | 71 +- source/code/DialogBox.cpp | 48 +- source/code/DialogBox.hpp | 6 +- source/code/ExplosionManager.hpp | 109 + source/code/Libs/.editorconfig | 13 +- source/code/Libs/NFont.cpp | 59 +- source/code/Libs/NFont.h | 20 +- source/code/Libs/SDL_FontCache.c | 139 +- source/code/Libs/SDL_FontCache.h | 14 +- source/code/Libs/include/cereal/ABOUT | 2 +- source/code/Libs/include/cereal/access.hpp | 39 +- .../code/Libs/include/cereal/archives/adapters.hpp | 2 +- .../code/Libs/include/cereal/archives/binary.hpp | 8 +- source/code/Libs/include/cereal/archives/json.hpp | 165 +- .../include/cereal/archives/portable_binary.hpp | 127 +- source/code/Libs/include/cereal/archives/xml.hpp | 45 +- source/code/Libs/include/cereal/cereal.hpp | 48 +- .../code/Libs/include/cereal/details/helpers.hpp | 37 +- .../include/cereal/details/polymorphic_impl.hpp | 431 ++- .../deque.hpp => details/polymorphic_impl_fwd.hpp} | 57 +- .../Libs/include/cereal/details/static_object.hpp | 39 +- source/code/Libs/include/cereal/details/traits.hpp | 126 +- .../code/Libs/include/cereal/external/base64.hpp | 152 +- .../include/cereal/external/rapidjson/allocators.h | 271 ++ .../include/cereal/external/rapidjson/document.h | 3306 +++++++++++++++----- .../cereal/external/rapidjson/encodedstream.h | 299 ++ .../include/cereal/external/rapidjson/encodings.h | 716 +++++ .../include/cereal/external/rapidjson/error/en.h | 74 + .../cereal/external/rapidjson/error/error.h | 155 + .../cereal/external/rapidjson/filereadstream.h | 99 + .../include/cereal/external/rapidjson/filestream.h | 47 - .../cereal/external/rapidjson/filewritestream.h | 104 + .../Libs/include/cereal/external/rapidjson/fwd.h | 151 + .../cereal/external/rapidjson/genericstream.h | 105 - .../external/rapidjson/internal/biginteger.h | 290 ++ .../cereal/external/rapidjson/internal/diyfp.h | 258 ++ .../cereal/external/rapidjson/internal/dtoa.h | 245 ++ .../cereal/external/rapidjson/internal/ieee754.h | 78 + .../cereal/external/rapidjson/internal/itoa.h | 304 ++ .../cereal/external/rapidjson/internal/meta.h | 181 ++ .../cereal/external/rapidjson/internal/pow10.h | 87 +- .../cereal/external/rapidjson/internal/regex.h | 701 +++++ .../cereal/external/rapidjson/internal/stack.h | 312 +- .../cereal/external/rapidjson/internal/strfunc.h | 79 +- .../cereal/external/rapidjson/internal/strtod.h | 269 ++ .../cereal/external/rapidjson/internal/swap.h | 46 + .../cereal/external/rapidjson/istreamwrapper.h | 116 + .../include/cereal/external/rapidjson/license.txt | 19 - .../cereal/external/rapidjson/memorybuffer.h | 70 + .../cereal/external/rapidjson/memorystream.h | 76 + .../external/rapidjson/msinttypes/inttypes.h | 316 ++ .../cereal/external/rapidjson/msinttypes/stdint.h | 300 ++ .../cereal/external/rapidjson/ostreamwrapper.h | 81 + .../include/cereal/external/rapidjson/pointer.h | 1358 ++++++++ .../cereal/external/rapidjson/prettywriter.h | 385 ++- .../include/cereal/external/rapidjson/rapidjson.h | 1140 +++---- .../include/cereal/external/rapidjson/reader.h | 2438 +++++++++++---- .../include/cereal/external/rapidjson/schema.h | 2006 ++++++++++++ .../include/cereal/external/rapidjson/stream.h | 179 ++ .../cereal/external/rapidjson/stringbuffer.h | 166 +- .../include/cereal/external/rapidjson/writer.h | 870 ++++-- .../include/cereal/external/rapidxml/rapidxml.hpp | 122 +- .../external/rapidxml/rapidxml_iterators.hpp | 6 +- .../cereal/external/rapidxml/rapidxml_print.hpp | 10 +- .../cereal/external/rapidxml/rapidxml_utils.hpp | 6 +- source/code/Libs/include/cereal/macros.hpp | 53 + source/code/Libs/include/cereal/types/array.hpp | 2 +- .../code/Libs/include/cereal/types/base_class.hpp | 43 +- source/code/Libs/include/cereal/types/bitset.hpp | 72 +- .../Libs/include/cereal/types/boost_variant.hpp | 14 +- source/code/Libs/include/cereal/types/common.hpp | 2 +- .../pair_associative_container.hpp} | 51 +- source/code/Libs/include/cereal/types/deque.hpp | 2 +- .../Libs/include/cereal/types/forward_list.hpp | 2 +- .../cereal/types/{utility.hpp => functional.hpp} | 26 +- source/code/Libs/include/cereal/types/list.hpp | 2 +- source/code/Libs/include/cereal/types/map.hpp | 74 +- source/code/Libs/include/cereal/types/memory.hpp | 61 +- .../code/Libs/include/cereal/types/polymorphic.hpp | 103 +- source/code/Libs/include/cereal/types/queue.hpp | 6 +- source/code/Libs/include/cereal/types/set.hpp | 2 +- source/code/Libs/include/cereal/types/stack.hpp | 4 +- source/code/Libs/include/cereal/types/string.hpp | 2 +- source/code/Libs/include/cereal/types/tuple.hpp | 2 +- .../Libs/include/cereal/types/unordered_map.hpp | 66 +- .../Libs/include/cereal/types/unordered_set.hpp | 2 +- source/code/Libs/include/cereal/types/utility.hpp | 2 +- source/code/Libs/include/cereal/types/valarray.hpp | 2 +- source/code/Libs/include/cereal/types/vector.hpp | 2 +- source/code/MenuSystem.cpp | 237 +- source/code/MenuSystem.h | 39 +- source/code/README | 26 - source/code/ReadKeyboard.cpp | 1 - source/code/{DialogBox.hpp => ReplayPlayer.cpp} | 73 +- .../code/{ScoresDisplay.hpp => ReplayPlayer.hpp} | 32 +- source/code/ScoresDisplay.cpp | 114 +- source/code/ScoresDisplay.hpp | 11 +- source/code/TextManager.hpp | 106 + source/code/common.cpp | 43 +- source/code/common.h | 6 +- source/code/gamecontroller.cpp | 18 +- source/code/global.hpp | 77 +- source/code/highscore.cpp | 2 +- source/code/levelselect.cpp | 206 ++ source/code/{version.h => levelselect.hpp} | 10 +- source/code/main.cpp | 1426 ++++----- source/code/mainVars.inc | 41 +- source/code/menu/MenuItem.hpp | 26 - source/code/menudef.cpp | 145 +- source/code/os.cpp | 2 +- source/code/puzzlehandler.cpp | 5 +- source/code/replayhandler.cpp | 89 + source/code/{version.h => replayhandler.hpp} | 19 +- source/code/sago/GameStateInterface.hpp | 33 +- source/code/sago/Makefile.sago | 2 +- source/code/sago/SagoDataHolder.cpp | 72 +- source/code/sago/SagoDataHolder.hpp | 50 +- source/code/sago/SagoMisc.cpp | 59 +- source/code/sago/SagoMisc.hpp | 70 +- source/code/sago/SagoMiscSdl2.cpp | 58 +- source/code/sago/SagoMiscSdl2.hpp | 36 +- source/code/sago/SagoSprite.cpp | 58 +- source/code/sago/SagoSprite.hpp | 65 +- source/code/sago/SagoSpriteHolder.cpp | 114 +- source/code/sago/SagoSpriteHolder.hpp | 44 +- source/code/sago/platform_folders.cpp | 89 +- source/code/sago/platform_folders.h | 52 +- source/code/stageclearhandler.cpp | 3 +- source/code/stats.cpp | 3 +- source/code/version.h | 2 +- source/misc/blockattack.desktop | 2 +- source/misc/docker/Dockerfile.Ubuntu14.04build | 14 + source/misc/docker/Dockerfile.WindoesBuild | 32 + source/misc/lint/runLint.sh | 20 + source/misc/translation/build_mo_single_file.sh | 2 +- source/misc/translation/po/da.po | 392 +++ source/misc/translation/po/da_DK.po | 421 --- .../translation/template/blockattack_roftb.pot | 230 +- travis_build.script | 13 +- windows installer/install_script.nsi | 3 +- 159 files changed, 19646 insertions(+), 6678 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/blockattack.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
