From 7333446f836806d91bd2c65613d4d92041dd1c4d Mon Sep 17 00:00:00 2001 From: jesusalva Date: Wed, 7 Feb 2018 12:43:46 -0200 Subject: Remove “EvolOnline” title from spit23loginwallpaper. Include a wallpaper proposal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Proposal is currently stored as “loginwallpaper” and a copy at tools repo affects local playtesters. --- graphics/images/loginwallpaper_800x600.png | Bin 0 -> 988427 bytes graphics/images/spit23loginwallpaper_800x600.png | Bin 1481772 -> 1461934 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 graphics/images/loginwallpaper_800x600.png diff --git a/graphics/images/loginwallpaper_800x600.png b/graphics/images/loginwallpaper_800x600.png new file mode 100644 index 00000000..4a975744 Binary files /dev/null and b/graphics/images/loginwallpaper_800x600.png differ diff --git a/graphics/images/spit23loginwallpaper_800x600.png b/graphics/images/spit23loginwallpaper_800x600.png index a1fe4f83..f3b18c80 100644 Binary files a/graphics/images/spit23loginwallpaper_800x600.png and b/graphics/images/spit23loginwallpaper_800x600.png differ -- cgit v1.2.3-60-g2f50 From f74262039c30aab319e5ade176879448e780f638 Mon Sep 17 00:00:00 2001 From: jesusalva Date: Wed, 7 Feb 2018 12:46:43 -0200 Subject: Add a string to README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e69de29b..c138e477 100644 --- a/README.md +++ b/README.md @@ -0,0 +1 @@ +# Client Data for TMW2 -- cgit v1.2.3-60-g2f50 From 06468bbdf29b899065f8ea038e9bec0271687484 Mon Sep 17 00:00:00 2001 From: jesusalva Date: Wed, 7 Feb 2018 14:51:51 -0200 Subject: Manually generate and update a few minimaps: 002-1 002-2 003-1 003-2 005-1 008-1 --- graphics/minimaps/002-1.png | Bin 0 -> 15347 bytes graphics/minimaps/002-2.png | Bin 0 -> 9471 bytes graphics/minimaps/003-1.png | Bin 0 -> 45551 bytes graphics/minimaps/003-2.png | Bin 0 -> 3373 bytes graphics/minimaps/005-1.png | Bin 0 -> 34086 bytes graphics/minimaps/008-1.png | Bin 0 -> 61665 bytes maps/002-1.tmx | 2 +- maps/002-2.tmx | 2 +- maps/003-1.tmx | 2 +- maps/003-2.tmx | 1 + maps/005-1.tmx | 2 +- maps/008-1.tmx | 1 + 12 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 graphics/minimaps/002-1.png create mode 100644 graphics/minimaps/002-2.png create mode 100644 graphics/minimaps/003-1.png create mode 100644 graphics/minimaps/003-2.png create mode 100644 graphics/minimaps/005-1.png create mode 100644 graphics/minimaps/008-1.png diff --git a/graphics/minimaps/002-1.png b/graphics/minimaps/002-1.png new file mode 100644 index 00000000..ee172b91 Binary files /dev/null and b/graphics/minimaps/002-1.png differ diff --git a/graphics/minimaps/002-2.png b/graphics/minimaps/002-2.png new file mode 100644 index 00000000..f91b1557 Binary files /dev/null and b/graphics/minimaps/002-2.png differ diff --git a/graphics/minimaps/003-1.png b/graphics/minimaps/003-1.png new file mode 100644 index 00000000..01aec378 Binary files /dev/null and b/graphics/minimaps/003-1.png differ diff --git a/graphics/minimaps/003-2.png b/graphics/minimaps/003-2.png new file mode 100644 index 00000000..99c3aec8 Binary files /dev/null and b/graphics/minimaps/003-2.png differ diff --git a/graphics/minimaps/005-1.png b/graphics/minimaps/005-1.png new file mode 100644 index 00000000..d4736266 Binary files /dev/null and b/graphics/minimaps/005-1.png differ diff --git a/graphics/minimaps/008-1.png b/graphics/minimaps/008-1.png new file mode 100644 index 00000000..4d99bf3d Binary files /dev/null and b/graphics/minimaps/008-1.png differ diff --git a/maps/002-1.tmx b/maps/002-1.tmx index 2dd36437..e993bf87 100644 --- a/maps/002-1.tmx +++ b/maps/002-1.tmx @@ -4,7 +4,7 @@ - + diff --git a/maps/002-2.tmx b/maps/002-2.tmx index 323aaf69..36f3c38c 100644 --- a/maps/002-2.tmx +++ b/maps/002-2.tmx @@ -4,7 +4,7 @@ - + diff --git a/maps/003-1.tmx b/maps/003-1.tmx index a1f8f9a3..dc0b2048 100644 --- a/maps/003-1.tmx +++ b/maps/003-1.tmx @@ -3,7 +3,7 @@ - + diff --git a/maps/003-2.tmx b/maps/003-2.tmx index 590846d8..1f358726 100644 --- a/maps/003-2.tmx +++ b/maps/003-2.tmx @@ -3,6 +3,7 @@ + diff --git a/maps/005-1.tmx b/maps/005-1.tmx index 84276b47..9b1457aa 100644 --- a/maps/005-1.tmx +++ b/maps/005-1.tmx @@ -3,7 +3,7 @@ - + diff --git a/maps/008-1.tmx b/maps/008-1.tmx index c130c553..377b6e77 100644 --- a/maps/008-1.tmx +++ b/maps/008-1.tmx @@ -3,6 +3,7 @@ + -- cgit v1.2.3-60-g2f50 From 0a6db402a19d95b854a2484c42e165a40034407f Mon Sep 17 00:00:00 2001 From: jesusalva Date: Wed, 7 Feb 2018 15:07:45 -0200 Subject: Update CI to use TMW2 tools over EVOL tools. --- .tools/contributors.sh | 2 +- .tools/deploy.sh | 4 ++-- .tools/imagemagiccheck.sh | 2 +- .tools/licensecheck.sh | 2 +- .tools/testxml.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.tools/contributors.sh b/.tools/contributors.sh index 487c3cb4..6761f77b 100755 --- a/.tools/contributors.sh +++ b/.tools/contributors.sh @@ -7,7 +7,7 @@ clientdata_init aptget_update aptget_install git-core gcc ca-certificates libxml2-utils make xsltproc rm -rf tools -gitclone https://gitlab.com/evol evol-tools.git tools +gitclone https://gitlab.com/TMW2 evol-tools.git tools cd tools/contrib_xsl diff --git a/.tools/deploy.sh b/.tools/deploy.sh index 7184f4b8..1b42d445 100755 --- a/.tools/deploy.sh +++ b/.tools/deploy.sh @@ -7,7 +7,7 @@ clientdata_init aptget_update aptget_install git-core zip gcc zlib1g-dev ca-certificates libxml2-utils python rm -rf tools -gitclone https://gitlab.com/evol evol-tools.git tools +gitclone https://gitlab.com/TMW2 evol-tools.git tools cd clientdata rm -rf public @@ -16,7 +16,7 @@ mkdir public cd .. rm -rf music -gitclone https://gitlab.com/evol evol-music.git music +gitclone https://gitlab.com/TMW2 evol-music.git music cd tools/update diff --git a/.tools/imagemagiccheck.sh b/.tools/imagemagiccheck.sh index c298e576..5f3868d7 100755 --- a/.tools/imagemagiccheck.sh +++ b/.tools/imagemagiccheck.sh @@ -7,7 +7,7 @@ clientdata_init aptget_update aptget_install git-core gcc ca-certificates imagemagick rm -rf tools -gitclone https://gitlab.com/evol evol-tools.git tools +gitclone https://gitlab.com/TMW2 evol-tools.git tools cd tools/imagescheck diff --git a/.tools/licensecheck.sh b/.tools/licensecheck.sh index 750caed1..f8dedf64 100755 --- a/.tools/licensecheck.sh +++ b/.tools/licensecheck.sh @@ -7,7 +7,7 @@ clientdata_init aptget_update aptget_install git-core gcc ca-certificates grep rm -rf tools -gitclone https://gitlab.com/evol evol-tools.git tools +gitclone https://gitlab.com/TMW2 evol-tools.git tools cd tools/licensecheck diff --git a/.tools/testxml.sh b/.tools/testxml.sh index eb0cd412..7296f759 100755 --- a/.tools/testxml.sh +++ b/.tools/testxml.sh @@ -7,7 +7,7 @@ clientdata_init aptget_update aptget_install git-core zip gcc zlib1g-dev ca-certificates libxml2-utils python python-pyvorbis python-ogg python-pil rm -rf tools -gitclone https://gitlab.com/evol evol-tools.git tools +gitclone https://gitlab.com/TMW2 evol-tools.git tools cd tools/testxml -- cgit v1.2.3-60-g2f50