.cirrus.yml

-task:
-  name: build_sdl1
-  timeout_in: 120m
-  freebsd_instance:
-    matrix:
-      image_family: freebsd-13-0-snap
-      image_family: freebsd-12-1
-      image_family: freebsd-12-0
-      image_family: freebsd-12-1-snap
-      image_family: freebsd-11-3-snap
-
-  env:
-    CIRRUS_CLONE_DEPTH: 1
-    MAKE_FLAGS: -j 2
-    PACKAGES: autoconf automake libtool pkgconf gcc libxml2 freetype2 png curl build xorg glib xorgproto intltool gettext gettext-runtime gettext-tools git sdl sdl_gfx sdl_image sdl_mixer sdl_net sdl_ttf git gdb valgrind
-    LOCALBASE: /usr/local
-    LDFLAGS: -L${LOCALBASE}/lib -lintl
-    CXX: clang++
-    CC: clang
-    LOGFILE: clang.log
-
-  before_script:
-    - gcc --version || true
-    - clang --version || true
-    - echo ${LOCALBASE}
-    - echo ${LDFLAGS}
-    - mkdir logs || true
-
-  pkginstall_script:
-    - pkg update -f
-    - pkg install -y ${PACKAGES}
-
-  env_script:
-    - env
-
-  build_script:
-    - ./tools/ci/jobs/any_compiler.sh --with-libintl-prefix=${LOCALBASE}
-
-  always:
-    config_artifacts:
-      path: "config.log"
-
-  always:
-    all_artifacts:
-      path: "*"
-
-  always:
-    logs_artifacts:
-      path: "logs/*"
-
-  run_script:
-    - ./tools/ci/scripts/runtests.sh
-
-  build_tests_script:
-    - make clean
-    - ./tools/ci/jobs/any_compiler_tests.sh --without-dyecmd --without-manaplusgame --with-libintl-prefix=${LOCALBASE}
-
-  always:
-    config_tests_artifacts:
-      path: "config.log"
-
-  always:
-    all_tests_artifacts:
-      path: "*"
-
-  always:
-    logs_tests_artifacts:
-      path: "logs/*"
-
-
-task:
-  name: build_sdl2
-  timeout_in: 120m
-  freebsd_instance:
-    matrix:
-      image_family: freebsd-13-0-snap
-      image_family: freebsd-12-1
-      image_family: freebsd-12-0
-      image_family: freebsd-12-1-snap
-      image_family: freebsd-11-3-snap
-
-  env:
-    CIRRUS_CLONE_DEPTH: 1
-    MAKE_FLAGS: -j 2
-    PACKAGES: autoconf automake libtool pkgconf gcc libxml2 freetype2 png curl build xorg glib xorgproto intltool gettext gettext-runtime gettext-tools git sdl2 sdl2_gfx sdl2_image sdl2_mixer sdl2_net sdl2_ttf git gdb valgrind
-    LOCALBASE: /usr/local
-    LDFLAGS: -L${LOCALBASE}/lib -lintl
-    CXX: clang++
-    CC: clang
-    LOGFILE: clang.log
-
-  before_script:
-    - gcc --version || true
-    - clang --version || true
-    - echo ${LOCALBASE}
-    - echo ${LDFLAGS}
-    - mkdir logs || true
-
-  pkginstall_script:
-    - pkg update -f
-    - pkg install -y ${PACKAGES}
-
-  env_script:
-    - env
-
-  build_script:
-    - ./tools/ci/jobs/any_compiler.sh --with-sdl2 --with-libintl-prefix=${LOCALBASE}
-
-  always:
-    config_artifacts:
-      path: "config.log"
-
-  always:
-    all_artifacts:
-      path: "*"
-
-  always:
-    logs_artifacts:
-      path: "logs/*"
-
-  run_script:
-    - ./tools/ci/scripts/runtests.sh
-
-  build_tests_script:
-    - make clean
-    - ./tools/ci/jobs/any_compiler_tests.sh --without-dyecmd --without-manaplusgame --with-libintl-prefix=${LOCALBASE} --with-sdl2
-
-  always:
-    config_tests_artifacts:
-      path: "config.log"
-
-  always:
-    all_tests_artifacts:
-      path: "*"
-
-  always:
-    logs_tests_artifacts:
-      path: "logs/*"

.gitignore

@@ -37,10 +37,9 @@ po/POTFILES
 .deps
 stamp-h1
 /manaplus.spec
+/manaverse.spec
 PKGBUILD
-data/evol/evol.desktop
 data/tmw/tmw.desktop
-data/evol/evol
 data/tmw/tmw
 
 # files created by CMake

.travis.yml

