Merge branch 'master' of https://github.com/HerculesWS/Hercules into …

…missing-events
HerculesWS · Aug 24, 2019 · 0c34dad · 0c34dad
2 parents b1fcaf1 + 0edf236
commit 0c34dad
Show file tree

Hide file tree

Showing 458 changed files with 334,592 additions and 31,863 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -81,9 +81,9 @@ pre_re:clang-4.0:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: secondary
-  image: debian:unstable
+  image: debian:stretch
   services:
-    - mariadb:10
+    - mariadb:10.1
   variables:
     <<: *base_vars
     INSTALL_PACKAGES: clang-4.0 mariadb-client libmariadbclient-dev-compat
@@ -96,9 +96,9 @@ re:clang-4.0:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: secondary
-  image: debian:unstable
+  image: debian:stretch
   services:
-    - mariadb:10
+    - mariadb:10.1
   variables:
     <<: *base_vars
     INSTALL_PACKAGES: clang-4.0 mariadb-client libmariadbclient-dev-compat
@@ -111,9 +111,9 @@ zero-2018:clang-4.0:
   <<: *branch_exceptions
   <<: *prerequisites
   stage: clients
-  image: debian:unstable
+  image: debian:stretch
   services:
-    - mariadb:10
+    - mariadb:10.1
   variables:
     <<: *base_vars
     INSTALL_PACKAGES: clang-4.0 mariadb-client libmariadbclient-dev-compat
@@ -281,96 +281,6 @@ zero-2018:clang-7:
     - ./tools/ci/travis.sh build CC=clang-7 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
     - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-pre_re:gcc-4.6:
-  <<: *branch_exceptions
-  <<: *prerequisites
-  stage: secondary
-  image: debian:wheezy
-  services:
-    - mysql:5.5
-  variables:
-    <<: *base_vars
-    INSTALL_PACKAGES: gcc-4.6 mysql-client libmysqlclient-dev
-    SQLHOST: mysql
-  script:
-    - ./tools/ci/travis.sh build CC=gcc-4.6 --enable-debug --enable-Werror --enable-buildbot --disable-renewal
-    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
-
-re:gcc-4.6:
-  <<: *branch_exceptions
-  <<: *prerequisites
-  stage: secondary
-  image: debian:wheezy
-  services:
-    - mysql:5.5
-  variables:
-    <<: *base_vars
-    INSTALL_PACKAGES: gcc-4.6 mysql-client libmysqlclient-dev
-    SQLHOST: mysql
-  script:
-    - ./tools/ci/travis.sh build CC=gcc-4.6 --enable-debug --enable-Werror --enable-buildbot
-    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
-
-zero-2018:gcc-4.6:
-  <<: *branch_exceptions
-  <<: *prerequisites
-  stage: clients
-  image: debian:wheezy
-  services:
-    - mysql:5.5
-  variables:
-    <<: *base_vars
-    INSTALL_PACKAGES: gcc-4.6 mysql-client libmysqlclient-dev
-    SQLHOST: mysql
-  script:
-    - ./tools/ci/travis.sh build CC=gcc-4.6 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
-    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
-
-pre_re:gcc-4.7:
-  <<: *branch_exceptions
-  <<: *prerequisites
-  stage: secondary
-  image: debian:wheezy
-  services:
-    - mysql:5.5
-  variables:
-    <<: *base_vars
-    INSTALL_PACKAGES: gcc-4.7 mysql-client libmysqlclient-dev
-    SQLHOST: mysql
-  script:
-    - ./tools/ci/travis.sh build CC=gcc-4.7 --enable-debug --enable-Werror --enable-buildbot --disable-renewal
-    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
-
-re:gcc-4.7:
-  <<: *branch_exceptions
-  <<: *prerequisites
-  stage: secondary
-  image: debian:wheezy
-  services:
-    - mysql:5.5
-  variables:
-    <<: *base_vars
-    INSTALL_PACKAGES: gcc-4.7 mysql-client libmysqlclient-dev
-    SQLHOST: mysql
-  script:
-    - ./tools/ci/travis.sh build CC=gcc-4.7 --enable-debug --enable-Werror --enable-buildbot
-    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
-
-zero-2018:gcc-4.7:
-  <<: *branch_exceptions
-  <<: *prerequisites
-  stage: clients
-  image: debian:wheezy
-  services:
-    - mysql:5.5
-  variables:
-    <<: *base_vars
-    INSTALL_PACKAGES: gcc-4.7 mysql-client libmysqlclient-dev
-    SQLHOST: mysql
-  script:
-    - ./tools/ci/travis.sh build CC=gcc-4.7 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
-    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
-
 pre_re:gcc-4.8:
   <<: *branch_exceptions
   <<: *prerequisites
@@ -461,51 +371,6 @@ zero-2018:gcc-4.9:
     - ./tools/ci/travis.sh build CC=gcc-4.9 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
     - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
 
