From 235e3ff538e208eac63acf54f6e1cb2e23591350 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Thu, 8 Jul 2021 01:06:12 -0300 Subject: Manual tweaks for the git history merge. --- .gitmodules | 6 --- .mailmap | 80 ++++++++++++++++++++++++++++++---------- .travis.yml | 32 ---------------- conf/.gitignore | 1 - conf/monitor_athena.conf | 82 ----------------------------------------- conf/monitor_local.conf.example | 1 - conf/tmwa-monitor.conf | 6 --- 7 files changed, 61 insertions(+), 147 deletions(-) delete mode 100644 .gitmodules delete mode 100644 .travis.yml delete mode 100644 conf/.gitignore delete mode 100644 conf/monitor_athena.conf delete mode 100644 conf/monitor_local.conf.example delete mode 100644 conf/tmwa-monitor.conf diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 4e0e37ab..00000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "client-data"] - path = client-data - url = git://github.com/themanaworld/tmwa-client-data.git -[submodule "tools"] - path = tools - url = git://github.com/themanaworld/tmw-tools.git diff --git a/.mailmap b/.mailmap index 9d753f39..b182d06f 100644 --- a/.mailmap +++ b/.mailmap @@ -1,32 +1,74 @@ -Jesusaves Jesusaves -Jesusaves Jonatas L. Nogueira +Akko Teru Teru <9bi at [comc]ast dot net> Alige Alige Alige Alige -Reid Reid Yaro -Reid Reid -Reid Reid Yaro -Reid Reid -gumi gumi +Alige ali-g Ali-G +Alige Ali-G +Alige alige Ali-G +Ben Longbons o11c +Bjørn Lindeijer Thorbjørn Lindeijer +Bjørn Lindeijer Thorbjørn Lindeijer +Cassy1 Cassy +Chuck Miller Charles Miller +Coffee coffee +Coffee Coffee +Coffee cafe +Darky Dark_Mage +Darky Darky +Darky Darky +Darky Developer +David Gay David Gay +Dennis Friis Dennis Friis +Dennis Friis peavey +Enchilado crunchy +Enchilado Enchilado +Enchilado Enchilado +Enchilado enchilado +Fate Fate +Fate Fate +Freeyorp Freeyorp +Freeyorp Freeyorp +Freeyorp Freeyorp + + +gumi meko +gumi mekolat Hal9000 Hal9OOO Hal9000 Hal9OOO (Francesco Miglietta) Hal9000 epoc Hal9000 +jak1 jak1 +jak1 Mike +Jarrett Thomas-Huxley fother +Jessica Tölke jtoelke +Jesusaves Jesusaves +Jesusaves Jonatas L. Nogueira +Joseph Greene Pihro +Kurt Kuschinski Hocus +Kurt Kuschinski Kurt Kuschinski +Ledmitz Ledmitz +meways Meway +meways meways Micksha Micksha -omatt omattornot -omatt omatt -gumi mekolat -wushin Wushin +Mikko Mikko Monwarez Thibault Payet Monwarez User Monwarez +Monwarez monwarez +omatt omattornot +omatt omatt +Reid Reid Yaro +Reid Reid +Reid Reid Yaro +Reid Reid +remoitnane No Name +remoitnane remoitnane +Saweres root +Stefan Dombrowski Stefan Dombrowski +The Kandiman The Kandiman +The Kandiman TheKandiman Vasily_Makarov Dan Sagunov Vasily_Makarov Dan Sagunov Vasily_Makarov dan Vasily_Makarov Vasily -Akko Teru Teru <9bi at [comc]ast dot net> -jak1 jak1 -Kurt Kuschinski Hocus -Kurt Kuschinski Kurt Kuschinski -Saweres root -Mikko Mikko -Ledmitz Ledmitz - +WildX WildX001 +Wombat brokendoor +wushin Wushin diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a2cea500..00000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -sudo: false -dist: trusty -language: c -compiler: clang - -addons: - apt: - packages: - - zlibc - -env: - - UPDATE_DIR=../../../public UPDATE_HTTP=none - -script: - - mkdir public - - make updates - - make news - - cp -v world/map/news.txt public/ - - cp -v world/map/news.html public/ - - cp -v world/map/news.rss public/ - - cp -v world/map/news.json public/ - - echo 'static update serverTMW.zip
TMW-music.zip
news.txt
resources.xml' > public/index.html - -deploy: - provider: pages - skip-cleanup: true - github-token: $GITHUB_TOKEN # Set in travis-ci.org dashboard, marked secure - keep-history: false - local-dir: public - target-branch: gh-pages - on: - branch: stable diff --git a/conf/.gitignore b/conf/.gitignore deleted file mode 100644 index 2c43e911..00000000 --- a/conf/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*_local.conf diff --git a/conf/monitor_athena.conf b/conf/monitor_athena.conf deleted file mode 100644 index 68fe65f6..00000000 --- a/conf/monitor_athena.conf +++ /dev/null @@ -1,82 +0,0 @@ -// Athena Monitor configuration file. - -////////////////////////////////////////////////////////////////////// -// Some notes about the existence of this file: -// -// tmwa-monitor is unused in its current form, but plans are -// to resurrect it in *some* form. See below for what we do use. -// However, an alternative possibility would be to just install config -// files to integrate with some existing daemon-monitoring tool. -// -// THAT SAID, blindly restarting a server that exited in an unknown -// way is a really great way to get unrecoverable savefile corruption. -// For this reason, we only auto-restart the map server, which only -// persists some unimportant global variables such as high scores. -// Besides, the other servers are stable enough that they rarely crash. -// -// This monitor names three "server"s, but they are just arbitrary. -// This is not enough for the case of multiple worlds, -// and is too much for the case of worlds running as different users. -// -// Currently the server variables are pointing to local shell scripts -// (which are themselves deprecated and print a flashing message), -// which is necessary because the actual servers need to be run inside -// the appropriate dir to read conf and read/write savefiles from/to -// the correct location. This will get better once savefiles get put -// in $localstatedir (i.e. /var), but it's not yet known how that -// should interact with multiple worlds running at the same time. -// -// Likely, however, this will depend on the ability to pass a config -// file as an argument to the servers. -// -// The workdir setting would make a lot more sense if this file was -// installed in $sysconfdir (i.e. /etc) by tmwa's `make install`, -// which is still planned but hasn't happened yet, but makes *less* -// sense if the servers install their config there. -// -// And regardless, we need to allow per-server workdirs, including -// multiple instances, and possible pre/post scripts and exit/signal -// status handlers. But all that seems complicated, leading back to -// "shouldn't we just use an existing daemon manager?". -// -// Alternatively, we could act like an XDG application, which is -// admittedly somewhat odd if you're a daemon, but would at least -// clarify what happens if you run the servers as a user (which we -// do always. When an init script is written, it should run as -// somebody other than root!). -// -////////////////////////////////////////////////////////////////////// -// -// What we actually use instead of tmwa-monitor: -// -// On the main server, we run a tmux session, with one window -// for each server and for each bot. The servers are run directly -// from inside the appropriate directory. -// -// The test server is like the main server without bots, but instead -// of running `tmwa-map` directly, we use the tmwa-map-wrapper script -// from tools/, which restarts the server whenever it exits and merges -// tagged patches from github, except that it does no merges if the -// server exited too quickly after the restart. -// -// On local dev machines, we usually use the `./run-all` script from -// this repo. -// -////////////////////////////////////////////////////////////////////// - - -// Binary to use with message "forked login server". -login_server: ./login-server - -// Binary to use with message "forked char server". -char_server: ./char-server - -// Binary to use with message "forked map server". -map_server: ./map-server - -// Directory in which to run the servers. -// If never set, dynamically computed as $HOME/tmwserver -//workdir: /path/to/tmwa-server-data - -// local settings for this nonserver in this file -import: conf/monitor_local.conf diff --git a/conf/monitor_local.conf.example b/conf/monitor_local.conf.example deleted file mode 100644 index 32d168db..00000000 --- a/conf/monitor_local.conf.example +++ /dev/null @@ -1 +0,0 @@ -// Athena Monitor local configuration file. diff --git a/conf/tmwa-monitor.conf b/conf/tmwa-monitor.conf deleted file mode 100644 index db630d47..00000000 --- a/conf/tmwa-monitor.conf +++ /dev/null @@ -1,6 +0,0 @@ -// Master config file for The Mana World Athena (monitor component) -// This file is used since version 14.x.y, but major changes in 15.x.y - -// tmwa-monitor is deprecated, see comments in the below file - -monitor_conf: conf/monitor_athena.conf -- cgit v1.2.3-60-g2f50