summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--CMakeLists.txt6
-rw-r--r--INSTALL20
-rw-r--r--PKGBUILD.in6
-rw-r--r--README18
-rw-r--r--README.md18
-rw-r--r--README.txt14
-rw-r--r--data/help/about.txt13
-rw-r--r--data/help/footer.txt2
-rw-r--r--data/help/header.txt2
-rw-r--r--data/help/idx/about.idx6
-rw-r--r--data/help/idx/team.idx2
-rw-r--r--data/help/index.txt2
-rw-r--r--data/help/support.txt13
-rw-r--r--data/help/tips/16.txt2
-rw-r--r--docs/FAQ.txt4
-rw-r--r--docs/HACKING.txt2
-rw-r--r--docs/packages.txt2
-rw-r--r--docs/sounddev.txt2
-rw-r--r--packaging/debian/control28
-rw-r--r--packaging/debian/copyright3
-rw-r--r--src/commandline.cpp5
-rw-r--r--src/commandline.h3
-rw-r--r--src/defaults.cpp10
-rw-r--r--src/graphicsmanager.cpp5
-rw-r--r--src/gui/widgets/desktop.cpp5
-rw-r--r--src/gui/windows/chatwindow.cpp6
-rw-r--r--src/gui/windows/updaterwindow.cpp9
-rw-r--r--src/mumblemanager.cpp7
-rw-r--r--src/net/ea/loginrecv.cpp5
-rw-r--r--src/net/eathena/loginrecv.cpp5
-rwxr-xr-xtools/update-copyright.sh12
32 files changed, 121 insertions, 117 deletions
diff --git a/.gitignore b/.gitignore
index f14ecdc02..475678e7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@ po/POTFILES
.deps
stamp-h1
/manaplus.spec
+/manaverse.spec
PKGBUILD
data/tmw/tmw.desktop
data/tmw/tmw
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2231aaaab..c5dd2987d 100644
--- a/CMakeLists.txt
+++ b/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)
diff --git a/INSTALL b/INSTALL
index e7fbfe244..486572881 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,19 +1,19 @@
-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-dev
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,7 +42,7 @@ 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
diff --git a/PKGBUILD.in b/PKGBUILD.in
index 2de85a80d..ae165e03e 100644
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -1,11 +1,11 @@
# 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')
diff --git a/README b/README
index f082eb629..712cbc30c 100644
--- a/README
+++ b/README
@@ -1,13 +1,13 @@
-THE MANA PLUS CLIENT
+THE MANA VERSE CLIENT
===============
- Version: 1.9.3.23 Date: 2019-03-23
+ Version: 1.0 Date: 2019-03-23
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
@@ -160,7 +160,7 @@ 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.
-If you have feedback about a specific game that uses the ManaPlus client, be sure
+If you have feedback about a specific game that uses the ManaVerse client, be sure
to contact the developers of the game instead.
5. Licenses
@@ -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/
diff --git a/README.md b/README.md
index ac6c0b3a6..a8bf2f628 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
-# 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)
+ - ManaVerse 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: [![gitlab windows build](https://git.themanaworld.org/mana/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://git.themanaworld.org/mana/appimg-builder/badges/master/pipeline.svg?key_text=AppImg+Build&key_width=150px)](https://git.themanaworld.org/mana/appimg-builder/commits/master),
+ [![gitlab .deb build](https://git.themanaworld.org/mana/appimg-builder/badges/master/pipeline.svg?key_text=.deb+Build&key_width=150px)](https://git.themanaworld.org/mana/appimg-builder/commits/master)
<!--
Cicle CI: [![CircleCI](https://circleci.com/gh/ManaPlus/ManaPlus/tree/master.svg?style=svg)](https://circleci.com/gh/ManaPlus/ManaPlus/tree/master)
@@ -175,7 +175,7 @@ You can report on [![forum](https://img.shields.io/badge/forum-forums.themanawor
[![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)
-If you have feedback about a specific game that uses the ManaPlus client, be sure
+If you have feedback about a specific game that uses the ManaVerse client, be sure
to contact the developers of the game instead.
## 5. Licenses
@@ -183,6 +183,6 @@ to contact the developers of the game instead.
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).
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.
+they not have any rights to do so. This hostings have rights to remove ManaVerse repositories if they want violate given licenses.
-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/)
diff --git a/README.txt b/README.txt
index de89bfad1..37efd32bd 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-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/
diff --git a/data/help/about.txt b/data/help/about.txt
index e0202466b..5dea3a601 100644
--- a/data/help/about.txt
+++ b/data/help/about.txt
@@ -1,16 +1,19 @@
<- @@index|<<Back to Index>>@@
-##3 === <<ABOUT MANAPLUS>> ===
- <<##2ManaPlus##9 is extended client based on old code from ##2Mana##9 client.
+##3 === <<ABOUT MANAVERSE>> ===
+ <<##2ManaVerse##9 is extended client based on old code from ##2Mana##9 client.
Added many features, improved perfomance, stability, security and more.>>
- <<##2ManaPlus##9 is a serious effort to create an innovative free and open
- source MMORPG Client. ManaPlus uses 2D graphics and aims to create a large
+ <<##2ManaVerse##9 is a serious effort to create an innovative free and open
+ source MMORPG Client. ManaVerse uses 2.5D graphics and aims to create a large
and diverse interactive world. It is licensed under the GPL, making
sure this game can't ever run away from you.>>
-##9 Copyright (C) 2012-2017 The ManaPlus Developers
+##9 Copyright (C) 2020-2023 The ManaVerse Developers
+ -> @@team|<<ManaVerse Developers>>, https://themanaworlg.org@@
+
+##9 Copyright (C) 2012-2020 The ManaPlus Developers
-> @@team|<<Manaplus Developers>>, http://manaplus.org@@
##9 Copyright (C) 2004-2017 The Mana World Development Team
diff --git a/data/help/footer.txt b/data/help/footer.txt
index be8738115..d4bcde2a1 100644
--- a/data/help/footer.txt
+++ b/data/help/footer.txt
@@ -1,3 +1,3 @@
-##2 <<Website: @@http://manaplus.org/|http://manaplus.org/@@>>
+##2 <<Website: @@https://manaverse.germantmw.de/|https://manaverse.germantmw.de/@@>>
diff --git a/data/help/header.txt b/data/help/header.txt
index 2657b9e4e..36f627024 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -1,3 +1,3 @@
- <<##2ManaPlus version: ##6%VER%>>
+ <<##2ManaVerse version: ##6%VER%>>
diff --git a/data/help/idx/about.idx b/data/help/idx/about.idx
index 40ce8cb34..b7ce572c8 100644
--- a/data/help/idx/about.idx
+++ b/data/help/idx/about.idx
@@ -1,4 +1,4 @@
about|about
-about|about manaplus
-about|manaplus about
-about|manaplus
+about|about manaverse
+about|manaverse about
+about|manaverse
diff --git a/data/help/idx/team.idx b/data/help/idx/team.idx
index 598e3be8e..bc12ebac9 100644
--- a/data/help/idx/team.idx
+++ b/data/help/idx/team.idx
@@ -1,2 +1,2 @@
team|team
-team|manaplus
+team|manaverse
diff --git a/data/help/index.txt b/data/help/index.txt
index bb02caa96..119281ba8 100644
--- a/data/help/index.txt
+++ b/data/help/index.txt
@@ -2,7 +2,7 @@
##1-> @@about|<<About>>@@
-> @@download|<<Download>>@@
- -> @@team|<<Manaplus Developers>>@@
+ -> @@team|<<ManaVerse Developers>>@@
-> @@commands|<<Commands>>@@
-> @@chatcommands|<<Chat commands>>@@
diff --git a/data/help/support.txt b/data/help/support.txt
index b64b1fcd1..07046993e 100644
--- a/data/help/support.txt
+++ b/data/help/support.txt
@@ -10,22 +10,11 @@
<<Current server support url:>>
@@%SUPPORTURL%|%SUPPORTURL%@@
- <<For Evol Online support:>>
-
- <<Visit IRC channel:>>
-##2 #evolonline ##9@##2 irc.freenode.net
-
- <<For ManaPlus Online support:>>
-
- <<Visit IRC channel:>>
-##2 #manaplus #evolonline ##9@##2 irc.freenode.net
-
-
<<For TMW support:>>
##2 @@http://forums.themanaworld.org/viewforum.php?f=3|http://forums.themanaworld.org@@
<<or come visit us on our IRC channel:>>
-##2 #themanaworld ##9@##2 irc.freenode.net
+##2 #themanaworld ##9@##2 irc.libera.chat:6697 (TLS)
<<Otherwise see the @@team|Development Team@@ section to have a list of
developers and how to contact them.>>
diff --git a/data/help/tips/16.txt b/data/help/tips/16.txt
index 0e8c9f681..343396309 100644
--- a/data/help/tips/16.txt
+++ b/data/help/tips/16.txt
@@ -1,3 +1,3 @@
<<Look this page for help and downloads:>>
-@@http://manaplus.org/|http://manaplus.org/@@
+@@https://manaverse.germantmw.de/|https://manaverse.germantmw.de/@@
diff --git a/docs/FAQ.txt b/docs/FAQ.txt
index 1ef57369a..76e968a67 100644
--- a/docs/FAQ.txt
+++ b/docs/FAQ.txt
@@ -8,7 +8,7 @@ Q: How to get help?
A: The fastest way is to come on our IRC channel. There you can find a lot of
nice people that will help you until you solve your problem.
- Server: irc.freenode.net Channel: #manaplus.
+ Server: irc.libera.chat:6697 (TLS) Channel: #themanaworld
DEVELOPMENT
@@ -19,4 +19,4 @@ A: There are a lot of ways:
- If you're a programmer, an artist or just willing to help in any way, you
can become part of the development team. Join our irc channel:
- #manaplus @ irc.freenode.net.
+ Server: irc.libera.chat:6697 (TLS) Channel: #themanaworld-dev
diff --git a/docs/HACKING.txt b/docs/HACKING.txt
index a4f1d185b..0ed0eb162 100644
--- a/docs/HACKING.txt
+++ b/docs/HACKING.txt
@@ -1,5 +1,5 @@
----------------------------
-ManaPlus Hacking Guide
+ManaVerse Hacking Guide
----------------------------
With multiple coders working on the same source files, there needs to be a
diff --git a/docs/packages.txt b/docs/packages.txt
index 779b9eb6b..2f73fa392 100644
--- a/docs/packages.txt
+++ b/docs/packages.txt
@@ -1,5 +1,5 @@
-----------------------------
-MANAPLUS PACKAGE SYSTEM
+MANAVERSE PACKAGE SYSTEM
-----------------------------
1. INTRODUCTION
diff --git a/docs/sounddev.txt b/docs/sounddev.txt
index 08a5ea80f..ee481e756 100644
--- a/docs/sounddev.txt
+++ b/docs/sounddev.txt
@@ -1,5 +1,5 @@
--------------------------------
-THE MANAPLUS SOUND DEVELOPMENT
+THE MANAVERSE SOUND DEVELOPMENT
--------------------------------
1. INTRODUCTION
diff --git a/packaging/debian/control b/packaging/debian/control
index 406256830..8cfc37f86 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -1,8 +1,8 @@
Source: manaplus
Section: games
Priority: optional
-Homepage: http://manaplus.org/
-Maintainer: Andrei Karas <akaras@inbox.ru>
+Homepage: https://manaverse.germantmw.de/
+Maintainer: Mike Wollmann <jak1@themanaworld.org>
Uploaders: Patrick Matthäi <pmatthaei@debian.org>
Standards-Version: 3.9.7
Build-Depends: debhelper (>= 9),
@@ -30,11 +30,9 @@ Depends: ${shlibs:Depends},
x11-utils,
xdg-utils
Suggests: mumble
-Description: Extended client for Evol Online and The Mana World
- ManaPlus is an extended client for Evol Online, The Mana World, and similar
- servers based on a fork of eAthena. Evol Online is a 2D fantasy-style game
- which aims to create a friendly environment for interacting with others where
- people can escape reality and enjoy themselves. The Mana World (TMW) is a
+Description: Extended client for The Mana World
+ ManaVerse is an extended client for The Mana World, and similar
+ servers based on a fork of eAthena. The Mana World (TMW) is a
serious effort to create an innovative free and open source MMORPG.
TMW uses 2D graphics and aims to create a large and diverse interactive world.
@@ -44,11 +42,9 @@ Architecture: any
Priority: extra
Depends: ${misc:Depends},
manaplus (= ${binary:Version})
-Description: Extended client for Evol Online and The Mana World (debugging symbols)
- ManaPlus is an extended client for Evol Online, The Mana World, and similar
- servers based on a fork of eAthena. Evol Online is a 2D fantasy-style game
- which aims to create a friendly environment for interacting with others where
- people can escape reality and enjoy themselves. The Mana World (TMW) is a
+Description: Extended client for The Mana World
+ ManaVerse is an extended client for The Mana World, and similar
+ servers based on a fork of eAthena. The Mana World (TMW) is a
serious effort to create an innovative free and open source MMORPG.
TMW uses 2D graphics and aims to create a large and diverse interactive world.
.
@@ -62,11 +58,9 @@ Depends: ${misc:Depends},
Recommends: manaplus,
fonts-mplus,
fonts-wqy-microhei
-Description: Extended client for Evol Online and The Mana World (data files)
- ManaPlus is an extended client for Evol Online, The Mana World, and similar
- servers based on a fork of eAthena. Evol Online is a 2D fantasy-style game
- which aims to create a friendly environment for interacting with others where
- people can escape reality and enjoy themselves. The Mana World (TMW) is a
+Description: Extended client for The Mana World
+ ManaVerse is an extended client for The Mana World, and similar
+ servers based on a fork of eAthena. The Mana World (TMW) is a
serious effort to create an innovative free and open source MMORPG.
TMW uses 2D graphics and aims to create a large and diverse interactive world.
.
diff --git a/packaging/debian/copyright b/packaging/debian/copyright
index 846ea7e19..9ba604638 100644
--- a/packaging/debian/copyright
+++ b/packaging/debian/copyright
@@ -5,7 +5,8 @@ Source: http://download.evolonline.org/manaplus/download/
Files: *
Copyright: 2004-2009 The Mana World Development Team
2009-2010 The Mana Developers
- 2011-2014 The ManaPlus Developers
+ 2011-2020 The ManaPlus Developers
+ 2020-2023 The ManaVerse Developers
License: GPL-2
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/src/commandline.cpp b/src/commandline.cpp
index 507cc91f6..982078635 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -2,7 +2,8 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2019 The ManaPlus Developers
+ * Copyright (C) 2011-2020 The ManaPlus Developers
+ * Copyright (C) 2020-2023 The ManaVerse Developers
*
* This file is part of The ManaPlus Client.
*
@@ -133,7 +134,7 @@ static void printHelp()
static void printVersion()
{
std::cout <<
- strprintf("ManaPlus client %s", FULL_VERSION) <<
+ strprintf("ManaVerse client %s", FULL_VERSION) <<
std::endl;
}
diff --git a/src/commandline.h b/src/commandline.h
index af8e6b9fd..1f7c1e63a 100644
--- a/src/commandline.h
+++ b/src/commandline.h
@@ -2,7 +2,8 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2019 The ManaPlus Developers
+ * Copyright (C) 2011-2020 The ManaPlus Developers
+ * Copyright (C) 2020-2023 The ManaVerse Developers
*
* This file is part of The ManaPlus Client.
*
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 000cf1ae4..0cdcf898f 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -1,7 +1,8 @@
/*
* The ManaPlus Client
* Copyright (C) 2010 The Mana Developers
- * Copyright (C) 2011-2019 The ManaPlus Developers
+ * Copyright (C) 2011-2020 The ManaPlus Developers
+ * Copyright (C) 2020-2023 The ManaVerse Developers
*
* This file is part of The ManaPlus Client.
*
@@ -534,10 +535,9 @@ void setBrandingDefaults(Configuration &cfg)
AddDEF("androidDownloadUrl", "https://play.google.com/store/apps/details"
"?id=org.evolonline.beta.manaplus");
AddDEF("androidDownloadText", "Google Play");
- AddDEF("otherDownloadUrl", "https://manaplus.germantmw.de/");
- AddDEF("otherDownloadText", "https://manaplus.germantmw.de/");
- AddDEF("windowsDownloadUrl", "https://manaplus.germantmw.de/"
- "manaplus/package/windows32/");
+ AddDEF("otherDownloadUrl", "https://manaverse.germantmw.de/");
+ AddDEF("otherDownloadText", "https://manaverse.germantmw.de/");
+ AddDEF("windowsDownloadUrl", "https://updates.tmw2.org/mana/windows/");
AddDEF("windowsDownloadText", "download here");
AddDEF("updateMirror1", "https://manaplus.germantmw.de/manaplus/updates/");
AddDEF("updateMirror2", "");
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index 0209e1eb8..e43f701b3 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -1,6 +1,7 @@
/*
* The ManaPlus Client
- * Copyright (C) 2012-2019 The ManaPlus Developers
+ * Copyright (C) 2012-2020 The ManaPlus Developers
+ * Copyright (C) 2020-2023 The ManaVerse Developers
*
* This file is part of The ManaPlus Client.
*
@@ -622,7 +623,7 @@ SDL_Window *GraphicsManager::createWindow(const int w, const int h,
const int bpp A_UNUSED,
const int flags)
{
- return SDL_CreateWindow("ManaPlus", SDL_WINDOWPOS_UNDEFINED,
+ return SDL_CreateWindow("ManaVerse", SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED, w, h, flags);
}
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index e8a728327..6fe317353 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -1,7 +1,8 @@
/*
* The ManaPlus Client
* Copyright (C) 2009-2010 The Mana World Development Team
- * Copyright (C) 2011-2019 The ManaPlus Developers
+ * Copyright (C) 2011-2020 The ManaPlus Developers
+ * Copyright (C) 2020-2023 The ManaVerse Developers
*
* This file is part of The ManaPlus Client.
*
@@ -88,7 +89,7 @@ Desktop::Desktop(const Widget2 *const widget) :
false);
}
mVersionLabel->addRow("copyright",
- "(C) ManaPlus developers, http://manaplus.org");
+ "(C) ManaVerse developers, https://manaverse.germantmw.de");
mVersionLabel->setLinkHandler(this);
mVersionLabel->updateHeight();
}
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 0d52dad14..a3b777655 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -2,7 +2,8 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2019 The ManaPlus Developers
+ * Copyright (C) 2011-2020 The ManaPlus Developers
+ * Copyright (C) 2020-2023 The ManaVerse Developers
*
* This file is part of The ManaPlus Client.
*
@@ -1662,11 +1663,14 @@ bool ChatWindow::resortChatLog(std::string line,
{
replaceAll(tmpNick, "#", "_");
replaceAll(tmpNick, "%", "_");
+ // we dont care!
+/*
if (Net::getNetworkType() == ServerType::TMWATHENA)
{
// TRANSLATORS: error message
line = _("Broken nick detected: ") + line;
}
+*/
own = ChatMsgType::BY_SERVER;
}
const size_t idx = line.find(": \302\202");
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 283df5ecf..948ce5a17 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -2,7 +2,8 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2019 The ManaPlus Developers
+ * Copyright (C) 2011-2020 The ManaPlus Developers
+ * Copyright (C) 2020-2023 The ManaVerse Developers
*
* This file is part of The ManaPlus Client.
*
@@ -460,7 +461,7 @@ void UpdaterWindow::loadPatch()
if (line != nullptr)
{
mBrowserBox->addRow(strprintf("##9 Latest client version: "
- "##6ManaPlus %s##0", line), true);
+ "##6ManaVerse %s##0", line), true);
}
}
if (version > CHECK_VERSION)
@@ -482,11 +483,11 @@ void UpdaterWindow::loadPatch()
branding.getStringValue(url)).append("|").append(
branding.getStringValue(text)).append("@@]"), true);
mBrowserBox->addRow("##1You can download it from", true);
- mBrowserBox->addRow("##1ManaPlus updated.", true);
+ mBrowserBox->addRow("##1ManaVerse updated.", true);
}
else
{
- mBrowserBox->addRow("You have latest client version.", true);
+ mBrowserBox->addRow("You have the latest client version.", true);
}
}
diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp
index 4e22f6f9a..bc620e57f 100644
--- a/src/mumblemanager.cpp
+++ b/src/mumblemanager.cpp
@@ -4,7 +4,8 @@
* All code listed below is in the public domain and can be used, shared or
* modified freely
*
- * Copyright (C) 2011-2019 The ManaPlus Developers
+ * Copyright (C) 2011-2020 The ManaPlus Developers
+ * Copyright (C) 2020-2023 The ManaVerse Developers
*/
#ifdef USE_MUMBLE
@@ -146,8 +147,8 @@ void MumbleManager::init()
#endif // WIN32
- wcsncpy(mLinkedMemCache.name, L"ManaPlus", 256);
- wcsncpy(mLinkedMemCache.description, L"ManaPlus Plugin", 2048);
+ wcsncpy(mLinkedMemCache.name, L"ManaVerse", 256);
+ wcsncpy(mLinkedMemCache.description, L"ManaVerse Plugin", 2048);
mLinkedMemCache.uiVersion = 2;
// Left handed coordinate system.
diff --git a/src/net/ea/loginrecv.cpp b/src/net/ea/loginrecv.cpp
index d11fbcf9e..574f80faa 100644
--- a/src/net/ea/loginrecv.cpp
+++ b/src/net/ea/loginrecv.cpp
@@ -2,7 +2,8 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2019 The ManaPlus Developers
+ * Copyright (C) 2011-2020 The ManaPlus Developers
+ * Copyright (C) 2020-2023 The ManaVerse Developers
*
* This file is part of The ManaPlus Client.
*
@@ -96,7 +97,7 @@ void LoginRecv::processLoginError(Net::MessageIn &msg)
case 5:
// TRANSLATORS: error message
errorMessage = _("Client too old or wrong server type.\n"
- "Please update client on http://manaplus.org");
+ "Please update client on https://manaverse.germantmw.de");
break;
case 6:
// TRANSLATORS: error message
diff --git a/src/net/eathena/loginrecv.cpp b/src/net/eathena/loginrecv.cpp
index 0bad05fb3..41af09fa8 100644
--- a/src/net/eathena/loginrecv.cpp
+++ b/src/net/eathena/loginrecv.cpp
@@ -2,7 +2,8 @@
* The ManaPlus Client
* Copyright (C) 2004-2009 The Mana World Development Team
* Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2019 The ManaPlus Developers
+ * Copyright (C) 2011-2020 The ManaPlus Developers
+ * Copyright (C) 2020-2023 The ManaVerse Developers
*
* This file is part of The ManaPlus Client.
*
@@ -89,7 +90,7 @@ void LoginRecv::processLoginError2(Net::MessageIn &msg)
case 5:
// TRANSLATORS: error message
errorMessage = _("Client too old or wrong server type.\n"
- "Please update client on http://manaplus.org");
+ "Please update client on https://manaverse.germantmw.de");
break;
case 6:
// TRANSLATORS: error message
diff --git a/tools/update-copyright.sh b/tools/update-copyright.sh
index d681ebb7f..4df05c030 100755
--- a/tools/update-copyright.sh
+++ b/tools/update-copyright.sh
@@ -2,19 +2,23 @@
# Copyright (C) 2001-2010 Wormux Team.
# Copyright (C) 2010 The ManaWorld Development Team.
# Copyright (C) 2012-2016 The ManaPlus Developers.
+# Copyright (C) 2021-2023 The ManaVerse Developers.
cd ..
-new_year="$1"
-[[ -z $new_year ]] && echo "Missing parameter: year" && exit 1
+if [[ $1 != "" ]]; then
+ new_year="$1"
+else
+ new_year=$(date +'%Y')
+fi
-[[ ! -e src ]] && echo "This script should be ran from the top manaplus dir" && exit 2
+[[ ! -e src ]] && echo "This script should be ran from the top manaverse dirs ./tools/ path." && exit 2
tmp_file="w$RANDOM$RANDOM$RANDOM$RANDOM"
[[ -e $tmp_file ]] && tmp_file="w$RANDOM$RANDOM$RANDOM$RANDOM"
# update the dates, creating the interval if it doesn't exist yet
find -iname "*.cpp" -or -iname "*.h" -or -iname "*.hpp" -or -iname "*.inc" -or -iname "*.cc" |
- xargs sed -i "/Copyright.*The ManaPlus Developers/ s,\(20[0-9]*\) \|\(20[0-9]*\)-20[0-9]* ,\1\2-$new_year ,"
+ xargs sed -i "/Copyright.*The ManaVerse Developers/ s,\(20[0-9]*\) \|\(20[0-9]*\)-20[0-9]* ,\1\2-$new_year ,"
# do a semi-automated commit check
git diff > $tmp_file