[blockattack] 03/32: Merge tag 'upstream/2.0.0'
Markus Koschany
apo at moszumanska.debian.org
Sun Jun 5 18:57:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository blockattack.
commit 7c3d90e1526a592707ce53805eba27ead20d07e5
Merge: b80556d 8c52d0f
Author: Markus Koschany <apo at debian.org>
Date: Sun Jun 5 18:52:47 2016 +0200
Merge tag 'upstream/2.0.0'
Upstream version 2.0.0
# gpg: Signature made Sun 05 Jun 2016 18:52:44 CEST using RSA key ID 513B51E4
# gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
# gpg: aka "Markus Koschany <markus at koschany.net>" [ultimate]
# gpg: aka "Markus Koschany <apo at debian.org>" [ultimate]
.gitignore | 24 +
.travis.yml | 33 +
CMakeLists.txt | 83 +
Game/COPYING.TXT | 1 +
Game/SConscript | 13 -
Game/data/fonts/freeserif.ttf | Bin 0 -> 974044 bytes
.../fonts/penguin_attack_license.txt} | 705 ++-
Game/data/fonts/penguinattack.ttf | Bin 0 -> 70356 bytes
Game/{music/bgMusic.ogg => data/music/bgmusic.ogg} | Bin
Game/{ => data}/music/highbeat.ogg | Bin
Game/{ => data}/puzzles/copy | 0
Game/{ => data}/puzzles/puzzle.levels | 0
Game/{ => data}/puzzles/testPuzzles | 0
Game/{sound => data/sounds}/applause.ogg | Bin
Game/{sound => data/sounds}/cameraclick.ogg | Bin
Game/{sound => data/sounds}/counter.ogg | Bin
.../sounds/counter_final.ogg} | Bin
Game/{sound => data/sounds}/pop.ogg | Bin
Game/{sound => data/sounds}/typing.ogg | Bin
Game/data/sprites/blockattack.sprite | 181 +
Game/data/sprites/blockattack1.sprite | 626 ++
Game/data/sprites/gui_rect_white.sprite | 75 +
Game/data/sprites/gui_rect_yellow.sprite | 75 +
Game/data/textures/b_blank.png | Bin 0 -> 341 bytes
Game/{gfx/bExit.png => data/textures/b_exit.png} | Bin
.../textures/b_highscore.png} | Bin
.../BackBoard.png => data/textures/back_board.png} | Bin
Game/{gfx => data/textures}/background.png | Bin
.../ballBlue.png => data/textures/ball_blue.png} | Bin
.../ballGray.png => data/textures/ball_gray.png} | Bin
.../ballGreen.png => data/textures/ball_green.png} | Bin
.../textures/ball_purple.png} | Bin
.../ballRed.png => data/textures/ball_red.png} | Bin
.../textures/ball_turkish.png} | Bin
.../textures/ball_yellow.png} | Bin
.../textures/black_back_ground.png} | Bin
.../blackLine.png => data/textures/black_line.png} | Bin
Game/{gfx/bricks => data/textures}/blue.png | Bin
Game/data/textures/board_back_back.png | Bin 0 -> 11743 bytes
Game/data/textures/bomb.png | Bin 0 -> 2776 bytes
.../textures/chain_frame.png} | Bin
.../counter/1.png => data/textures/counter_1.png} | Bin
.../counter/2.png => data/textures/counter_2.png} | Bin
.../counter/3.png => data/textures/counter_3.png} | Bin
Game/{gfx => data/textures}/crossover.png | Bin
Game/data/textures/cursor.png | Bin 0 -> 675 bytes
Game/{gfx => data/textures}/dialogbox.png | Bin
.../0.png => data/textures/explosion0.png} | Bin
.../1.png => data/textures/explosion1.png} | Bin
.../2.png => data/textures/explosion2.png} | Bin
.../3.png => data/textures/explosion3.png} | Bin
Game/data/textures/fallback.png | Bin 0 -> 391 bytes
Game/{gfx => data/textures}/fileDialogbox.png | Bin
.../garbageB.png => data/textures/garbage_b.png} | Bin
.../garbageBL.png => data/textures/garbage_bl.png} | Bin
.../garbageBR.png => data/textures/garbage_br.png} | Bin
.../textures/garbage_fill.png} | Bin
.../garbageGM.png => data/textures/garbage_gm.png} | Bin
.../textures/garbage_gml.png} | Bin
.../textures/garbage_gmr.png} | Bin
.../garbageL.png => data/textures/garbage_l.png} | Bin
.../garbageM.png => data/textures/garbage_m.png} | Bin
.../garbageML.png => data/textures/garbage_ml.png} | Bin
.../garbageMR.png => data/textures/garbage_mr.png} | Bin
.../garbageR.png => data/textures/garbage_r.png} | Bin
.../garbageT.png => data/textures/garbage_t.png} | Bin
.../garbageTL.png => data/textures/garbage_tl.png} | Bin
.../garbageTR.png => data/textures/garbage_tr.png} | Bin
Game/{gfx/bricks => data/textures}/green.png | Bin
Game/{gfx/bricks => data/textures}/grey.png | Bin
Game/data/textures/gui_back_white.png | Bin 0 -> 1999 bytes
Game/data/textures/gui_back_yellow.png | Bin 0 -> 1934 bytes
.../textures/i_check_box_area.png} | Bin
Game/{gfx/iDraw.png => data/textures/i_draw.png} | Bin
.../textures/i_game_over.png} | Bin
.../textures/i_level_check.png} | Bin
.../textures/i_level_check_box.png} | Bin
Game/data/textures/i_level_check_box_marked.png | Bin 0 -> 180 bytes
Game/{gfx/iLoser.png => data/textures/i_loser.png} | Bin
.../textures/i_stage_clear_limit.png} | Bin
.../iWinner.png => data/textures/i_winner.png} | Bin
Game/{gfx => data/textures}/icon.png | Bin
Game/data/textures/menu_marked.png | Bin 0 -> 1704 bytes
Game/data/textures/menu_unmarked.png | Bin 0 -> 1716 bytes
Game/{gfx => data/textures}/mouse.png | Bin
Game/{gfx/bricks => data/textures}/purple.png | Bin
Game/data/textures/ready.png | Bin 0 -> 3721 bytes
Game/{gfx/bricks => data/textures}/red.png | Bin
.../smileys/0.png => data/textures/smileys0.png} | Bin
.../smileys/1.png => data/textures/smileys1.png} | Bin
.../smileys/2.png => data/textures/smileys2.png} | Bin
.../smileys/3.png => data/textures/smileys3.png} | Bin
Game/data/textures/touchcursor.png | Bin 0 -> 901 bytes
.../textures/trans_cover.png} | Bin
Game/{gfx/bricks => data/textures}/turkish.png | Bin
Game/{gfx/bricks => data/textures}/yellow.png | Bin
Game/gfx/14P_Arial_Angle_Red.png | Bin 20313 -> 0 bytes
Game/gfx/24P_Arial_Blue.png | Bin 58472 -> 0 bytes
Game/gfx/SmallStone.png | Bin 27639 -> 0 bytes
Game/gfx/animations/bomb/bomb_1.png | Bin 1463 -> 0 bytes
Game/gfx/animations/bomb/bomb_2.png | Bin 1439 -> 0 bytes
Game/gfx/animations/cursor/1.png | Bin 480 -> 0 bytes
Game/gfx/animations/cursor/2.png | Bin 463 -> 0 bytes
Game/gfx/animations/ready/ready_1.png | Bin 1867 -> 0 bytes
Game/gfx/animations/ready/ready_2.png | Bin 1951 -> 0 bytes
Game/gfx/b1024.png | Bin 3436 -> 0 bytes
Game/gfx/bBack.png | Bin 2912 -> 0 bytes
Game/gfx/bChange.png | Bin 2728 -> 0 bytes
Game/gfx/bConfigure.png | Bin 2204 -> 0 bytes
Game/gfx/bConnect.png | Bin 2191 -> 0 bytes
Game/gfx/bEndless.png | Bin 3623 -> 0 bytes
Game/gfx/bForward.png | Bin 3245 -> 0 bytes
Game/gfx/bHost.png | Bin 2239 -> 0 bytes
Game/gfx/bHowToPlay.png | Bin 12290 -> 0 bytes
Game/gfx/bInternet.png | Bin 11721 -> 0 bytes
Game/gfx/bLoad.png | Bin 1922 -> 0 bytes
Game/gfx/bNetwork.png | Bin 3711 -> 0 bytes
Game/gfx/bNewGame.png | Bin 2500 -> 0 bytes
Game/gfx/bNext.png | Bin 2827 -> 0 bytes
Game/gfx/bOff.png | Bin 1383 -> 0 bytes
Game/gfx/bOn.png | Bin 1306 -> 0 bytes
Game/gfx/bOnePlayer.png | Bin 2620 -> 0 bytes
Game/gfx/bOptions.png | Bin 3160 -> 0 bytes
Game/gfx/bPuzzle.png | Bin 3532 -> 0 bytes
Game/gfx/bReplays.png | Bin 2771 -> 0 bytes
Game/gfx/bRetry.png | Bin 2966 -> 0 bytes
Game/gfx/bSave.png | Bin 2137 -> 0 bytes
Game/gfx/bSelectPuzzle.png | Bin 1849 -> 0 bytes
Game/gfx/bSkip.png | Bin 2935 -> 0 bytes
Game/gfx/bStageClear.png | Bin 2208 -> 0 bytes
Game/gfx/bTheme.png | Bin 1970 -> 0 bytes
Game/gfx/bTimeTrial.png | Bin 2894 -> 0 bytes
Game/gfx/bTwoPlayers.png | Bin 3489 -> 0 bytes
Game/gfx/bVsGame.png | Bin 2482 -> 0 bytes
Game/gfx/bVsGameConfig.png | Bin 2218 -> 0 bytes
Game/gfx/blockAttack.ico | Bin 25766 -> 0 bytes
Game/gfx/boardBackBack.png | Bin 19018 -> 0 bytes
Game/gfx/changeButtonsBack.png | Bin 4249 -> 0 bytes
Game/gfx/changeButtonsBack1.png | Bin 4550 -> 0 bytes
Game/gfx/options.png | Bin 30310 -> 0 bytes
Makefile | 88 -
README.md | 63 +
ReleaseNotes-2.0.0.txt | 31 +
SConstruct | 27 -
man/README | 6 +-
man/SConscript | 8 -
man/blockattack.man | 62 +
man/blockattack.sgml | 115 -
packdata.sh | 13 +-
source/AUTH | 191 +-
source/assets/gfx/UIpack_vector.svg | 2782 +++++++++
source/assets/gfx/backgrounds/boardBack.svg | 59 +-
source/code/.editorconfig | 12 +
source/code/AUTHORS | 8 +-
source/code/BlockAttackWin32.dev | 24 +-
source/code/BlockGame.cpp | 1887 ++++++
source/code/BlockGame.hpp | 2589 +-------
source/code/BlockGameSdl.inc | 408 ++
source/code/DialogBox.cpp | 149 +
source/code/DialogBox.hpp | 58 +
source/code/Libs/.editorconfig | 2 +
source/code/Libs/NFont.cpp | 1107 ++++
source/code/Libs/NFont.h | 316 +
source/code/Libs/SDL_FontCache.c | 2587 ++++++++
source/code/Libs/SDL_FontCache.h | 301 +
source/code/Libs/include/cereal/ABOUT | 9 +
source/code/Libs/include/cereal/LICENSE | 24 +
source/code/Libs/include/cereal/access.hpp | 427 ++
.../code/Libs/include/cereal/archives/adapters.hpp | 163 +
.../code/Libs/include/cereal/archives/binary.hpp | 165 +
source/code/Libs/include/cereal/archives/json.hpp | 912 +++
.../include/cereal/archives/portable_binary.hpp | 245 +
source/code/Libs/include/cereal/archives/xml.hpp | 882 +++
source/code/Libs/include/cereal/cereal.hpp | 955 +++
.../code/Libs/include/cereal/details/helpers.hpp | 360 ++
.../include/cereal/details/polymorphic_impl.hpp | 437 ++
.../Libs/include/cereal/details/static_object.hpp | 90 +
source/code/Libs/include/cereal/details/traits.hpp | 1325 ++++
source/code/Libs/include/cereal/details/util.hpp | 84 +
.../code/Libs/include/cereal/external/base64.hpp | 125 +
.../include/cereal/external/rapidjson/document.h | 821 +++
.../include/cereal/external/rapidjson/filestream.h | 47 +
.../cereal/external/rapidjson/genericstream.h | 105 +
.../cereal/external/rapidjson/internal/pow10.h | 54 +
.../cereal/external/rapidjson/internal/stack.h | 82 +
.../cereal/external/rapidjson/internal/strfunc.h | 24 +
.../include/cereal/external/rapidjson/license.txt | 19 +
.../cereal/external/rapidjson/prettywriter.h | 156 +
.../include/cereal/external/rapidjson/rapidjson.h | 525 ++
.../include/cereal/external/rapidjson/reader.h | 749 +++
.../cereal/external/rapidjson/stringbuffer.h | 49 +
.../include/cereal/external/rapidjson/writer.h | 330 +
.../include/cereal/external/rapidxml/license.txt | 52 +
.../include/cereal/external/rapidxml/manual.html | 406 ++
.../include/cereal/external/rapidxml/rapidxml.hpp | 2618 ++++++++
.../external/rapidxml/rapidxml_iterators.hpp | 173 +
.../cereal/external/rapidxml/rapidxml_print.hpp | 424 ++
.../cereal/external/rapidxml/rapidxml_utils.hpp | 121 +
source/code/Libs/include/cereal/macros.hpp | 82 +
source/code/Libs/include/cereal/types/array.hpp | 79 +
.../code/Libs/include/cereal/types/base_class.hpp | 164 +
source/code/Libs/include/cereal/types/bitset.hpp | 112 +
.../Libs/include/cereal/types/boost_variant.hpp | 106 +
source/code/Libs/include/cereal/types/chrono.hpp | 72 +
source/code/Libs/include/cereal/types/common.hpp | 129 +
source/code/Libs/include/cereal/types/complex.hpp | 56 +
source/code/Libs/include/cereal/types/deque.hpp | 62 +
.../Libs/include/cereal/types/forward_list.hpp | 68 +
source/code/Libs/include/cereal/types/list.hpp | 62 +
source/code/Libs/include/cereal/types/map.hpp | 108 +
source/code/Libs/include/cereal/types/memory.hpp | 392 ++
.../code/Libs/include/cereal/types/polymorphic.hpp | 462 ++
source/code/Libs/include/cereal/types/queue.hpp | 130 +
source/code/Libs/include/cereal/types/set.hpp | 103 +
source/code/Libs/include/cereal/types/stack.hpp | 76 +
source/code/Libs/include/cereal/types/string.hpp | 61 +
source/code/Libs/include/cereal/types/tuple.hpp | 123 +
.../Libs/include/cereal/types/unordered_map.hpp | 100 +
.../Libs/include/cereal/types/unordered_set.hpp | 99 +
source/code/Libs/include/cereal/types/utility.hpp | 47 +
source/code/Libs/include/cereal/types/valarray.hpp | 89 +
source/code/Libs/include/cereal/types/vector.hpp | 112 +
source/code/Makefile | 78 -
source/code/MenuSystem.cpp | 405 ++
source/code/MenuSystem.h | 147 +
source/code/NetworkThing.hpp | 400 --
source/code/README | 12 +-
source/code/ReadKeyboard.cpp | 450 +-
source/code/ReadKeyboard.h | 73 +-
source/code/SConscript | 29 -
source/code/SFont.cpp | 178 -
source/code/SFont.h | 83 -
source/code/ScoresDisplay.cpp | 219 +
source/code/ScoresDisplay.hpp | 60 +
source/code/common.cpp | 454 +-
source/code/common.h | 282 +-
source/code/editor/BoardHolder.cpp | 154 -
source/code/editor/BoardHolder.hpp | 54 -
source/code/editor/EditorInterface.cpp | 234 -
source/code/editor/EditorInterface.hpp | 68 -
source/code/editor/TheBoard.cpp | 141 -
source/code/editor/TheBoard.hpp | 55 -
source/code/editor/editorMain.cpp | 163 -
source/code/editor/editorMain.hpp | 101 -
source/code/gamecontroller.cpp | 256 +
source/code/gamecontroller.h | 61 +
source/code/global.hpp | 66 +
source/code/highscore.cpp | 304 +-
source/code/highscore.h | 86 +-
source/code/icon.cpp | 43 +
source/code/icon.hpp | 32 +
source/code/icon.inc | 220 +
source/code/joypad.cpp | 177 -
source/code/joypad.h | 70 -
source/code/listFiles.cpp | 181 -
source/code/listFiles.h | 69 -
source/code/main.cpp | 6480 ++++++--------------
source/code/mainVars.hpp | 361 --
source/code/mainVars.inc | 237 +
source/code/menu/MenuItem.hpp | 26 +
source/code/menudef.cpp | 300 +
source/code/os.cpp | 70 +
source/code/os.hpp | 37 +
source/code/physfs_stream.hpp | 437 --
source/code/puzzlehandler.cpp | 136 +
source/code/puzzlehandler.hpp | 40 +
source/code/replay.cpp | 287 -
source/code/replay.h | 94 -
source/code/sago/GameStateInterface.hpp | 43 +
source/code/sago/LICENSE | 22 +
source/code/sago/Makefile.sago | 4 +
source/code/sago/SagoDataHolder.cpp | 247 +
source/code/sago/SagoDataHolder.hpp | 61 +
source/code/sago/SagoMisc.cpp | 88 +
source/code/sago/SagoMisc.hpp | 56 +
source/code/sago/SagoMiscSdl2.cpp | 54 +
source/code/sago/SagoMiscSdl2.hpp | 46 +
source/code/sago/SagoSprite.cpp | 145 +
source/code/sago/SagoSprite.hpp | 80 +
source/code/sago/SagoSpriteHolder.cpp | 139 +
source/code/sago/SagoSpriteHolder.hpp | 51 +
source/code/sago/platform_folders.cpp | 350 ++
source/code/sago/platform_folders.h | 172 +
source/code/scopeHelpers.hpp | 55 +
source/code/stageclearhandler.cpp | 133 +
source/code/stageclearhandler.hpp | 49 +
source/code/stats.cpp | 170 +-
source/code/stats.h | 93 +-
source/code/ttfont.cpp | 119 -
source/code/ttfont.h | 65 -
source/code/version.h | 26 +
source/code/winicon.rc | 2 +-
source/manual/block_attack_manual.tex | 178 -
source/misc/astyle/runAstyle.sh | 1 +
source/misc/blockattack.desktop | 4 +-
source/misc/cmake/FindSDL2.cmake | 46 +
source/misc/cmake/LibFindMacros.cmake | 267 +
source/misc/icons/blockattack.ico | Bin 0 -> 32038 bytes
source/misc/icons/blockattack128.xpm | 236 +
source/misc/icons/blockattack16.xpm | 41 +
source/misc/icons/blockattack256.xpm | 384 ++
source/misc/icons/blockattack32.xpm | 84 +
source/misc/icons/blockattack48.xpm | 108 +
source/misc/icons/blockattack64.xpm | 134 +
source/misc/screenshots/screen_shot_2016_01_19.png | Bin 0 -> 137576 bytes
source/misc/translation/build_mo_all.sh | 4 +
source/misc/translation/build_mo_single_file.sh | 12 +
source/misc/translation/extractTexts.sh | 2 +
source/misc/translation/po/da_DK.po | 421 ++
.../translation/template/blockattack_roftb.pot | 383 ++
.../misc/travis_help/utf8_v2_3_4/doc/ReleaseNotes | 12 +
.../misc/travis_help/utf8_v2_3_4/doc/utf8cpp.html | 1789 ++++++
source/misc/travis_help/utf8_v2_3_4/source/utf8.h | 34 +
.../travis_help/utf8_v2_3_4/source/utf8/checked.h | 327 +
.../travis_help/utf8_v2_3_4/source/utf8/core.h | 329 +
.../utf8_v2_3_4/source/utf8/unchecked.h | 228 +
travis_build.script | 11 +
.../misc => windows installer}/install_script.nsi | 39 +-
318 files changed, 39113 insertions(+), 12702 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/blockattack.git
More information about the Pkg-games-commits
mailing list