@@ -41,22 +41,22 @@ env:
         PACKAGES="gcc-10 g++-10 
                   ${LIBS_PACKAGES} ${SDL1}"
       - IMAGE=ubuntu:xenial
-        COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame"
+        COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-gameclient"
         PACKAGES="gcc-5 g++-5 
                   ${LIBS_PACKAGES} ${SDL1}
                   valgrind"
       - IMAGE=debian:stretch
-        COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame"
+        COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-gameclient"
         PACKAGES="gcc-6 g++-6 
                   ${LIBS_PACKAGES} ${SDL1}
                   valgrind"
       - IMAGE=debian:unstable
-        COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame"
+        COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-gameclient"
         PACKAGES="gcc-10 g++-10 
                   ${LIBS_PACKAGES} ${SDL1}
                   valgrind"
       - IMAGE=ubuntu:xenial
-        COMMAND="./tools/ci/jobs/gcc5_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame"
+        COMMAND="./tools/ci/jobs/gcc5_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-gameclient"
         PACKAGES="gcc-5 g++-5 
                   ${LIBS_PACKAGES} ${SDL1}
                   valgrind"
@@ -75,17 +75,17 @@ env:
         PACKAGES="gcc-10 g++-10 
                   ${LIBS_PACKAGES} ${SDL1}"
       - IMAGE=i386/ubuntu:xenial
-        COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame"
+        COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-gameclient"
         PACKAGES="gcc-5 g++-5 
                   ${LIBS_PACKAGES} ${SDL1}
                   valgrind"
       - IMAGE=i386/debian:stretch
-        COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame"
+        COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-gameclient"
         PACKAGES="gcc-6 g++-6 
                   ${LIBS_PACKAGES} ${SDL1}
                   valgrind"
       - IMAGE=i386/debian:unstable
-        COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame"
+        COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-gameclient"
         PACKAGES="gcc-10 g++-10 
                   ${LIBS_PACKAGES} ${SDL1}
                   valgrind"
@@ -104,22 +104,22 @@ env:
         PACKAGES="gcc-10 g++-10 
                   ${LIBS_PACKAGES} ${SDL2}"
       - IMAGE=ubuntu:xenial
-        COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2"
+        COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-gameclient --with-sdl2"
         PACKAGES="gcc-5 g++-5 
                   ${LIBS_PACKAGES} ${SDL2}
                   valgrind"
       - IMAGE=debian:stretch
-        COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2"
+        COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-gameclient --with-sdl2"
         PACKAGES="gcc-6 g++-6 
                   ${LIBS_PACKAGES} ${SDL2}
                   valgrind"
       - IMAGE=debian:unstable
-        COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2"
+        COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-gameclient --with-sdl2"
         PACKAGES="gcc-10 g++-10 
                   ${LIBS_PACKAGES} ${SDL2}
                   valgrind"
       - IMAGE=ubuntu:xenial
-        COMMAND="./tools/ci/jobs/gcc5_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2"
+        COMMAND="./tools/ci/jobs/gcc5_sanitize_tests.sh --disable-tmwa --without-dyecmd --without-gameclient --with-sdl2"
         PACKAGES="gcc-5 g++-5 
                   ${LIBS_PACKAGES} ${SDL2}
                   valgrind"
@@ -138,17 +138,17 @@ env:
         PACKAGES="gcc-10 g++-10 
                   ${LIBS_PACKAGES} ${SDL2}"
       - IMAGE=i386/ubuntu:xenial
-        COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2"
+        COMMAND="./tools/ci/jobs/gcc5_tests.sh --disable-tmwa --without-dyecmd --without-gameclient --with-sdl2"
         PACKAGES="gcc-5 g++-5 
                   ${LIBS_PACKAGES} ${SDL2}
                   valgrind"
       - IMAGE=i386/debian:stretch
-        COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2"
+        COMMAND="./tools/ci/jobs/gcc6_tests.sh --disable-tmwa --without-dyecmd --without-gameclient --with-sdl2"
         PACKAGES="gcc-6 g++-6 
                   ${LIBS_PACKAGES} ${SDL2}
                   valgrind"
       - IMAGE=i386/debian:unstable
-        COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-manaplusgame --with-sdl2"
+        COMMAND="./tools/ci/jobs/gcc10_tests.sh --disable-tmwa --without-dyecmd --without-gameclient --with-sdl2"
         PACKAGES="gcc-10 g++-10 
                   ${LIBS_PACKAGES} ${SDL2}
                   valgrind"

AUTHORS

