This is an automated email from the git hooks/post-receive script. toddy pushed a commit to branch master in repository open-adventure.
commit 27f62f496170f43e6105c3a85168240e41512481 Merge: 1e22973 d0e115f Author: Dr. Tobias Quathamer <[email protected]> Date: Sun Sep 3 20:18:46 2017 +0200 Merge tag 'upstream/1.4' Upstream version 1.4 .gitlab-ci.yml | 49 +- .shipper | 2 +- INSTALL.adoc | 4 + Makefile | 24 +- NEWS | 8 + README.adoc | 3 + TODO | 11 +- actions.c | 534 +++--- advent.adoc | 18 + advent.desktop | 8 + advent.h | 145 +- advent.svg | 128 ++ adventure.yaml | 146 +- cheat.c | 12 +- main.c | 299 ++-- make_dungeon.py | 379 +---- misc.c | 382 ++--- notes.adoc | 6 +- saveresume.c | 4 +- score.c | 18 +- templates/coverage_dungeon.html.tpl | 83 + templates/dungeon.c.tpl | 51 + templates/dungeon.h.tpl | 165 ++ tests/Makefile | 32 +- tests/{bearfeedfail.chk => axebear.chk} | 33 +- tests/{bearfeedfail.log => axebear.log} | 10 +- tests/axeorama.chk | 25 +- tests/axeorama.log | 5 +- tests/backfail.chk | 21 - tests/backfail.log | 3 - tests/backfailmaze.chk | 606 ------- tests/backfailmaze.log | 115 -- tests/barehands.chk | 3 +- tests/{mazealldiff.chk => bigfail.chk} | 945 ++++++----- tests/{lampdim.log => bigfail.log} | 225 +-- tests/birdsnakewake.chk | 7 +- tests/birdsnakewake.log | 5 +- tests/{bearbridge.chk => boulder2.chk} | 540 +----- tests/{hint_jade.log => boulder2.log} | 77 +- tests/breakmirror.chk | 3 +- tests/breakvase.chk | 1317 --------------- tests/breakvase.log | 221 --- tests/carrybird.chk | 3 +- tests/carryfreebird.chk | 22 +- tests/carryfreebird.log | 3 + tests/cheatresume.chk | 10 +- tests/cheatresume.log | 2 +- tests/{cheatresume.chk => cheatresume2.chk} | 2 +- tests/cheatresume2.log | 5 + tests/coverage_dungeon.html.tpl | 112 -- tests/coverage_dungeon.py | 352 ++-- tests/death-jump.chk | 24 +- tests/death-jump.log | 5 + tests/defeat.chk | 93 +- tests/defeat.log | 13 +- tests/{flyrug.chk => domefail.chk} | 141 +- tests/domefail.log | 27 + tests/dragon_secret5.chk | 1 + tests/drinkfail.chk | 37 - tests/drinkfail.log | 5 - tests/dropcagedbird.chk | 1 + tests/drown.chk | 1 + tests/dwarf.chk | 1 + tests/dwarf_alternative.chk | 1 + tests/eggs_done.chk | 1 + tests/eggs_vanish.chk | 13 +- tests/eggs_vanish.log | 5 +- tests/endgame428.chk | 1 + tests/fail_hint_maze.chk | 1 + tests/fail_hint_ogre.chk | 1 + tests/fail_hint_ogre2.chk | 1 + tests/fillvase.chk | 27 +- tests/fillvase.log | 16 + tests/flyrug.log | 41 - tests/{drown.chk => footslip.chk} | 412 ++--- tests/footslip.log | 125 ++ tests/{urntest.chk => gemstates.chk} | 1027 +++++------ tests/{bearbridge.log => gemstates.log} | 203 ++- tests/hint_dark.chk | 1 + tests/hint_grate.chk | 9 +- tests/hint_grate.log | 3 +- tests/hint_jade.chk | 42 + tests/hint_jade.log | 9 +- tests/hint_snake.chk | 1 + tests/hint_urn.chk | 1 + tests/{wittsend.chk => hint_witt.chk} | 213 +-- tests/{lampdim.log => hint_witt.log} | 197 ++- tests/illformed.chk | 190 ++- tests/illformed.log | 28 +- tests/lampdim.chk | 29 +- tests/lampdim.log | 3 + tests/lampdim2.chk | 1 + tests/lampdim3.chk | 1 + tests/listenloud.chk | 315 ++-- tests/listenloud.log | 2 + tests/lockchain.chk | 29 + tests/lockchain.log | 5 + tests/magicword.chk | 68 - tests/magicword.log | 13 - tests/mazealldiff.chk | 1 + tests/mazehint.chk | 1 + tests/notrident.chk | 47 +- tests/notrident.log | 10 + tests/ogre_no_dwarves.chk | 1 + tests/ogrehint.chk | 2 + tests/oilplant.chk | 1 + tests/panic.chk | 1 + tests/panic2.chk | 1 + tests/pirate.chk | 1780 -------------------- tests/pirate.log | 298 ---- tests/pirate_carry.chk | 1 + tests/pirate_pyramid.chk | 1 + tests/pirate_spotted.chk | 1 + tests/pitfall.chk | 51 +- tests/pitfall.log | 7 + tests/plover.chk | 7 +- tests/plover.log | 1 + .../{fail_hint_ogre.chk => reach_ledge_short.chk} | 546 +++--- tests/{hint_jade.log => reach_ledge_short.log} | 140 +- tests/{fail_hint_maze.chk => reach_noclimb.chk} | 349 +--- tests/reach_noclimb.log | 27 + tests/{eggs_vanish.chk => reach_planttop.chk} | 283 ++-- tests/{eggs_vanish.log => reach_planttop.log} | 48 +- tests/reincarnate.chk | 1 + tests/resumefail.chk | 1 + tests/savefail.chk | 1 + tests/saveresume.1.chk | 1 + tests/{wakedwarves2.chk => saveresume.3.chk} | 40 +- tests/{birdsnakewake.log => saveresume.3.log} | 14 +- tests/saveresume.4.chk | 28 + tests/saveresume.4.log | 7 + tests/seedcrash.chk | 2 + tests/snake_food.chk | 1 + tests/specials.chk | 139 ++ tests/specials.log | 19 + tests/splatter.chk | 1 + tests/{eggs_done.chk => tall.chk} | 222 +-- tests/tall.log | 167 ++ tests/trident.chk | 7 +- tests/trident.log | 1 + tests/{eggs_done.chk => troll_returns.chk} | 424 +---- tests/troll_returns.log | 144 ++ tests/turnpenalties.chk | 1 + tests/urntest.chk | 1 + tests/urntest2.chk | 1 + tests/urntest3.chk | 1 + tests/vending.chk | 1 + tests/wakedwarves.chk | 1 + tests/wakedwarves2.chk | 1 + tests/wakedwarves3.chk | 1 + tests/water_plant2.chk | 3 +- tests/weirdbird.chk | 29 +- tests/weirdbird.log | 6 + tests/weirddwarf.chk | 1 + tests/wittsend.chk | 1 + tests/woodshint.chk | 37 +- tests/woodshint.log | 8 + 157 files changed, 5353 insertions(+), 10132 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/open-adventure.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
