[blockattack] 86/88: Merge tag 'upstream/1.4.1+ds1'
Markus Koschany
apo-guest at moszumanska.debian.org
Wed Jan 6 11:53:36 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 3b355246b6f215d1334f9bcaf877b48c6f459b35
Merge: 3d2c053 6264ac2
Author: Markus Koschany <apo at debian.org>
Date: Wed Jan 6 12:47:29 2016 +0100
Merge tag 'upstream/1.4.1+ds1'
Upstream version 1.4.1+ds1
# gpg: Unterschrift vom Mi 06 Jan 2016 12:47:29 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 92550 -> 0 bytes
AUTHORS | 8 +
BlockGame.hpp | 2266 ---------
BlockGame.hpp~ | 2267 ---------
Game/COPYING => COPYING | 0
Font.hpp | 59 -
Game/SConscript | 150 +-
Game/SConscript.orig | 161 -
Game/SConscript~ | 160 -
Game/blockAttack~ | 1 -
Game/blockattack | Bin 251253 -> 0 bytes
Game/blockattack.data | Bin 0 -> 5496807 bytes
Game/gfx/14P_Arial_Angle_Red.png | Bin 20313 -> 0 bytes
Game/gfx/24P_Arial_Blue.png | Bin 58472 -> 0 bytes
Game/gfx/BackBoard.png | Bin 78878 -> 0 bytes
Game/gfx/SmallStone.png | Bin 27639 -> 0 bytes
Game/gfx/Thumbs.db | Bin 7680 -> 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/explosion/0.png | Bin 1930 -> 0 bytes
Game/gfx/animations/explosion/1.png | Bin 2733 -> 0 bytes
Game/gfx/animations/explosion/2.png | Bin 2952 -> 0 bytes
Game/gfx/animations/explosion/3.png | Bin 2112 -> 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 3412 -> 0 bytes
Game/gfx/bConnect.png | Bin 12255 -> 0 bytes
Game/gfx/bEndless.png | Bin 12135 -> 0 bytes
Game/gfx/bExit.png | Bin 25694 -> 0 bytes
Game/gfx/bForward.png | Bin 3245 -> 0 bytes
Game/gfx/bHighScore.png | Bin 12466 -> 0 bytes
Game/gfx/bHost.png | Bin 11241 -> 0 bytes
Game/gfx/bHowToPlay.png | Bin 12290 -> 0 bytes
Game/gfx/bInternet.png | Bin 11721 -> 0 bytes
Game/gfx/bLoad.png | Bin 2833 -> 0 bytes
Game/gfx/bNetwork.png | Bin 12512 -> 0 bytes
Game/gfx/bNewGame.png | Bin 11998 -> 0 bytes
Game/gfx/bOff.png | Bin 1383 -> 0 bytes
Game/gfx/bOn.png | Bin 1306 -> 0 bytes
Game/gfx/bOnePlayer.png | Bin 12197 -> 0 bytes
Game/gfx/bOnePlayer.png.bak | Bin 2404 -> 0 bytes
Game/gfx/bOptions.png | Bin 12548 -> 0 bytes
Game/gfx/bPuzzle.png | Bin 11495 -> 0 bytes
Game/gfx/bReplays.png | Bin 3369 -> 0 bytes
Game/gfx/bSave.png | Bin 2978 -> 0 bytes
Game/gfx/bSelectPuzzle.png | Bin 3273 -> 0 bytes
Game/gfx/bStageClear.png | Bin 12517 -> 0 bytes
Game/gfx/bTimeTrial.png | Bin 11651 -> 0 bytes
Game/gfx/bTwoPlayers.png | Bin 12775 -> 0 bytes
Game/gfx/bVsGame.png | Bin 11930 -> 0 bytes
Game/gfx/background.png | Bin 41842 -> 0 bytes
Game/gfx/background1.png | Bin 6384 -> 0 bytes
Game/gfx/balls/Copy of ballBlue.png | Bin 542 -> 0 bytes
Game/gfx/balls/Copy of ballGray.png | Bin 558 -> 0 bytes
Game/gfx/balls/Copy of ballGreen.png | Bin 536 -> 0 bytes
Game/gfx/balls/Copy of ballPurple.png | Bin 545 -> 0 bytes
Game/gfx/balls/Copy of ballRed.png | Bin 408 -> 0 bytes
Game/gfx/balls/Copy of ballTurkish.png | Bin 545 -> 0 bytes
Game/gfx/balls/Copy of ballYellow.png | Bin 508 -> 0 bytes
Game/gfx/balls/ballBlue.png | Bin 337 -> 0 bytes
Game/gfx/balls/ballGray.png | Bin 476 -> 0 bytes
Game/gfx/balls/ballGreen.png | Bin 417 -> 0 bytes
Game/gfx/balls/ballPurple.png | Bin 490 -> 0 bytes
Game/gfx/balls/ballRed.png | Bin 491 -> 0 bytes
Game/gfx/balls/ballTurkish.png | Bin 534 -> 0 bytes
Game/gfx/balls/ballYellow.png | Bin 510 -> 0 bytes
Game/gfx/blackBackGround.png | Bin 2569 -> 0 bytes
Game/gfx/blackLine.png | Bin 135 -> 0 bytes
Game/gfx/blockAttack.ico | Bin 25766 -> 0 bytes
Game/gfx/blue.png | Bin 775 -> 0 bytes
Game/gfx/boardBackBack.png | Bin 20127 -> 0 bytes
Game/gfx/boardBackBack.png.bak | Bin 8031 -> 0 bytes
Game/gfx/chainFrame.png | Bin 322 -> 0 bytes
Game/gfx/changeButtonsBack.png | Bin 4249 -> 0 bytes
Game/gfx/changeButtonsBack1.png | Bin 4550 -> 0 bytes
Game/gfx/counter/1.png | Bin 961 -> 0 bytes
Game/gfx/counter/2.png | Bin 2868 -> 0 bytes
Game/gfx/counter/3.png | Bin 3573 -> 0 bytes
Game/gfx/crossover.png | Bin 2323 -> 0 bytes
Game/gfx/dialogbox.png | Bin 9894 -> 0 bytes
Game/gfx/fileDialogbox.png | Bin 10310 -> 0 bytes
Game/gfx/garbage/garbageB.png | Bin 3293 -> 0 bytes
Game/gfx/garbage/garbageBL.png | Bin 3424 -> 0 bytes
Game/gfx/garbage/garbageBR.png | Bin 3313 -> 0 bytes
Game/gfx/garbage/garbageFill.png | Bin 3209 -> 0 bytes
Game/gfx/garbage/garbageGM.png | Bin 2803 -> 0 bytes
Game/gfx/garbage/garbageGML.png | Bin 3050 -> 0 bytes
Game/gfx/garbage/garbageGMR.png | Bin 2915 -> 0 bytes
Game/gfx/garbage/garbageL.png | Bin 3213 -> 0 bytes
Game/gfx/garbage/garbageM.png | Bin 3517 -> 0 bytes
Game/gfx/garbage/garbageML.png | Bin 3654 -> 0 bytes
Game/gfx/garbage/garbageMR.png | Bin 3601 -> 0 bytes
Game/gfx/garbage/garbageR.png | Bin 3353 -> 0 bytes
Game/gfx/garbage/garbageT.png | Bin 3203 -> 0 bytes
Game/gfx/garbage/garbageTL.png | Bin 3490 -> 0 bytes
Game/gfx/garbage/garbageTR.png | Bin 3534 -> 0 bytes
Game/gfx/green.png | Bin 956 -> 0 bytes
Game/gfx/grey.png | Bin 1487 -> 0 bytes
Game/gfx/iCheckBoxArea.png | Bin 3198 -> 0 bytes
Game/gfx/iCheckBoxArea2.png | Bin 1388 -> 0 bytes
Game/gfx/iDraw.png | Bin 10515 -> 0 bytes
Game/gfx/iGameOver.png | Bin 10151 -> 0 bytes
Game/gfx/iLevelCheck.png | Bin 280 -> 0 bytes
Game/gfx/iLevelCheckBox.png | Bin 165 -> 0 bytes
Game/gfx/iLoser.png | Bin 8298 -> 0 bytes
Game/gfx/iStageClearLimit.png | Bin 2069 -> 0 bytes
Game/gfx/iWinner.png | Bin 11639 -> 0 bytes
Game/gfx/icon.png | Bin 1067 -> 0 bytes
Game/gfx/mouse.png | Bin 409 -> 0 bytes
Game/gfx/options.png | Bin 30310 -> 0 bytes
Game/gfx/purple.png | Bin 1356 -> 0 bytes
Game/gfx/red.png | Bin 1425 -> 0 bytes
Game/gfx/smileys/0.png | Bin 9459 -> 0 bytes
Game/gfx/smileys/1.png | Bin 9199 -> 0 bytes
Game/gfx/smileys/2.png | Bin 9739 -> 0 bytes
Game/gfx/smileys/3.png | Bin 9328 -> 0 bytes
Game/gfx/topscores.png | Bin 9277 -> 0 bytes
Game/gfx/turkish.png | Bin 1589 -> 0 bytes
Game/gfx/yellow.png | Bin 1542 -> 0 bytes
Game/music/bgMusic.ogg | Bin 3517544 -> 0 bytes
Game/{res => puzzles}/copy | 0
Game/{res => puzzles}/puzzle.levels | 0
Game/{res => puzzles}/testPuzzles | 0
Game/sound/applause.ogg | Bin 55406 -> 0 bytes
Game/sound/cameraclick.ogg | Bin 6930 -> 0 bytes
Game/sound/counter.ogg | Bin 3959 -> 0 bytes
Game/sound/explosion.ogg | Bin 26406 -> 0 bytes
Game/sound/heartbeat3.ogg | Bin 10803 -> 0 bytes
Game/sound/pop.ogg | Bin 7783 -> 0 bytes
Game/sound/typing.ogg | Bin 3469 -> 0 bytes
Game/sound/whistleblow.ogg | Bin 16476 -> 0 bytes
Game/start_script | 39 -
Game/start_script~ | 40 -
Game/starter | Bin 11880 -> 0 bytes
Makefile | 93 +-
README | 36 +-
README~ | 38 -
ReadKeyboard.cpp | 220 -
ReadKeyboard.cpp~ | 220 -
ReadKeyboard.h | 49 -
SConstruct | 27 +-
SConstruct~ | 48 -
better_scons.patch | 170 -
block.make | 23 -
block.make~ | 23 -
block_attack_manual.pdf | Bin 121076 -> 0 bytes
blockattack.desktop | 14 -
blockattack.desktop~ | 17 -
changelog112 | 23 -
changelog120 | 9 -
changelog122 | 8 -
changelog130 | 10 -
changelog130~ | 9 -
changelog131 | 14 -
changelog131~ | 14 -
changelog141 | 3 +
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 4556 -> 0 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 17112 -> 0 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 107460 -> 0 bytes
enet-1.0/list.c | 57 -
enet-1.0/list.o | Bin 3996 -> 0 bytes
enet-1.0/missing | 190 -
enet-1.0/mkinstalldirs | 40 -
enet-1.0/packet.c | 74 -
enet-1.0/packet.o | Bin 4300 -> 0 bytes
enet-1.0/peer.c | 657 ---
enet-1.0/peer.o | Bin 22824 -> 0 bytes
enet-1.0/protocol.c | 1349 ------
enet-1.0/protocol.o | Bin 38676 -> 0 bytes
enet-1.0/tutorial.txt | 325 --
enet-1.0/unix.c | 397 --
enet-1.0/unix.o | Bin 13520 -> 0 bytes
enet-1.0/win32.c | 309 --
enet-1.0/win32.o | Bin 881 -> 0 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 -
joypad.cpp | 176 -
listFiles.cpp | 162 -
listFiles.h | 67 -
main.cpp | 4233 -----------------
main.cpp~ | 4233 -----------------
man/README~ | 2 -
man/SConscript~ | 8 -
man/blockattack.6.gz | Bin 517 -> 0 bytes
poulsCommonWindows.hpp | 33 -
replay.cpp | 228 -
replay.h | 84 -
AUTHORS => source/code/AUTHORS | 8 +
source/code/BlockAttackWin32.dev | 469 ++
source/code/BlockGame.hpp | 2358 ++++++++++
source/code/MenuSystem.cc | 227 +
source/code/MenuSystem.h | 119 +
source/code/NetworkThing.hpp | 395 ++
source/code/README | 26 +
source/code/ReadKeyboard.cpp | 380 ++
source/code/ReadKeyboard.h | 49 +
source/code/SConscript | 29 +
SFont.c => source/code/SFont.c | 0
SFont.h => source/code/SFont.h | 166 +-
source/code/block.make | 84 +
source/code/common.cc | 305 ++
source/code/common.h | 164 +
source/code/editor/BoardHolder.cpp | 154 +
highscore.h => source/code/editor/BoardHolder.hpp | 72 +-
source/code/editor/EditorInterface.cpp | 234 +
source/code/editor/EditorInterface.hpp | 68 +
source/code/editor/TheBoard.cpp | 141 +
starter.cpp~ => source/code/editor/TheBoard.hpp | 67 +-
source/code/editor/editorMain.cpp | 163 +
source/code/editor/editorMain.hpp | 101 +
source/code/highscore.cpp | 186 +
source/code/highscore.h | 70 +
source/code/joypad.cpp | 177 +
joypad.h => source/code/joypad.h | 48 +-
source/code/listFiles.cpp | 181 +
source/code/listFiles.h | 69 +
source/code/main.cpp | 4863 ++++++++++++++++++++
source/code/mainVars.hpp | 360 ++
source/code/physfs_stream.hpp | 437 ++
source/code/replay.cpp | 287 ++
source/code/replay.h | 94 +
source/code/stats.cc | 112 +
source/code/stats.h | 74 +
source/code/ttfont.cc | 119 +
source/code/ttfont.h | 65 +
source/code/uploadReplay.cc | 88 +
source/code/uploadReplay.h | 57 +
source/code/win.make | 93 +
starter.cpp | 64 -
315 files changed, 13042 insertions(+), 39818 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