[adonthell-data] 28/60: Merge tag 'upstream/0.3.6_beta1'
Markus Koschany
apo at moszumanska.debian.org
Tue Jul 12 23:23:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository adonthell-data.
commit b4232d64b58324f213abf414a8fb95c17648799e
Merge: 6568c1b a1d1ff1
Author: Markus Koschany <apo at debian.org>
Date: Tue Jul 12 14:13:45 2016 +0200
Merge tag 'upstream/0.3.6_beta1'
Upstream version 0.3.6~beta1
# gpg: Signature made Tue 12 Jul 2016 14:13:41 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]
ABOUT-NLS | 1981 +++++---
AUTHORS | 6 -
INSTALL | 34 +-
Makefile.am | 23 +-
Makefile.in | 1001 ++--
NEWS | 6 +
PLAYING | 11 +-
README | 28 +-
achievements.data | Bin 0 -> 78 bytes
aclocal.m4 | 4124 ++++------------
audio/Makefile.in | 460 +-
compile | 347 ++
config.guess | 1242 +++--
config.rpath | 366 +-
config.sub | 605 ++-
configure | 5147 ++++++++++++--------
configure.in | 46 +-
gfx/Makefile.am | 2 +-
gfx/Makefile.in | 695 ++-
gfx/achievements/0.pnm | Bin 0 -> 6964 bytes
gfx/achievements/1.pnm | 5 +
gfx/achievements/2.pnm | Bin 0 -> 6964 bytes
gfx/achievements/255.pnm | 5 +
gfx/achievements/3.pnm | Bin 0 -> 6964 bytes
gfx/achievements/4.pnm | Bin 0 -> 6964 bytes
gfx/achievements/5.pnm | Bin 0 -> 6964 bytes
gfx/achievements/6.pnm | Bin 0 -> 6964 bytes
gfx/achievements/7.pnm | Bin 0 -> 6964 bytes
gfx/achievements/8.pnm | 5 +
gfx/achievements/9.pnm | 5 +
gfx/achievements/Makefile.am | 16 +
gfx/achievements/Makefile.in | 485 ++
gfx/cutscene/Makefile.in | 460 +-
gfx/mapcharacters/Makefile.in | 460 +-
gfx/mapobjects/Makefile.in | 693 ++-
gfx/mapobjects/exteriors/Makefile.in | 460 +-
gfx/mapobjects/floorings/Makefile.in | 460 +-
gfx/mapobjects/furnitures/Makefile.in | 460 +-
gfx/mapobjects/houses/Makefile.in | 693 ++-
gfx/mapobjects/houses/redwyne-inn/Makefile.in | 460 +-
gfx/mapobjects/icons/Makefile.in | 693 ++-
gfx/mapobjects/icons/arrows/Makefile.in | 460 +-
gfx/mapobjects/stairs/Makefile.in | 460 +-
gfx/mapobjects/terrains/Makefile.in | 460 +-
gfx/mapobjects/walls/Makefile.in | 693 ++-
gfx/mapobjects/walls/cellar/Makefile.in | 460 +-
gfx/mapobjects/walls/inside/Makefile.in | 460 +-
gfx/mapobjects/walls/stone/Makefile.in | 460 +-
gfx/portraits/Makefile.in | 460 +-
gfx/window/Makefile.in | 693 ++-
gfx/window/background/Makefile.in | 693 ++-
gfx/window/background/original/Makefile.in | 460 +-
gfx/window/background/silverleaf/Makefile.in | 460 +-
gfx/window/border/Makefile.in | 693 ++-
gfx/window/border/original/Makefile.in | 693 ++-
gfx/window/border/original/mini/Makefile.in | 460 +-
gfx/window/border/original/normal/Makefile.in | 460 +-
gfx/window/border/silverleaf/Makefile.in | 693 ++-
gfx/window/border/silverleaf/mini/Makefile.in | 460 +-
gfx/window/border/silverleaf/normal/Makefile.in | 460 +-
gfx/window/cursor/Makefile.in | 693 ++-
gfx/window/cursor/original/Makefile.in | 460 +-
gfx/window/cursor/silverleaf/Makefile.in | 460 +-
gfx/window/font/Makefile.in | 693 ++-
gfx/window/font/avatar.ttf | Bin 0 -> 58468 bytes
gfx/window/font/blue/Makefile.in | 460 +-
gfx/window/font/green/Makefile.in | 460 +-
gfx/window/font/original/Makefile.in | 460 +-
gfx/window/font/red/Makefile.in | 460 +-
gfx/window/font/silverleaf/Makefile.in | 460 +-
gfx/window/font/violet/Makefile.in | 460 +-
gfx/window/font/white/Makefile.in | 460 +-
gfx/window/font/yellow/Makefile.in | 460 +-
gfx/window/scrollbar/Makefile.in | 693 ++-
gfx/window/scrollbar/original/Makefile.in | 460 +-
gfx/window/scrollbar/silverleaf/Makefile.in | 460 +-
m4/Makefile.in | 399 +-
m4/gettext.m4 | 360 +-
m4/iconv.m4 | 234 +-
m4/lib-ld.m4 | 95 +-
m4/lib-link.m4 | 386 +-
m4/lib-prefix.m4 | 91 +-
m4/nls.m4 | 43 +-
m4/po.m4 | 159 +-
m4/progtest.m4 | 44 +-
make_bundle.sh | 64 +
make_windows_pkg.sh | 66 +
maps/Makefile.in | 460 +-
missing | 455 +-
pixmaps/128x128/apps/wastesedge.png | Bin 0 -> 42274 bytes
pixmaps/48x48/apps/wastesedge.png | Bin 0 -> 6689 bytes
pixmaps/Makefile.am | 8 +-
pixmaps/Makefile.in | 477 +-
pixmaps/wastesedge_16x16.xpm | 211 -
pixmaps/wastesedge_32x32.xpm | 279 --
po/LINGUAS | 2 +-
po/Makefile.in.in | 210 +-
po/Makevars | 39 +-
po/POTFILES.in | 2 +
po/Rules-quot | 15 +-
po/da.gmo | Bin 0 -> 245932 bytes
po/{nl.po => da.po} | 4488 ++++++++---------
po/es.gmo | Bin 0 -> 119137 bytes
po/{fr.po => es.po} | 1644 +++++--
po/fr.gmo | Bin 12515 -> 12517 bytes
po/fr.po | 226 +-
po/it.gmo | Bin 237642 -> 237373 bytes
po/it.po | 215 +-
po/nl.gmo | Bin 246896 -> 245795 bytes
po/nl.po | 300 +-
po/wastesedge.pot | 214 +-
scripts/Makefile.am | 15 +-
scripts/Makefile.in | 711 ++-
scripts/actions/Makefile.am | 15 +-
scripts/actions/Makefile.in | 476 +-
scripts/actions/talk.py | 12 +-
scripts/dialogues/Makefile.am | 15 +-
scripts/dialogues/Makefile.in | 476 +-
scripts/dialogues/alek_start.py | 11 +-
scripts/dialogues/bjarn_start.py | 12 +-
scripts/dialogues/demo_intro_1.py | 7 +-
scripts/dialogues/erek_start.py | 44 +-
scripts/dialogues/extro.py | 29 +-
scripts/dialogues/fellnir_start.py | 5 +-
scripts/dialogues/frostbloom_start.py | 24 +-
scripts/dialogues/janesta_start.py | 9 +-
scripts/dialogues/jelom_2nd.py | 9 +-
scripts/dialogues/jelom_start.py | 20 +-
scripts/dialogues/lucia_start.py | 41 +-
scripts/dialogues/oliver_start.py | 4 +-
scripts/dialogues/orloth_start.py | 27 +-
scripts/dialogues/sarin_start.py | 5 +-
scripts/dialogues/silverhair_start.py | 11 +-
scripts/dialogues/tristan_start.py | 2 +-
scripts/game_events/Makefile.am | 15 +-
scripts/game_events/Makefile.in | 476 +-
scripts/game_events/brn_to_silverhair.py | 2 +-
scripts/game_events/cellar_to_bjarn.py | 2 +-
scripts/game_events/character_speak.py | 9 +-
scripts/game_events/fst_to_silverhair.py | 2 +-
scripts/game_events/lft_to_vnd.py | 2 +-
scripts/game_events/open_inn_door.py | 2 +-
scripts/game_events/search_chest.py | 24 +-
scripts/game_events/silverhair_to_brn.py | 2 +-
scripts/game_events/silverhair_to_fst.py | 2 +-
scripts/game_events/speak.py | 2 +-
scripts/game_events/teleport.py | 2 +-
scripts/game_events/to_storage.py | 2 +-
scripts/game_events/vnd_to_lft.py | 2 +-
scripts/init.py | 56 +-
scripts/modules/Makefile.am | 25 +-
scripts/modules/Makefile.in | 488 +-
scripts/modules/__init__.py | 0
scripts/modules/achievement_screen.py | 251 +
scripts/modules/character_screen.py | 24 +-
scripts/modules/console.py | 24 +-
scripts/modules/events.py | 4 +-
scripts/modules/intro.py | 27 +-
scripts/modules/main_menu.py | 140 +-
scripts/modules/option_screen.py | 253 +
scripts/modules/player_text.py | 2 +-
scripts/schedules/Makefile.am | 13 +-
scripts/schedules/Makefile.in | 711 ++-
scripts/schedules/audio/Makefile.am | 15 +-
scripts/schedules/audio/Makefile.in | 476 +-
scripts/schedules/audio/in_game.py | 4 +-
scripts/schedules/control.py | 46 +-
scripts/schedules/mapcharacters/Makefile.am | 15 +-
scripts/schedules/mapcharacters/Makefile.in | 476 +-
scripts/schedules/mapcharacters/alek.py | 2 +-
scripts/schedules/mapcharacters/bjarn.py | 2 +-
scripts/schedules/mapcharacters/erek.py | 13 +-
scripts/schedules/mapcharacters/extro.py | 113 +-
scripts/schedules/mapcharacters/fellnir.py | 2 +-
scripts/schedules/mapcharacters/frostbloom.py | 2 +-
scripts/schedules/mapcharacters/intro.py | 26 +-
scripts/schedules/mapcharacters/janesta.py | 2 +-
scripts/schedules/mapcharacters/jelom.py | 2 +-
.../schedules/mapcharacters/keyboard_control.py | 4 +-
scripts/schedules/mapcharacters/lucia.py | 2 +-
scripts/schedules/mapcharacters/oliver.py | 2 +-
scripts/schedules/mapcharacters/orloth.py | 2 +-
scripts/schedules/mapcharacters/sarin.py | 2 +-
scripts/schedules/mapcharacters/schedule.py | 14 +-
scripts/schedules/mapcharacters/silverhair.py | 2 +-
scripts/schedules/mapcharacters/talan.py | 2 +-
scripts/schedules/mapcharacters/to_cellar.py | 4 +-
scripts/schedules/mapcharacters/tristan.py | 2 +-
scripts/schedules/mapviews/Makefile.am | 15 +-
scripts/schedules/mapviews/Makefile.in | 476 +-
scripts/schedules/mapviews/center_character.py | 2 +-
wastesedge.desktop.in => wastesedge.desktop | 8 +-
wastesedge.desktop.in | 8 +-
wastesedge.spec | 4 +-
wastesedge.spec.in | 2 +-
win32/wastesedge.ico | Bin 5222 -> 82726 bytes
win32/wastesedge.nsi | 762 +--
197 files changed, 36934 insertions(+), 20526 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/adonthell-data.git
More information about the Pkg-games-commits
mailing list