[berusky-data] 12/15: Merge tag 'upstream/1.7'
Markus Koschany
apo at moszumanska.debian.org
Sun Jun 12 11:13:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository berusky-data.
commit 61f9cacf58ba959978d9775d317dd607652f3f10
Merge: ff8728e d9fe6a7
Author: Markus Koschany <apo at debian.org>
Date: Sun Jun 12 12:46:52 2016 +0200
Merge tag 'upstream/1.7'
Upstream version 1.7
# gpg: Signature made Sun 12 Jun 2016 12:46:49 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]
GameData/hints.dat | 1813 +++++++++++++++++++++--------------------
GameData/items.dat | 396 ++++++++-
Graphics/back1.bmp | Bin 489654 -> 0 bytes
Graphics/back1.png | Bin 0 -> 72332 bytes
Graphics/back2.bmp | Bin 533814 -> 0 bytes
Graphics/back2.png | Bin 0 -> 77511 bytes
Graphics/back3.bmp | Bin 470454 -> 0 bytes
Graphics/back3.png | Bin 0 -> 84257 bytes
Graphics/back4.bmp | Bin 480054 -> 0 bytes
Graphics/back4.png | Bin 0 -> 48738 bytes
Graphics/background1.bmp | Bin 269878 -> 0 bytes
Graphics/background1.png | Bin 0 -> 125530 bytes
Graphics/background1.spr | 2 +-
Graphics/background2.bmp | Bin 269878 -> 0 bytes
Graphics/background2.png | Bin 0 -> 119915 bytes
Graphics/background2.spr | 2 +-
Graphics/background3.png | Bin 0 -> 933 bytes
Graphics/background3.spr | 1 +
Graphics/background4.png | Bin 0 -> 145851 bytes
Graphics/background4.spr | 1 +
Graphics/background5.png | Bin 0 -> 133230 bytes
Graphics/background5.spr | 1 +
Graphics/background6.png | Bin 0 -> 214797 bytes
Graphics/background6.spr | 1 +
Graphics/background7.png | Bin 0 -> 244123 bytes
Graphics/background7.spr | 1 +
Graphics/box_bright1.png | Bin 0 -> 42886 bytes
Graphics/box_bright1.spr | 2 +
Graphics/box_dark1.png | Bin 0 -> 53214 bytes
Graphics/box_dark1.spr | 2 +
Graphics/box_paper1.png | Bin 0 -> 65384 bytes
Graphics/box_paper1.spr | 2 +
Graphics/box_snow1.png | Bin 0 -> 71003 bytes
Graphics/box_snow1.spr | 2 +
Graphics/controls.png | Bin 0 -> 889 bytes
Graphics/controls.spr | 2 +
Graphics/end1.bmp | Bin 308278 -> 0 bytes
Graphics/end1.png | Bin 0 -> 73111 bytes
Graphics/end2.bmp | Bin 308278 -> 0 bytes
Graphics/end2.png | Bin 0 -> 78774 bytes
Graphics/end3.bmp | Bin 308278 -> 0 bytes
Graphics/end3.png | Bin 0 -> 87389 bytes
Graphics/end4.bmp | Bin 308278 -> 0 bytes
Graphics/end4.png | Bin 0 -> 142678 bytes
Graphics/end5.bmp | Bin 308278 -> 0 bytes
Graphics/end5.png | Bin 0 -> 106643 bytes
Graphics/floor_danger1.png | Bin 0 -> 19720 bytes
Graphics/floor_danger1.spr | 2 +
Graphics/floor_elevators1.png | Bin 0 -> 18417 bytes
Graphics/floor_elevators1.spr | 2 +
Graphics/floor_gray1.png | Bin 0 -> 5574 bytes
Graphics/floor_gray1.spr | 2 +
Graphics/floor_iron_1.png | Bin 0 -> 3181 bytes
Graphics/floor_iron_1.spr | 1 +
Graphics/floor_iron_2.png | Bin 0 -> 3199 bytes
Graphics/floor_iron_2.spr | 1 +
Graphics/floor_iron_3.png | Bin 0 -> 3246 bytes
Graphics/floor_iron_3.spr | 1 +
Graphics/floor_iron_4.png | Bin 0 -> 3315 bytes
Graphics/floor_iron_4.spr | 1 +
Graphics/floor_iron_5.png | Bin 0 -> 2956 bytes
Graphics/floor_iron_5.spr | 1 +
Graphics/floor_snow.png | Bin 0 -> 3339 bytes
Graphics/floor_snow.spr | 1 +
Graphics/font0.bmp | Bin 50534 -> 0 bytes
Graphics/font0.png | Bin 0 -> 9551 bytes
Graphics/font0.spr | 2 +-
Graphics/font1.bmp | Bin 50534 -> 0 bytes
Graphics/font1.png | Bin 0 -> 10208 bytes
Graphics/font1.spr | 2 +-
Graphics/font2.bmp | Bin 50534 -> 0 bytes
Graphics/font2.png | Bin 0 -> 9919 bytes
Graphics/font2.spr | 2 +-
Graphics/game_cur.png | Bin 0 -> 538 bytes
Graphics/game_cur.spr | 2 +
Graphics/global1.bmp | Bin 6678 -> 0 bytes
Graphics/global1.png | Bin 0 -> 4414 bytes
Graphics/global1.spr | 4 +-
Graphics/global2.bmp | Bin 6678 -> 0 bytes
Graphics/global2.png | Bin 0 -> 4808 bytes
Graphics/global2.spr | 4 +-
Graphics/global3.bmp | Bin 6678 -> 0 bytes
Graphics/global3.png | Bin 0 -> 4724 bytes
Graphics/global3.spr | 4 +-
Graphics/global4.bmp | Bin 6678 -> 0 bytes
Graphics/global4.png | Bin 0 -> 4770 bytes
Graphics/global4.spr | 4 +-
Graphics/herni1.bmp | Bin 64918 -> 0 bytes
Graphics/herni1.png | Bin 0 -> 24586 bytes
Graphics/herni2.bmp | Bin 65806 -> 0 bytes
Graphics/herni2.png | Bin 0 -> 29845 bytes
Graphics/herni2.spr | 4 +-
Graphics/hraci1.bmp | Bin 21078 -> 0 bytes
Graphics/hraci1.png | Bin 0 -> 3607 bytes
Graphics/hraci1.spr | 2 +-
Graphics/hraci2.bmp | Bin 21078 -> 0 bytes
Graphics/hraci2.png | Bin 0 -> 2899 bytes
Graphics/hraci2.spr | 2 +-
Graphics/hraci3.bmp | Bin 21078 -> 0 bytes
Graphics/hraci3.png | Bin 0 -> 3505 bytes
Graphics/hraci3.spr | 2 +-
Graphics/hraci4.bmp | Bin 21078 -> 0 bytes
Graphics/hraci4.png | Bin 0 -> 2802 bytes
Graphics/hraci4.spr | 2 +-
Graphics/klasik1.bmp | Bin 38278 -> 0 bytes
Graphics/klasik1.png | Bin 0 -> 40966 bytes
Graphics/klasik1.spr | 2 +-
Graphics/klasik2.bmp | Bin 38278 -> 0 bytes
Graphics/klasik2.png | Bin 0 -> 47266 bytes
Graphics/klasik2.spr | 2 +-
Graphics/klasik3.bmp | Bin 38278 -> 0 bytes
Graphics/klasik3.png | Bin 0 -> 42827 bytes
Graphics/klasik3.spr | 2 +-
Graphics/klasik4.bmp | Bin 38278 -> 0 bytes
Graphics/klasik4.png | Bin 0 -> 44352 bytes
Graphics/klasik4.spr | 2 +-
Graphics/kyber1.bmp | Bin 40278 -> 0 bytes
Graphics/kyber1.png | Bin 0 -> 25831 bytes
Graphics/kyber1.spr | 2 +-
Graphics/kyber2.bmp | Bin 40278 -> 0 bytes
Graphics/kyber2.png | Bin 0 -> 27490 bytes
Graphics/kyber2.spr | 2 +-
Graphics/kyber3.bmp | Bin 40278 -> 0 bytes
Graphics/kyber3.png | Bin 0 -> 26480 bytes
Graphics/kyber3.spr | 2 +-
Graphics/kyber4.bmp | Bin 40278 -> 0 bytes
Graphics/kyber4.png | Bin 0 -> 27142 bytes
Graphics/kyber4.spr | 2 +-
Graphics/light_box1.png | Bin 0 -> 14356 bytes
Graphics/light_box1.spr | 2 +
Graphics/logo.bmp | Bin 308278 -> 0 bytes
Graphics/logo.png | Bin 0 -> 24489 bytes
Graphics/mask1.bmp | Bin 1254 -> 0 bytes
Graphics/mask1.png | Bin 0 -> 301 bytes
Graphics/mask2.bmp | Bin 1254 -> 0 bytes
Graphics/mask2.png | Bin 0 -> 265 bytes
Graphics/mask3.bmp | Bin 1254 -> 0 bytes
Graphics/mask3.png | Bin 0 -> 266 bytes
Graphics/menu1.bmp | Bin 308278 -> 0 bytes
Graphics/menu1.png | Bin 0 -> 106643 bytes
Graphics/menu2.bmp | Bin 107718 -> 0 bytes
Graphics/menu2.png | Bin 0 -> 68261 bytes
Graphics/menu3.bmp | Bin 308278 -> 0 bytes
Graphics/menu3.png | Bin 0 -> 128962 bytes
Graphics/menu4.bmp | Bin 6990 -> 0 bytes
Graphics/menu4.png | Bin 0 -> 1981 bytes
Graphics/menu5.bmp | Bin 59318 -> 0 bytes
Graphics/menu5.png | Bin 0 -> 32857 bytes
Graphics/menu6.png | Bin 0 -> 93682 bytes
Graphics/menu6.spr | 1 +
Graphics/menu_back1.png | Bin 0 -> 538666 bytes
Graphics/menu_back1.spr | 1 +
Graphics/menu_back2.png | Bin 0 -> 771365 bytes
Graphics/menu_back2.spr | 1 +
Graphics/menu_back3.png | Bin 0 -> 221584 bytes
Graphics/menu_back3.spr | 1 +
Graphics/slidebar.png | Bin 0 -> 726 bytes
Graphics/slidebar.spr | 1 +
Graphics/slider.png | Bin 0 -> 693 bytes
Graphics/slider.spr | 1 +
Graphics/tnt_bright1.png | Bin 0 -> 39494 bytes
Graphics/tnt_bright1.spr | 2 +
Graphics/tnt_dark1.png | Bin 0 -> 15044 bytes
Graphics/tnt_dark1.spr | 2 +
Graphics/tnt_paper1.png | Bin 0 -> 29385 bytes
Graphics/tnt_paper1.spr | 2 +
Graphics/tnt_snow1.png | Bin 0 -> 57589 bytes
Graphics/tnt_snow1.spr | 2 +
Graphics/tnt_swamp1.png | Bin 0 -> 15619 bytes
Graphics/tnt_swamp1.spr | 2 +
Graphics/wall_iron_blue1.png | Bin 0 -> 26634 bytes
Graphics/wall_iron_blue1.spr | 2 +
Graphics/wall_iron_brown1.png | Bin 0 -> 40133 bytes
Graphics/wall_iron_brown1.spr | 2 +
Graphics/wall_iron_dark1.png | Bin 0 -> 42955 bytes
Graphics/wall_iron_dark1.spr | 2 +
Graphics/wall_iron_gray1.png | Bin 0 -> 64513 bytes
Graphics/wall_iron_gray1.spr | 2 +
Graphics/wall_machine1.png | Bin 0 -> 74706 bytes
Graphics/wall_machine1.spr | 2 +
Graphics/wall_repro1.png | Bin 0 -> 35268 bytes
Graphics/wall_repro1.spr | 2 +
Graphics/wall_snow1.png | Bin 0 -> 43711 bytes
Graphics/wall_snow1.spr | 2 +
Graphics/wall_swamp1.png | Bin 0 -> 120646 bytes
Graphics/wall_swamp1.spr | 2 +
Graphics/wall_wood1.png | Bin 0 -> 147824 bytes
Graphics/wall_wood1.spr | 2 +
Levels/user1/002.LV3 | Bin 0 -> 28361 bytes
Levels/user1/1DOL.LV3 | Bin 0 -> 28361 bytes
Levels/user1/2DOL.LV3 | Bin 0 -> 28361 bytes
Levels/user1/3DOL.LV3 | Bin 0 -> 28361 bytes
Levels/user1/APOC.LV3 | Bin 0 -> 28361 bytes
Levels/user1/BACH-01.LV3 | Bin 0 -> 28361 bytes
Levels/user1/BACH-02.LV3 | Bin 0 -> 28361 bytes
Levels/user1/BACH-03.LV3 | Bin 0 -> 28361 bytes
Levels/user1/BBB.LV3 | Bin 0 -> 28361 bytes
Levels/user1/BLUDIST2.LV3 | Bin 0 -> 28361 bytes
Levels/user1/BLUDISTE.LV3 | Bin 0 -> 28361 bytes
Levels/user1/DUDU2.LV3 | Bin 0 -> 28361 bytes
Levels/user1/DUDU4.LV3 | Bin 0 -> 28361 bytes
Levels/user1/DUDU6.LV3 | Bin 0 -> 28361 bytes
Levels/user1/EAGLE2.LV3 | Bin 0 -> 28361 bytes
Levels/user1/HRADEK1.LV3 | Bin 0 -> 28361 bytes
Levels/user1/JEN_SUDY.LV3 | Bin 0 -> 28361 bytes
Levels/user1/KLICE.LV3 | Bin 0 -> 28361 bytes
Levels/user1/LEVEL002.LV3 | Bin 0 -> 28361 bytes
Levels/user1/MORBID.LV3 | Bin 0 -> 28361 bytes
Levels/user1/MSMID01.LV3 | Bin 0 -> 28361 bytes
Levels/user1/MSMID02.LV3 | Bin 0 -> 28361 bytes
Levels/user1/PES.LV3 | Bin 0 -> 28361 bytes
Levels/user1/PETVAL.LV3 | Bin 0 -> 28361 bytes
Levels/user1/POKUS.LV3 | Bin 0 -> 28361 bytes
Levels/user1/RB.LV3 | Bin 0 -> 28361 bytes
Levels/user1/REEDIC1.LV3 | Bin 0 -> 28361 bytes
Levels/user1/SUPER.LV3 | Bin 0 -> 28361 bytes
Levels/user1/TOMHRAD2.LV3 | Bin 0 -> 28361 bytes
Levels/user1/UUEASY.LV3 | Bin 0 -> 28361 bytes
Levels/user1/VP.LV3 | Bin 0 -> 28361 bytes
Levels/user1/ZICHO2.LV3 | Bin 0 -> 28361 bytes
berusky.ini | 1 +
debugfiles.list | 0
debuglinks.list | 0
debugsources.list | 0
224 files changed, 1405 insertions(+), 924 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/berusky-data.git
More information about the Pkg-games-commits
mailing list