diff options
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | help/about-server.txt | 2 | ||||
| -rw-r--r-- | maps.xml | 77 |
3 files changed, 41 insertions, 40 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70e586cf..062bd6b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,7 @@ newlines: when: always expire_in: 3 week -contributors: +.contributors: stage: test script: - ./.tools/contributors.sh diff --git a/help/about-server.txt b/help/about-server.txt index 8dfd6231..a7f00ea5 100644 --- a/help/about-server.txt +++ b/help/about-server.txt @@ -27,13 +27,13 @@ ##9dusty in a bootle ##9Axzell ##9+seeds +##9Micksha (Mick) ##3##BAdditional Mappers##b ##9Soren ##3##BNotable Mentions##b ##941444d494e (Andrei Karas) -##9Micksha (Mick) ##9gnulinux ##9Kolchak @@ -365,9 +365,6 @@ Copyright (C) 2018 TMW2 --> <map name="017-10.tmx"> <atlas name="lof-indoor"/> </map> - <map name="017-11.tmx"> - <atlas name="duck-island"/> - </map> <map name="018-1.tmx"> <atlas name="lof-island"/> </map> @@ -419,6 +416,9 @@ Copyright (C) 2018 TMW2 --> <map name="018-5-3.tmx"> <atlas name="lilit-indoor"/> </map> + <map name="018-5-4.tmx"> + <atlas name="duck-island"/> + </map> <map name="018-5-boss.tmx"> <atlas name="cave"/> </map> @@ -854,6 +854,41 @@ Copyright (C) 2018 TMW2 --> <file name="graphics/tilesets/woodland_ground2.png"/> </atlas> + <atlas name="duck-island"> + <file name="graphics/tilesets/ship-base.png"/> + <file name="graphics/tilesets/ship-mast.png"/> + <file name="graphics/tilesets/collision.png"/> + <file name="graphics/tilesets/tree-x3x3.png"/> + <file name="graphics/tilesets/tree-x3x4.png"/> + <file name="graphics/tilesets/box.png"/> + <file name="graphics/tilesets/box-x1x2.png"/> + <file name="graphics/tilesets/waterflow.png"/> + <file name="graphics/tilesets/woodland_village.png"/> + <file name="graphics/tilesets/woodland_ground.png"/> + <file name="graphics/tilesets/trans_woodland_desert.png"/> + <file name="graphics/tilesets/docks.png"/> + <file name="graphics/tilesets/woodland_x2.png"/> + <file name="graphics/tilesets/water_overflow.png"/> + <file name="graphics/tilesets/woodland_x3.png"/> + <file name="graphics/tilesets/docks_x2.png"/> + <file name="graphics/tilesets/woodland_village_x2.png"/> + <file name="graphics/tilesets/desert_x5.png"/> + <file name="graphics/tilesets/water3.png"/> + <file name="graphics/tilesets/christmas.png"/> + <file name="graphics/tilesets/artis-fountain-x1x4.png"/> + <file name="graphics/tilesets/artis-fountain.png"/> + <file name="graphics/tilesets/artis-house.png"/> + <file name="graphics/tilesets/artis-blockwall.png"/> + <file name="graphics/tilesets/artis-accessory.png"/> + <file name="graphics/tilesets/artis-archway-x1x5.png"/> + <file name="graphics/tilesets/signs_x2.png"/> + <file name="graphics/tilesets/artis-pavement.png"/> + <file name="graphics/tilesets/artis-lamps-x1x3.png"/> + <file name="graphics/tilesets/night.png"/> + <file name="graphics/tilesets/ship-flags-x3x2.png"/> + <file name="graphics/tilesets/lof/warp_gates.png"/> + </atlas> + <atlas name="eternalswamp"> <file name="graphics/tilesets/christmas.png"/> <file name="graphics/tilesets/concreteWalls.png"/> @@ -1051,6 +1086,7 @@ Copyright (C) 2018 TMW2 --> <file name="graphics/tilesets/woodland_ground2.png"/> <file name="graphics/tilesets/woodland_x2.png"/> <file name="graphics/tilesets/woodland_x3.png"/> + <file name="graphics/tilesets/lof/warp_gates.png"/> </atlas> <atlas name="lilit-indoor"> @@ -1482,41 +1518,6 @@ Copyright (C) 2018 TMW2 --> <file name="graphics/tilesets/br/trans_woodland_desert.png"/> </atlas> - <!-- namespace Duck Island --> - <atlas name="duck-island"> - <file name="graphics/tilesets/ship-base.png"/> - <file name="graphics/tilesets/ship-mast.png"/> - <file name="graphics/tilesets/collision.png"/> - <file name="graphics/tilesets/tree-x3x3.png"/> - <file name="graphics/tilesets/tree-x3x4.png"/> - <file name="graphics/tilesets/box.png"/> - <file name="graphics/tilesets/box-x1x2.png"/> - <file name="graphics/tilesets/waterflow.png"/> - <file name="graphics/tilesets/woodland_village.png"/> - <file name="graphics/tilesets/woodland_ground.png"/> - <file name="graphics/tilesets/trans_woodland_desert.png"/> - <file name="graphics/tilesets/docks.png"/> - <file name="graphics/tilesets/woodland_x2.png"/> - <file name="graphics/tilesets/water_overflow.png"/> - <file name="graphics/tilesets/woodland_x3.png"/> - <file name="graphics/tilesets/docks_x2.png"/> - <file name="graphics/tilesets/woodland_village_x2.png"/> - <file name="graphics/tilesets/desert_x5.png"/> - <file name="graphics/tilesets/water3.png"/> - <file name="graphics/tilesets/christmas.png"/> - <file name="graphics/tilesets/artis-fountain-x1x4.png"/> - <file name="graphics/tilesets/artis-fountain.png"/> - <file name="graphics/tilesets/artis-house.png"/> - <file name="graphics/tilesets/artis-blockwall.png"/> - <file name="graphics/tilesets/artis-accessory.png"/> - <file name="graphics/tilesets/artis-archway-x1x5.png"/> - <file name="graphics/tilesets/signs_x2.png"/> - <file name="graphics/tilesets/artis-pavement.png"/> - <file name="graphics/tilesets/artis-lamps-x1x3.png"/> - <file name="graphics/tilesets/night.png"/> - <file name="graphics/tilesets/ship-flags-x3x2.png"/> - <file name="graphics/tilesets/lof/warp_gates.png"/> - </atlas> </maps> |