@@ -6,6 +6,7 @@
 Andrei Karas (4144) <akaras inbox ru>
 Ben Longbons <b.r.longbons gmail com>
 Danil Sagunov (Vasily_Makarov) <danilka.pro gmail com>
+Fedja Beader <fedja protonmail ch>
 Helmut Grohne (gnurfk) <helmut subdivi de>
 Philippe Groarke (Socapex) 
 Maarten Vanraes (AL13N) <maarten.vanraes gmail com>

Android.mk

@@ -17,7 +17,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include \
 
 LOCAL_CPPFLAGS += -DUSE_SDL2 -DTMWA_SUPPORT -DUSE_OPENGL -DENABLE_NLS -DENABLE_LIBXML
 LOCAL_CPPFLAGS += -frtti -fexceptions -Wno-error=format-security -fvisibility=hidden
-LOCAL_CPPFLAGS += -ffast-math -funswitch-loops -pedantic -Wall -Wc++11-compat -std=c++0x -funsafe-loop-optimizations -flto -fwhole-program
+LOCAL_CPPFLAGS += -ffast-math -funswitch-loops -pedantic -Wall -Wc++17-compat -std=c++11 -funsafe-loop-optimizations -flto -fwhole-program
 LOCAL_CPPFLAGS += -fpic -fpie
 
 LOCAL_SHARED_LIBRARIES := SDL2 SDL2_mixer sdl_net SDL2_ttf SDL2_image libcurl intl png sdl2_gfx xml2