-pre_re:gcc-5:
-  <<: *branch_exceptions
-  <<: *prerequisites
-  stage: secondary
-  image: debian:unstable
-  services:
-    - mariadb:10
-  variables:
-    <<: *base_vars
-    INSTALL_PACKAGES: gcc-5 mariadb-client libmariadbclient-dev-compat
-    SQLHOST: mariadb
-  script:
-    - ./tools/ci/travis.sh build CC=gcc-5 --enable-debug --enable-Werror --enable-buildbot --disable-renewal
-    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
-
-re:gcc-5:
-  <<: *branch_exceptions
-  <<: *prerequisites
-  stage: secondary
-  image: debian:unstable
-  services:
-    - mariadb:10
-  variables:
-    <<: *base_vars
-    INSTALL_PACKAGES: gcc-5 mariadb-client libmariadbclient-dev-compat
-    SQLHOST: mariadb
-  script:
-    - ./tools/ci/travis.sh build CC=gcc-5 --enable-debug --enable-Werror --enable-buildbot
-    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
-
-zero-2018:gcc-5:
-  <<: *branch_exceptions
-  <<: *prerequisites
-  stage: clients
-  image: debian:unstable
-  services:
-    - mariadb:10
-  variables:
-    <<: *base_vars
-    INSTALL_PACKAGES: gcc-5 mariadb-client libmariadbclient-dev-compat
-    SQLHOST: mariadb
-  script:
-    - ./tools/ci/travis.sh build CC=gcc-5 --enable-debug --enable-Werror --enable-buildbot --enable-packetver-zero --enable-packetver=20180511
-    - ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST
-
 pre_re:gcc-6:
   <<: *branch_exceptions
   <<: *prerequisites

diff --git a/.mailmap b/.mailmap
@@ -7,3 +7,98 @@
 <joseph.tk.ea@gmail.com> <j-tkay@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 <ind@henn.et> <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>
 <Kenpachi.Developer@gmx.de> <kenpachi2k11@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<umage@netvor.sk> <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<ai4rei@users.noreply.github.com> <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<Kenji.Ito@gmx.de> <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<masao@gmx.ch> <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<piotr.halaczkiewicz@gmail.com> <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<piotr.halaczkiewicz@gmail.com> <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<missxantara@gmail.com> <xantara@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<lightaisme@gmail.com> <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<brianluau@users.noreply.github.com> <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<harrison@isabarwon.com> <calciumkid@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<fw@f-ws.de> <blacksirius@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<fw@f-ws.de> <sirius@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<jmish1987@gmail.com> <jmanfffreak@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<paradox924x@gmail.com> <Paradox924x@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<paradox924x@gmail.com> <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<yomanda@gmail.com> <Yommy@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<masterofmuppets89@gmail.com> <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<flaviojs2005@gmail.com> <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<flaviojs2005@gmail.com> <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<flaviojs2005@gmail.com> <flaviojs2005@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<macabu.matheus@gmail.com> <momacabu@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<Daegaladh@users.noreply.github.com> <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<greenboxal@gmail.com> <greenboxal2@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+<malufett.eat.my.binaries@gmail.com> <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>
+
+# old aliases
+
+<haru@dotalux.com> <haru@originsro.org>
+<ind@henn.et> <int@henn.et>
+<ind@henn.et> <notind@gmail.com>
+<ind@henn.et> <shennetsind@users.noreply.github.com>
+<dastgirp@gmail.com> <dastgir@users.noreply.github.com>
+<dastgirp@gmail.com> <dastgirpojee@rocketmail.com>
+<michieru-kun@hotmail.com> <Michieru@users.noreply.github.com>
+<michieru-kun@hotmail.com> <michieru@0-mail.com>
+<jedzkie13@rocketmail.com> <Jedzkie@users.noreply.github.com>
+<jedzkie13@rocketmail.com> <eikzdej@gmail.com>
+<jedzkie13@rocketmail.com> <jedzkie999@gmail.com>
+<Equinox1991@gmail.com> <Emistry@users.noreply.github.com>
+<gauvain.dauchy@free.fr> <alige@users.noreply.github.com>
+<guilherme.menaldo@outlook.com> <guilherme-gm@users.noreply.github.com>
+<dev@herc.ws> <Hercules@efficiently.awesome>
+<streusel@gravity.co.kr> <advance_me@hotmail.de>
+<streusel@gravity.co.kr> <m.me1@live.de>
+<ibrahem.h.basyone@gmail.com> <hemagx2@gmail.com>
+<Asheraf@users.noreply.github.com> <acheraf1998@gmail.com>
+<sagunkho@hotmail.com> <sagunxp@gmail.com>
+<git@gumi.ca> <mekolat@users.noreply.github.com>
+
+
+
+
+
+# missing from github:
+# - skotlex
+# - L0ne_W0lf
+# - Lupus
+# - celest
+# - Lance
+# - zephyrus
+# - amber
+# - Inkfish
+# - toms
+# - shadowlady
+# - codemaster
+# - Vicious
+# - samuray22
+# - Kevin
+# - eathenabot
+# - shadow
+# - mc_cameri
+# - evera
+# - SinSloth
+# - epoque11
+# - DracoRPG
+# - sketchyphoenix
+# - littlewolf
+# - eaac
+# - ajarn
+# - wizputer
+# - Nasedo
+# - valaris
+# - blackhole89
+# - protimus
+# - Komurka
+# - Poki#3
+# - cookiecrumbs
+# - Zido
+# - akrus
+# - markzd
+# - xazax-hun
+# - lordttseven
+# - musahiden
+# - Aria
+# - og2