[blockattack] 84/88: Merge tag 'upstream/1.3.1'
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Jan 6 11:53:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository blockattack.
commit 3d2c053e22c6b9865f21e5c893d9aa1198980fa3
Merge: 3f6a9da 8230bb8
Author: Markus Koschany <apo at debian.org>
Date: Wed Jan 6 12:47:20 2016 +0100
Merge tag 'upstream/1.3.1'
Upstream version 1.3.1
# gpg: Unterschrift vom Mi 06 Jan 2016 12:47:19 CET mittels RSA-Schlüssel ID 513B51E4
# gpg: Korrekte Unterschrift von "Markus Koschany <apo at gambaru.de>" [uneingeschränkt]
# gpg: alias "Markus Koschany <markus at koschany.net>" [uneingeschränkt]
# gpg: alias "Markus Koschany <apo at debian.org>" [uneingeschränkt]
.sconsign.dblite | Bin 0 -> 92550 bytes
AUTHORS | 9 +
BlockGame.hpp | 2266 ++++++++++++++
BlockGame.hpp~ | 2267 ++++++++++++++
Font.hpp | 59 +
Game/COPYING | 340 +++
Game/SConscript | 160 +
Game/SConscript.orig | 161 +
Game/SConscript~ | 160 +
Game/blockAttack~ | 1 +
Game/blockattack | Bin 0 -> 251253 bytes
Game/gfx/14P_Arial_Angle_Red.png | Bin 0 -> 20313 bytes
Game/gfx/24P_Arial_Blue.png | Bin 0 -> 58472 bytes
Game/gfx/BackBoard.png | Bin 0 -> 78878 bytes
Game/gfx/SmallStone.png | Bin 0 -> 27639 bytes
Game/gfx/Thumbs.db | Bin 0 -> 7680 bytes
Game/gfx/animations/bomb/bomb_1.png | Bin 0 -> 1463 bytes
Game/gfx/animations/bomb/bomb_2.png | Bin 0 -> 1439 bytes
Game/gfx/animations/cursor/1.png | Bin 0 -> 480 bytes
Game/gfx/animations/cursor/2.png | Bin 0 -> 463 bytes
Game/gfx/animations/explosion/0.png | Bin 0 -> 1930 bytes
Game/gfx/animations/explosion/1.png | Bin 0 -> 2733 bytes
Game/gfx/animations/explosion/2.png | Bin 0 -> 2952 bytes
Game/gfx/animations/explosion/3.png | Bin 0 -> 2112 bytes
Game/gfx/animations/ready/ready_1.png | Bin 0 -> 1867 bytes
Game/gfx/animations/ready/ready_2.png | Bin 0 -> 1951 bytes
Game/gfx/b1024.png | Bin 0 -> 3436 bytes
Game/gfx/bBack.png | Bin 0 -> 2912 bytes
Game/gfx/bChange.png | Bin 0 -> 2728 bytes
Game/gfx/bConfigure.png | Bin 0 -> 3412 bytes
Game/gfx/bConnect.png | Bin 0 -> 12255 bytes
Game/gfx/bEndless.png | Bin 0 -> 12135 bytes
Game/gfx/bExit.png | Bin 0 -> 25694 bytes
Game/gfx/bForward.png | Bin 0 -> 3245 bytes
Game/gfx/bHighScore.png | Bin 0 -> 12466 bytes
Game/gfx/bHost.png | Bin 0 -> 11241 bytes
Game/gfx/bHowToPlay.png | Bin 0 -> 12290 bytes
Game/gfx/bInternet.png | Bin 0 -> 11721 bytes
Game/gfx/bLoad.png | Bin 0 -> 2833 bytes
Game/gfx/bNetwork.png | Bin 0 -> 12512 bytes
Game/gfx/bNewGame.png | Bin 0 -> 11998 bytes
Game/gfx/bOff.png | Bin 0 -> 1383 bytes
Game/gfx/bOn.png | Bin 0 -> 1306 bytes
Game/gfx/bOnePlayer.png | Bin 0 -> 12197 bytes
Game/gfx/bOnePlayer.png.bak | Bin 0 -> 2404 bytes
Game/gfx/bOptions.png | Bin 0 -> 12548 bytes
Game/gfx/bPuzzle.png | Bin 0 -> 11495 bytes
Game/gfx/bReplays.png | Bin 0 -> 3369 bytes
Game/gfx/bSave.png | Bin 0 -> 2978 bytes
Game/gfx/bSelectPuzzle.png | Bin 0 -> 3273 bytes
Game/gfx/bStageClear.png | Bin 0 -> 12517 bytes
Game/gfx/bTimeTrial.png | Bin 0 -> 11651 bytes
Game/gfx/bTwoPlayers.png | Bin 0 -> 12775 bytes
Game/gfx/bVsGame.png | Bin 0 -> 11930 bytes
Game/gfx/background.png | Bin 0 -> 41842 bytes
Game/gfx/background1.png | Bin 0 -> 6384 bytes
Game/gfx/balls/Copy of ballBlue.png | Bin 0 -> 542 bytes
Game/gfx/balls/Copy of ballGray.png | Bin 0 -> 558 bytes
Game/gfx/balls/Copy of ballGreen.png | Bin 0 -> 536 bytes
Game/gfx/balls/Copy of ballPurple.png | Bin 0 -> 545 bytes
Game/gfx/balls/Copy of ballRed.png | Bin 0 -> 408 bytes
Game/gfx/balls/Copy of ballTurkish.png | Bin 0 -> 545 bytes
Game/gfx/balls/Copy of ballYellow.png | Bin 0 -> 508 bytes
Game/gfx/balls/ballBlue.png | Bin 0 -> 337 bytes
Game/gfx/balls/ballGray.png | Bin 0 -> 476 bytes
Game/gfx/balls/ballGreen.png | Bin 0 -> 417 bytes
Game/gfx/balls/ballPurple.png | Bin 0 -> 490 bytes
Game/gfx/balls/ballRed.png | Bin 0 -> 491 bytes
Game/gfx/balls/ballTurkish.png | Bin 0 -> 534 bytes
Game/gfx/balls/ballYellow.png | Bin 0 -> 510 bytes
Game/gfx/blackBackGround.png | Bin 0 -> 2569 bytes
Game/gfx/blackLine.png | Bin 0 -> 135 bytes
Game/gfx/blockAttack.ico | Bin 0 -> 25766 bytes
Game/gfx/blue.png | Bin 0 -> 775 bytes
Game/gfx/boardBackBack.png | Bin 0 -> 20127 bytes
Game/gfx/boardBackBack.png.bak | Bin 0 -> 8031 bytes
Game/gfx/chainFrame.png | Bin 0 -> 322 bytes
Game/gfx/changeButtonsBack.png | Bin 0 -> 4249 bytes
Game/gfx/changeButtonsBack1.png | Bin 0 -> 4550 bytes
Game/gfx/counter/1.png | Bin 0 -> 961 bytes
Game/gfx/counter/2.png | Bin 0 -> 2868 bytes
Game/gfx/counter/3.png | Bin 0 -> 3573 bytes
Game/gfx/crossover.png | Bin 0 -> 2323 bytes
Game/gfx/dialogbox.png | Bin 0 -> 9894 bytes
Game/gfx/fileDialogbox.png | Bin 0 -> 10310 bytes
Game/gfx/garbage/garbageB.png | Bin 0 -> 3293 bytes
Game/gfx/garbage/garbageBL.png | Bin 0 -> 3424 bytes
Game/gfx/garbage/garbageBR.png | Bin 0 -> 3313 bytes
Game/gfx/garbage/garbageFill.png | Bin 0 -> 3209 bytes
Game/gfx/garbage/garbageGM.png | Bin 0 -> 2803 bytes
Game/gfx/garbage/garbageGML.png | Bin 0 -> 3050 bytes
Game/gfx/garbage/garbageGMR.png | Bin 0 -> 2915 bytes
Game/gfx/garbage/garbageL.png | Bin 0 -> 3213 bytes
Game/gfx/garbage/garbageM.png | Bin 0 -> 3517 bytes
Game/gfx/garbage/garbageML.png | Bin 0 -> 3654 bytes
Game/gfx/garbage/garbageMR.png | Bin 0 -> 3601 bytes
Game/gfx/garbage/garbageR.png | Bin 0 -> 3353 bytes
Game/gfx/garbage/garbageT.png | Bin 0 -> 3203 bytes
Game/gfx/garbage/garbageTL.png | Bin 0 -> 3490 bytes
Game/gfx/garbage/garbageTR.png | Bin 0 -> 3534 bytes
Game/gfx/green.png | Bin 0 -> 956 bytes
Game/gfx/grey.png | Bin 0 -> 1487 bytes
Game/gfx/iCheckBoxArea.png | Bin 0 -> 3198 bytes
Game/gfx/iCheckBoxArea2.png | Bin 0 -> 1388 bytes
Game/gfx/iDraw.png | Bin 0 -> 10515 bytes
Game/gfx/iGameOver.png | Bin 0 -> 10151 bytes
Game/gfx/iLevelCheck.png | Bin 0 -> 280 bytes
Game/gfx/iLevelCheckBox.png | Bin 0 -> 165 bytes
Game/gfx/iLoser.png | Bin 0 -> 8298 bytes
Game/gfx/iStageClearLimit.png | Bin 0 -> 2069 bytes
Game/gfx/iWinner.png | Bin 0 -> 11639 bytes
Game/gfx/icon.png | Bin 0 -> 1067 bytes
Game/gfx/mouse.png | Bin 0 -> 409 bytes
Game/gfx/options.png | Bin 0 -> 30310 bytes
Game/gfx/purple.png | Bin 0 -> 1356 bytes
Game/gfx/red.png | Bin 0 -> 1425 bytes
Game/gfx/smileys/0.png | Bin 0 -> 9459 bytes
Game/gfx/smileys/1.png | Bin 0 -> 9199 bytes
Game/gfx/smileys/2.png | Bin 0 -> 9739 bytes
Game/gfx/smileys/3.png | Bin 0 -> 9328 bytes
Game/gfx/topscores.png | Bin 0 -> 9277 bytes
Game/gfx/turkish.png | Bin 0 -> 1589 bytes
Game/gfx/yellow.png | Bin 0 -> 1542 bytes
Game/music/bgMusic.ogg | Bin 0 -> 3517544 bytes
Game/res/copy | 339 +++
Game/res/puzzle.levels | 352 +++
Game/res/testPuzzles | 92 +
Game/sound/applause.ogg | Bin 0 -> 55406 bytes
Game/sound/cameraclick.ogg | Bin 0 -> 6930 bytes
Game/sound/counter.ogg | Bin 0 -> 3959 bytes
Game/sound/explosion.ogg | Bin 0 -> 26406 bytes
Game/sound/heartbeat3.ogg | Bin 0 -> 10803 bytes
Game/sound/pop.ogg | Bin 0 -> 7783 bytes
Game/sound/typing.ogg | Bin 0 -> 3469 bytes
Game/sound/whistleblow.ogg | Bin 0 -> 16476 bytes
Game/start_script | 39 +
Game/start_script~ | 40 +
Game/starter | Bin 0 -> 11880 bytes
Makefile | 83 +
README | 38 +
README~ | 38 +
ReadKeyboard.cpp | 220 ++
ReadKeyboard.cpp~ | 220 ++
ReadKeyboard.h | 49 +
SConstruct | 48 +
SConstruct~ | 48 +
SFont.c | 178 ++
SFont.h | 83 +
better_scons.patch | 170 ++
block.make | 23 +
block.make~ | 23 +
block_attack_manual.pdf | Bin 0 -> 121076 bytes
blockattack.desktop | 14 +
blockattack.desktop~ | 17 +
blockattack.xpm | 1612 ++++++++++
blockattack32.xpm | 220 ++
blockattack64.xpm | 465 +++
changelog112 | 23 +
changelog120 | 9 +
changelog122 | 8 +
changelog130 | 10 +
changelog130~ | 9 +
changelog131 | 14 +
changelog131~ | 14 +
description-pak | 11 +
doc-pak/README | 6 +
doc-pak/README~ | 16 +
enet-1.0/.deps/callbacks.Po | 119 +
enet-1.0/.deps/host.Po | 126 +
enet-1.0/.deps/list.Po | 53 +
enet-1.0/.deps/packet.Po | 126 +
enet-1.0/.deps/peer.Po | 126 +
enet-1.0/.deps/protocol.Po | 153 +
enet-1.0/.deps/unix.Po | 197 ++
enet-1.0/.deps/win32.Po | 1 +
enet-1.0/CVS/Entries | 18 +
enet-1.0/CVS/Repository | 1 +
enet-1.0/CVS/Root | 1 +
enet-1.0/Doxyfile | 993 +++++++
enet-1.0/LICENSE | 7 +
enet-1.0/Makefile | 640 ++++
enet-1.0/Makefile.am | 5 +
enet-1.0/Makefile.in | 640 ++++
enet-1.0/README | 14 +
enet-1.0/aclocal.m4 | 1020 +++++++
enet-1.0/callbacks.c | 53 +
enet-1.0/callbacks.o | Bin 0 -> 4556 bytes
enet-1.0/config.guess | 1441 +++++++++
enet-1.0/config.log | 413 +++
enet-1.0/config.status | 960 ++++++
enet-1.0/config.sub | 1552 ++++++++++
enet-1.0/configure | 5107 ++++++++++++++++++++++++++++++++
enet-1.0/configure.in | 24 +
enet-1.0/depcomp | 522 ++++
enet-1.0/design.txt | 117 +
enet-1.0/docs/CVS/Entries | 7 +
enet-1.0/docs/CVS/Repository | 1 +
enet-1.0/docs/CVS/Root | 1 +
enet-1.0/docs/FAQ.dox | 24 +
enet-1.0/docs/design.dox | 126 +
enet-1.0/docs/install.dox | 37 +
enet-1.0/docs/license.dox | 26 +
enet-1.0/docs/mainpage.dox | 67 +
enet-1.0/docs/tutorial.dox | 349 +++
enet-1.0/enet.dsp | 164 +
enet-1.0/host.c | 391 +++
enet-1.0/host.o | Bin 0 -> 17112 bytes
enet-1.0/include/CVS/Entries | 2 +
enet-1.0/include/CVS/Repository | 1 +
enet-1.0/include/CVS/Root | 1 +
enet-1.0/include/Makefile | 417 +++
enet-1.0/include/Makefile.am | 1 +
enet-1.0/include/Makefile.in | 417 +++
enet-1.0/include/enet/CVS/Entries | 11 +
enet-1.0/include/enet/CVS/Repository | 1 +
enet-1.0/include/enet/CVS/Root | 1 +
enet-1.0/include/enet/Makefile | 361 +++
enet-1.0/include/enet/Makefile.am | 12 +
enet-1.0/include/enet/Makefile.in | 361 +++
enet-1.0/include/enet/callbacks.h | 28 +
enet-1.0/include/enet/enet.h | 432 +++
enet-1.0/include/enet/list.h | 42 +
enet-1.0/include/enet/protocol.h | 167 ++
enet-1.0/include/enet/time.h | 18 +
enet-1.0/include/enet/types.h | 13 +
enet-1.0/include/enet/unix.h | 36 +
enet-1.0/include/enet/utility.h | 12 +
enet-1.0/include/enet/win32.h | 51 +
enet-1.0/install-sh | 251 ++
enet-1.0/libenet.a | Bin 0 -> 107460 bytes
enet-1.0/list.c | 57 +
enet-1.0/list.o | Bin 0 -> 3996 bytes
enet-1.0/missing | 190 ++
enet-1.0/mkinstalldirs | 40 +
enet-1.0/packet.c | 74 +
enet-1.0/packet.o | Bin 0 -> 4300 bytes
enet-1.0/peer.c | 657 ++++
enet-1.0/peer.o | Bin 0 -> 22824 bytes
enet-1.0/protocol.c | 1349 +++++++++
enet-1.0/protocol.o | Bin 0 -> 38676 bytes
enet-1.0/tutorial.txt | 325 ++
enet-1.0/unix.c | 397 +++
enet-1.0/unix.o | Bin 0 -> 13520 bytes
enet-1.0/win32.c | 309 ++
enet-1.0/win32.o | Bin 0 -> 881 bytes
enet/CVS/Entries | 11 +
enet/CVS/Repository | 1 +
enet/CVS/Root | 1 +
enet/Makefile | 361 +++
enet/Makefile.am | 12 +
enet/Makefile.in | 361 +++
enet/callbacks.h | 28 +
enet/enet.h | 432 +++
enet/enet.h~ | 422 +++
enet/list.h | 42 +
enet/memory.h | 22 +
enet/protocol.h | 167 ++
enet/protocol.h~ | 157 +
enet/time.h | 18 +
enet/types.h | 13 +
enet/unix.h | 36 +
enet/utility.h | 12 +
enet/win32.h | 51 +
highscore.cpp | 178 ++
highscore.cpp~ | 178 ++
highscore.h | 70 +
joypad.cpp | 176 ++
joypad.h | 70 +
listFiles.cpp | 162 +
listFiles.h | 67 +
main.cpp | 4233 ++++++++++++++++++++++++++
main.cpp~ | 4233 ++++++++++++++++++++++++++
man/README | 2 +
man/README~ | 2 +
man/SConscript | 8 +
man/SConscript~ | 8 +
man/blockattack.6.gz | Bin 0 -> 517 bytes
man/blockattack.sgml | 115 +
poulsCommonWindows.hpp | 33 +
replay.cpp | 228 ++
replay.h | 84 +
starter.cpp | 64 +
starter.cpp~ | 64 +
283 files changed, 43732 insertions(+)
--
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