@@ -48,9 +48,9 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
     $(wildcard $(LOCAL_PATH)/src/const/gui/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/const/net/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/progs/*.cpp) \
-    $(wildcard $(LOCAL_PATH)/src/progs/manaplus/*.cpp) \
-    $(wildcard $(LOCAL_PATH)/src/progs/manaplus/gui/*.cpp) \
-    $(wildcard $(LOCAL_PATH)/src/progs/manaplus/actions/*.cpp) \
+    $(wildcard $(LOCAL_PATH)/src/progs/manaverse/*.cpp) \
+    $(wildcard $(LOCAL_PATH)/src/progs/manaverse/gui/*.cpp) \
+    $(wildcard $(LOCAL_PATH)/src/progs/manaverse/actions/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/resources/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/resources/image/*.cpp) \
     $(wildcard $(LOCAL_PATH)/src/resources/animation/*.cpp) \

CMakeLists.txt

@@ -62,8 +62,8 @@ If(UNIX)
 ENDIF()
 
 SET(CPACK_PACKAGE_NAME "manaplus")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ManaPlus")
-SET(CPACK_PACKAGE_VENDOR "ManaPlus Development Team")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ManaVerse")
+SET(CPACK_PACKAGE_VENDOR "ManaVerse Development Team")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "ManaPlus")
@@ -74,6 +74,6 @@ IF(WIN32)
     SET(CPACK_NSIS_DISPLAY_NAME "ManaPlus")
     SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaplus.ico")
     SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/setup_welcome.bmp")
-    SET(CPACK_NSIS_URL_INFO_ABOUT "http://manaplus.org")
+    SET(CPACK_NSIS_URL_INFO_ABOUT "https://manaverse.germantmw.de")
 ENDIF()
 INCLUDE(CPack)

INSTALL

-How to compile and run ManaPlus on your GNU/Linux Box
-=================================================
+How to compile and run ManaVerse on your GNU+Linux Box
+======================================================
 
-Homepage:  http://manaplus.org/
-IRC:       irc.freenode.net / #manaplus
+Homepage:  http://manaverse.germantmw.de/
+IRC:       irc.libera.chat:6697 (TLS) / #themanaworld-irc
 
 1) Requirements
-2) Compiling And Installing ManaPlus
+2) Compiling And Installing ManaVerse
 3) Notes
 
 
 1. Requirements
 ===============
 
-You are expected to have either checked out ManaPlus from Git or you have downloaded
-a source release. To get ManaPlus to compile, you need a compiler (GCC)
+You are expected to have either checked out ManaVerse from Git or you have downloaded
+a source release. To get ManaVerse to compile, you need a compiler (GCC)
 and some libraries. The required libraries are:
 
 * SDL               http://www.libsdl.org/
@@ -42,8 +42,8 @@ Installing these dependencies is distributions-specific, and we'll leave it to
 you to figure this out.
 
 
-2. Compiling And Installing ManaPlus
-====================================
+2. Compiling And Installing ManaVerse
+=====================================
 
 Building with GNU Autotools
 
@@ -54,12 +54,12 @@ Building with GNU Autotools
 4) Run "make"
 5) Run "make install" as root
 
-It should have installed ManaPlus on your system now, and you can run it
-with "manaplus". By default all files are installed to /usr/local, you can pass
+It should have installed ManaVerse on your system now, and you can run it
+with "manaverse". By default all files are installed to /usr/local, you can pass
 a different prefix to configure as usual.
 
 
-  NOTE: It is possible to compile ManaPlus without support for OpenGL rendering.
+  NOTE: It is possible to compile ManaVerse without support for OpenGL rendering.
   To do this perform step 3 as follows:
 
     ./configure --without-opengl
@@ -67,7 +67,7 @@ a different prefix to configure as usual.
   Rebuild the executable from scratch using "make clean" and then "make".
 
 
-Building with CMake
+Building with CMake (unsupported)
 
 1) Create a directory for building and change to that directory.
 2) Configure the build with: cmake <path_to_source>

PKGBUILD.in

 # Maintainer: Aline Ferraz <freya.df@gmail.com>
 
-pkgname=manaplus-git
+pkgname=manaverse-git
 pkgver=@PACKAGE_VERSION@
 pkgrel=1
-pkgdesc="ManaPlus is a 2D MMORPG game advanced client for games based on eAthena fork The Mana World (tAthena) also for other forks like Evol. More info here: http://manaplus.evolonline.org"
+pkgdesc="ManaVerse is a 2D MMORPG game advanced client for games based on eAthena fork The Mana World (tmwAthena/Evol2)."
 arch=('i686' 'x86_64')
-url="http://manaplus.org"
+url="https://manaverse.germantmw.de"
 depends=('libxml2' 'sdl_image' 'sdl_mixer' 'sdl_net' 'sdl_ttf' 'sdl_gfx')
 license=('GPL2')
 

README

-THE MANA PLUS CLIENT
-===============
+THE MANA VERSE CLIENT
+=====================
 
- Version: 1.9.3.23        Date: 2019-03-23
+ Builds:
+  ManaVerse CI: https://git.themanaworld.org/mana/plus/-/pipelines
+  Windows:      https://git.themanaworld.org/mana/docker-windows-builder/-/jobs/artifacts/master/browse?job=mxe_gcc5
+  AppImg:       https://git.themanaworld.org/mana/appimg-builder/-/jobs/artifacts/master/browse?job=x86_64-AppImage
+  deb:          https://git.themanaworld.org/mana/appimg-builder/-/jobs/artifacts/master/browse?job=deb_pkg
 
- Build status:
-  ManaPlus CI: https://git.themanaworld.org/mana/plus/badges/master/pipeline.svg
-  Windows: https://gitlab.com/themanaworld/manaplus/docker-windows-builder/badges/master/pipeline.svg
-  AppImg: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg
-  deb: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg
-  Coverage: https://git.themanaworld.org/mana/plus/badges/master/coverage.svg
-  Doxygen: http://stats.manaplus.org/docs/index.html
-  Coverity: https://scan.coverity.com/projects/manaplus
+  See file INSTALL for build instructions.
 
  Development team:
   - See AUTHORS file for a list
@@ -114,18 +111,17 @@ Actions:
 - /away MSG          set away mode.
 - /follow NICK       start follow mode.
 - /imitation NICK    start imitation mode.
-- /heal NICK         heal nick.
+- /heal NICK         heal somebody by nickname
 - /move X Y          move to X,Y position in short distance.
 - /navigate x y      move to position x,y in current map in any distance.
-- /mail NICK MSG     send offline message to NICK. Working only in tmw server.
+- /mail NICK MSG     send offline message to NICK. Working only in servers with mail support.
 - /disconnect        quick disconnect from server.
 - /attack            attack target.
-- /undress NICK      remove all clothes from nick. Local effect only.
 
 Trade:
 - /trade NICK        start trade with nick.
-- /priceload         load shop price from disc.
-- /pricesave         save shop price to disc.
+- /priceload         load shop price from disk.
+- /pricesave         save shop price to disk.
 
 Player relations:
 - /ignore NICK       add nick to ignore list.
@@ -142,35 +138,35 @@ Player relations:
 Debug:
 - /who               print online players number to chat.
 - /all               show visible beings list in debug tab.
-- /where             print current player position to chat.
+- /where             Show map and coordiantes of your avatar
 - /cacheinfo         show text cache info.
 - /dirs              show client directories in debug window.
 
 Other:
 - /help              Displays the list of commands
-- /announce          broadcasts a global msg(Gm Cammand only)
-- /who               shows how many players are online
-- /where             displays the map name your currently on
+- /announce          (GM) broadcasts a global msg
 
 4. Support
 ----------
 
-If you're having issues with this client, feel free to report them to us.
-You can report on forum (http://forums.themanaworld.org/viewforum.php?f=12),
-bugtracker (https://git.themanaworld.org/mana/plus/issues/) or other project
-networks such as IRC.
+Please report any issues you are having with this client.
+You can report them at:
 
-If you have feedback about a specific game that uses the ManaPlus client, be sure
-to contact the developers of the game instead.
+- bugtracker: https://git.themanaworld.org/mana/plus/issues/
+- forum: http://forums.themanaworld.org/viewforum.php?f=56
+- IRC: https://web.libera.chat/?channels=themanaworld-irc
+- Discord https://shields.io/discord/775612630836445206.svg?label=Discord
+- In game: to game masters, developers or #world channel.
+
+If you have feedback about a specific game that uses the ManaVerse client, be sure
+to instead contact the developers of that game.
 
 5. Licenses
 -----------
 
-All code in this repository under GPL 2+ license. Art can be under CC-BY-SA or GPL 2+.
+All code in this repository is under GPL 2+ license. Art can be under CC-BY-SA or GPL 2+.
 
-Github, Bitbucked or other non free hostings may use strange TOS what may violate this licenses.
-If any of this hostings want to violate GPL or/and CC-BY-SA licenses,
-they not have any rights to do so.
-This hostings have rights to remove ManaPlus repositories if they want violate given licenses.
+GitHub or other non-free hosting providers may use strange Terms of Service that may violate these licenses.
+If any of their terms violate these licenses then these providers should remove ManaVerse repositories from their platforms.
 
-ManaPlus main repository hosted on https://gitlab.com/manaplus/manaplus/
+ManaVerse is a fork of ManaPlus, the main repository of the latter is hosted on https://gitlab.com/manaplus/manaplus/

README.md

-# The Mana Plus Client
+# The Mana Verse Client
 
-![ManaPlus logo](data/icons/manaplus.png)
+![ManaVerse logo](data/icons/manaverse.png)
 
-Version: 1.9.3.23        Date: 2019-03-23
-
-### Build status
-
- - ManaPlus CI: [![gitlab build status](https://git.themanaworld.org/mana/plus/badges/master/pipeline.svg?key_text=master)](https://git.themanaworld.org/mana/plus/commits/master)
-
- - Downloads: [![gitlab windows build](https://gitlab.com/themanaworld/manaplus/docker-windows-builder/badges/master/pipeline.svg?key_text=Windows+Build&key_width=150px)](https://gitlab.com/themanaworld/manaplus/docker-windows-builder/commits/master),
- [![gitlab appimg build](https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg?key_text=AppImg+Build&key_width=150px)](https://gitlab.com/themanaworld/manaplus/appimg-builder/commits/master),
- [![gitlab .deb build](https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg?key_text=.deb+Build&key_width=150px)](https://gitlab.com/themanaworld/manaplus/appimg-builder/commits/master)
+### Downloads and Build status
+<!-- can't link to job pages directly (https://gitlab.com/gitlab-org/gitlab/-/issues/19845#note_435733246)
+     but the browse link has a job page reference and a download button. -->
+  <!-- direct link: */-/jobs/artifacts/master/download?job=mxe_gcc5 -->
+  [![gitlab windows build](https://git.themanaworld.org/mana/docker-windows-builder/badges/master/pipeline.svg?key_text=Windows+Build&key_width=100px)](https://git.themanaworld.org/mana/docker-windows-builder/-/jobs/artifacts/master/browse?job=mxe_gcc5)
+  [![gitlab appimg build](https://git.themanaworld.org/mana/appimg-builder/badges/master/pipeline.svg?key_text=AppImg+Build&key_width=100px)](https://git.themanaworld.org/mana/appimg-builder/-/jobs/artifacts/master/browse?job=x86_64-AppImage)
+  [![gitlab .deb build](https://git.themanaworld.org/mana/appimg-builder/badges/master/pipeline.svg?key_text=.deb+Build&key_width=100px)](https://git.themanaworld.org/mana/appimg-builder/-/jobs/artifacts/master/browse?job=deb_pkg)
 
+  [![gitlab build status](https://git.themanaworld.org/mana/plus/badges/master/pipeline.svg?key_text=CI%20on%20master&key_width=100px)](https://git.themanaworld.org/mana/plus/-/pipelines)
 <!--
 Cicle CI: [![CircleCI](https://circleci.com/gh/ManaPlus/ManaPlus/tree/master.svg?style=svg)](https://circleci.com/gh/ManaPlus/ManaPlus/tree/master)
 
@@ -23,12 +22,16 @@ Azure CI: [![Build Status macosx](https://dev.azure.com/manaplus/ManaPlus/_apis/
           [![Build Status windows](https://dev.azure.com/manaplus/ManaPlus/_apis/build/status/ManaPlus%20main)](https://dev.azure.com/manaplus/ManaPlus/_build/latest?definitionId=1)
 -->
 
- - Coverage: ![coverage report](https://git.themanaworld.org/mana/plus/badges/master/coverage.svg) <!-- no pipeline rn -->
+  Click on an image above to download last good build or ![Build yourself](INSTALL)
 
- - Doxygen: ![doxygen](https://img.shields.io/badge/Docs-Doxygen-blue.svg) <!-- no pipeline rn -->
+<!-- no pipelines rn :(
 
- - Coverity: ![coverity](https://scan.coverity.com/projects/318/badge.svg) <!-- no pipeline rn -->
+ - Coverage: ![coverage report](https://git.themanaworld.org/mana/plus/badges/master/coverage.svg)
 
+ - Doxygen: ![doxygen](https://img.shields.io/badge/Docs-Doxygen-blue.svg)
+
+ - Coverity: ![coverity](https://scan.coverity.com/projects/318/badge.svg)
+-->
 
 ### Development team:
  - See [AUTHORS](AUTHORS) file for a list
@@ -129,18 +132,17 @@ Whispers:
 - /away MSG          set away mode.
 - /follow NICK       start follow mode.
 - /imitation NICK    start imitation mode.
-- /heal NICK         heal nick.
+- /heal NICK         heal somebody by nickname
 - /move X Y          move to X,Y position in short distance.
 - /navigate x y      move to position x,y in current map in any distance.
-- /mail NICK MSG     send offline message to NICK. Working only in tmw server.
+- /mail NICK MSG     send offline message to NICK. Working only in servers with mail support.
 - /disconnect        quick disconnect from server.
 - /attack            attack target.
-- /undress NICK      remove all clothes from nick. Local effect only.
 
 ### Trade:
 - /trade NICK        start trade with nick.
-- /priceload         load shop price from disc.
-- /pricesave         save shop price to disc.
+- /priceload         load shop price from disk.
+- /pricesave         save shop price to disk.
 
 ### Player relations:
 - /ignore NICK       add nick to ignore list.
@@ -157,32 +159,34 @@ Whispers:
 ### Debug:
 - /who               print online players number to chat.
 - /all               show visible beings list in debug tab.
-- /where             print current player position to chat.
+- /where             Show map and coordiantes of your avatar
 - /cacheinfo         show text cache info.
 - /dirs              show client directories in debug window.
 
 ### Other:
 - /help              Displays the list of commands
-- /announce          broadcasts a global msg(Gm Cammand only)
-- /who               shows how many players are online
-- /where             displays the map name your currently on
+- /announce          (GM) broadcasts a global msg
 
 ## 4. Support
 
-If you're having issues with this client, feel free to report them to us.
-You can report on [![forum](https://img.shields.io/badge/forum-forums.themanaworld.org-yellow.svg)](http://forums.themanaworld.org/viewforum.php?f=12),
-[![Issues](https://badgen.net/gitlab/open-issues/themanaworld%2fmanaplus/manaplus?label=Issues)](https://git.themanaworld.org/mana/plus/issues/),
-[![IRC](https://img.shields.io/badge/IRC-FreeNode/germantmw-yellow.svg)](web.libera.chat/?channels=themanaworld) or
-![discord](https://shields.io/discord/775612630836445206.svg?label=Discord)
+Please report any issues you are having with this client.
+You can report them at:
+
+<!-- Can't easily get a badge for *open* issues from GitLab itself: https://stackoverflow.com/questions/48829255/gitlab-count-total-number-of-issues -->
+- ![GitLab Issues](https://img.shields.io/gitlab/issues/open/mana%2Fplus?gitlab_url=https%3A%2F%2Fgit.themanaworld.org) (if you have a TMW GitLab account)
+- [![forum](https://img.shields.io/badge/forum-forums.themanaworld.org-yellow.svg)](https://forums.themanaworld.org/viewforum.php?f=56)
+- [![IRC](https://img.shields.io/badge/IRC-Libera%2Fthemanaworld--irc-yellow)](https://web.libera.chat/?channels=themanaworld-irc)
+- ![Discord](https://shields.io/discord/775612630836445206.svg?label=Discord)
+- In game: to game masters, developers or #world channel.
 
-If you have feedback about a specific game that uses the ManaPlus client, be sure
-to contact the developers of the game instead.
+If you have feedback about a specific game that uses the ManaVerse client, be sure
+to instead contact the developers of that game.
 
 ## 5. Licenses
 
-All code in this repository under ![GPL 2+](https://img.shields.io/badge/license-GPL2+-blue.svg) license. Art can be under ![CC-BY-SA](https://img.shields.io/badge/license-CC_BY_SA-blue.svg) or ![GPL 2+](https://img.shields.io/badge/license-GPL2+-blue.svg).
+All code in this repository is under ![GPL 2+](https://img.shields.io/badge/license-GPL2+-blue.svg) license. Art can be under ![CC-BY-SA](https://img.shields.io/badge/license-CC_BY_SA-blue.svg) or ![GPL 2+](https://img.shields.io/badge/license-GPL2+-blue.svg).
 
-Github, Bitbucked or other non free hostings may use strange TOS what may violate this licenses. If any of this hostings want to violate GPL or/and CC-BY-SA licenses,
-they not have any rights to do so. This hostings have rights to remove ManaPlus repositories if they want violate given licenses.
+GitHub or other non-free hosting providers may use strange Terms of Service that may violate these licenses.
+If any of their terms violate these licenses then these providers should remove ManaVerse repositories from their platforms.
 
-ManaPlus main repository hosted on [gitlab.com](https://gitlab.com/manaplus/manaplus/)
+ManaVerse is a fork of ManaPlus, the main repository of the latter is hosted on [gitlab.com](https://gitlab.com/manaplus/manaplus/)

README.txt

-THE MANA PLUS CLIENT
+THE MANA VERSE CLIENT
 ===============
 
  Version: 1.9.3.23        Date: 2019-03-23
@@ -7,10 +7,10 @@ THE MANA PLUS CLIENT
   - See AUTHORS file for a list
 
  Build status:
-  ManaPlus CI: https://git.themanaworld.org/mana/plus/badges/master/pipeline.svg
-  Windows: https://gitlab.com/themanaworld/manaplus/docker-windows-builder/badges/master/pipeline.svg
-  AppImg: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg
-  deb: https://gitlab.com/themanaworld/manaplus/appimg-builder/badges/master/pipeline.svg
+  ManaVerse CI: https://git.themanaworld.org/mana/plus/badges/master/pipeline.svg
+  Windows: https://git.themanaworld.org/mana/docker-windows-builder/badges/master/pipeline.svg
+  AppImg: https://git.themanaworld.org/mana/appimg-builder/badges/master/pipeline.svg
+  deb: https://git.themanaworld.org/mana/appimg-builder/badges/master/pipeline.svg
   Coverage: https://git.themanaworld.org/mana/plus/badges/master/coverage.svg
   Doxygen: http://stats.manaplus.org/docs/index.html
   Coverity: https://scan.coverity.com/projects/manaplus
@@ -171,6 +171,6 @@ All code in this repository under GPL 2+ license. Art can be under CC-BY-SA or G
 Github, Bitbucked or other non free hostings may use strange TOS what may violate this licenses.
 If any of this hostings want to violate GPL or/and CC-BY-SA licenses,
 they not have any rights to do so.
-This hostings have rights to remove ManaPlus repositories if they want violate given licenses.
+This hostings have rights to remove ManaVerse repositories if they want violate given licenses.
 
-ManaPlus main repository hosted on https://gitlab.com/manaplus/manaplus/
+ManaVerse is a fork of ManaPlus, the main repository of the latter is hosted on https://gitlab.com/manaplus/manaplus/

azure-pipelines_windows.yml

-jobs:
-- job: mxe_32_build
-  pool:
-    name: 'Hosted Ubuntu 1604'
-  steps:
-  - script: |
-      uname -a
-      export BITS=32
-      export CROSS="i686-w64-mingw32.shared"
-      ./tools/ci/scripts/azure/mxetest.sh
-      cp ./dlls/* "$(Build.ArtifactStagingDirectory)"
-      cp ./src/*.exe "$(Build.ArtifactStagingDirectory)"
-      sudo ./tools/ci/scripts/azure/mxeremovefiles.sh
-      cp -rf . "$(Build.ArtifactStagingDirectory)"
-      ls "$(Build.ArtifactStagingDirectory)"
-      echo done
-    env:
-      GITLABTOKEN: $(gitlabtoken)
-  - task: PublishBuildArtifacts@1
-    inputs:
-      artifactName: manaplus32
-
-- job: mxe_32_test
-  dependsOn: mxe_32_build
-  pool:
-    name: 'Hosted VS2017'
-  steps:
-  - checkout: none
-  - task: DownloadBuildArtifacts@0
-    inputs:
-      buildType: 'current'
-      project: 'ManaPlus'
-      artifactName: 'manaplus32'
-  - script: dir "$(Build.ArtifactStagingDirectory)\manaplus32"
-  - script: xcopy /s "$(Build.ArtifactStagingDirectory)\manaplus32\*" .
-  - script: tools\ci\scripts\addextrafiles.cmd
-  - script: dir
-  - script: |
-      set SDL_VIDEODRIVER=dummy
-      echo run
-      manaplustests.exe
-
-- job: mxe_64_build
-  pool:
-    name: 'Hosted Ubuntu 1604'
-  steps:
-  - script: |
-      uname -a
-      export BITS=64
-      export CROSS="x86_64-w64-mingw32.shared"
-      ./tools/ci/scripts/azure/mxetest.sh
-      cp ./dlls/* "$(Build.ArtifactStagingDirectory)"
-      cp ./src/*.exe "$(Build.ArtifactStagingDirectory)"
-      sudo ./tools/ci/scripts/azure/mxeremovefiles.sh
-      cp -rf . "$(Build.ArtifactStagingDirectory)"
-      ls "$(Build.ArtifactStagingDirectory)"
-      echo done
-    env:
-      GITLABTOKEN: $(gitlabtoken)
-  - task: PublishBuildArtifacts@1
-    inputs:
-      artifactName: manaplus64
-
-- job: mxe_64_test
-  dependsOn: mxe_64_build
-  pool:
-    name: 'Hosted VS2017'
-  steps:
-  - checkout: none
-  - task: DownloadBuildArtifacts@0
-    inputs:
-      buildType: 'current'
-      project: 'ManaPlus'
-      artifactName: 'manaplus64'
-  - script: dir "$(Build.ArtifactStagingDirectory)\manaplus64"
-  - script: xcopy /s "$(Build.ArtifactStagingDirectory)\manaplus64\*" .
-  - script: tools\ci\scripts\addextrafiles.cmd
-  - script: dir
-  - script: |
-      set SDL_VIDEODRIVER=dummy
-      echo run
-      manaplustests.exe

build/bmake0

@@ -23,7 +23,7 @@ export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \
 -Wstack-protector -Wshadow -Wunused-macros -Wsynth \
 -Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \
 -Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \
--Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++11-compat -std=c++0x \
+-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++17-compat \
 -Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \
 -Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \
 -Wnarrowing -Wzero-as-null-pointer-constant \

build/bmake46

@@ -50,7 +50,7 @@ export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \
 -Wstack-protector -Wshadow -Wunused -Wunused-macros -Wsynth \
 -Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \
 -Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \
--Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++0x-compat \
+-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2 -Wc++17-compat \
 -Wno-attributes"
 
 autoreconf -i

build/makegprof

@@ -3,5 +3,5 @@
 mv ../run/gmon.out .
 gprof ../run/bin/manaplus >gprof.txt
 gprof --inline-file-names ../run/bin/manaplus >gprofi.txt
-cat gprof.txt | gprof2dot.py >gprof.dot
-cat gprof.dot | dot -Tpng -o gprof.png
+gprof2dot.py <gprof.txt >gprof.dot
+dot -Tpng -o gprof.png <gprof.dot

build/packevol

-#!/bin/bash
-
-cd ..
-
-dir=`pwd`
-
-cd packaging/windows
-./make-translations.sh
-makensis -DDLLDIR=$dir/../libs/dll/ \
-    -DPRODUCT_VERSION="1.0" \
-    -DEXESUFFIX=/src \
-    -DUPX=true \
-    -DBITS=${BITS} \
-    -DSEHDLL=${SEHDLL} \
-    evol.nsi
-

data/Makefile.am

 
-SUBDIRS = evol fonts graphics help icons music perserver sfx test themes tmw translations
+SUBDIRS = fonts graphics help icons music perserver sfx test themes tmw translations
 
 EXTRA_DIST = CMakeLists.txt items.xsd
 

data/evol/Makefile.am

-
-desktopdir = $(datarootdir)/applications
-
-branding:
-	     mkdir -p "$(DESTDIR)$(pkgdatadir)/data/evol/icons"
-	     mkdir -p "$(DESTDIR)$(datarootdir)/icons"
-	     mkdir -p "$(DESTDIR)$(desktopdir)"
-	     cp evol.desktop "$(DESTDIR)$(desktopdir)"
-	     cp evol.manaplus "$(DESTDIR)$(pkgdatadir)/data/evol"
-	     cp icons/evol-client.png "$(DESTDIR)$(pkgdatadir)/data/evol/icons"
-	     cp icons/evol-client.png "$(DESTDIR)$(datarootdir)/icons"
-	     cp -r images "$(DESTDIR)$(pkgdatadir)/data/evol"
-
-EXTRA_DIST = evol.desktop.in \
-	    evol.in \
-	    evol.manaplus \
-	    icons/evol-client.ico \
-	    icons/evol-client.png \
-	    icons/evol-client.xpm \
-	    images/loginwallpaper_800x600.png