Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
5456 commits 10 branches 0 tags 41 MiB
Commit graph

146 commits

Author SHA1 Message Date
Enno Rehling
0fb547f7c2 Beispiel Trolle -> Schlümpfe 
Test des Atom Editors
 2015-05-12 08:41:14 -07:00
Enno Rehling
94929be51f Merge pull request #187 from badgerman/develop 
Convert all XML files to UTF-8
 2015-05-11 23:29:28 -07:00
Enno Rehling
a0c6bbb9aa fix encoding conversion errors from previous commit 2015-05-11 23:20:32 -07:00
Enno Rehling
a4774be652 Convert all XML files to UTF-8, to allow editing with Atom. 2015-05-11 16:55:11 -07:00
Steffen Mecke
ca89213295 fixed mallorn curse message 2015-05-07 17:51:44 +02:00
Steffen Mecke
94ae774fed fix spelling of spell titles 2015-05-07 17:51:43 +02:00
Steffen Mecke
9407b4c9c0 fixed crash of analyze magic 
because of missing spell/curse description
 2015-05-07 17:51:43 +02:00
Steffen Mecke
2cc8c1f871 trying to solve spy message bug #1604 
Conflicts:
	src/kernel/CMakeLists.txt
 2015-05-04 14:30:59 +02:00
Steffen Mecke
a9a14a79d0 fixed messed up english strings for wounds 2015-04-30 15:47:29 +02:00
Steffen Mecke
81e96c121a typo 2015-04-27 15:14:42 +02:00
Enno Rehling
38fe2b1144 Hier hat ein commit aus dem github-Editor das Encoding zerstört, scheint mir. 2015-04-26 23:02:37 +02:00
Enno Rehling
fdb0a79c07 https://bugs.eressea.de/view.php?id=2085 
Tippfehler
 2015-04-20 19:05:26 +02:00
Enno Rehling
e31b671b84 https://bugs.eressea.de/view.php?id=2092 
Tippfehler
 2015-04-20 19:03:53 +02:00
Enno Rehling
3b6add91e6 https://bugs.eressea.de/view.php?id=2091 
Tippfehler
 2015-04-20 19:01:49 +02:00
Enno Rehling
2c40a9f593 https://bugs.eressea.de/view.php?id=2090 
Tippfehler
 2015-04-20 19:00:52 +02:00
Enno Rehling
71d0558403 Bug 2089: remove the giveitem restriction from all races. 
https://bugs.eressea.de/view.php?id=2089
 2015-04-19 09:49:52 +02:00
Enno Rehling
7e92e6501c remove the (broken) summon_alp spell, by request 
https://bugs.eressea.de/view.php?id=2086
 2015-04-04 11:02:56 +02:00
Enno Rehling
491f6f2cb3 re-enable silver weight 2015-03-07 13:56:31 +01:00
Enno Rehling
b7de307385 Merge branch 'message_fix' of https://github.com/stm2/server into stm2-message_fix 2015-02-20 20:05:44 +01:00
Steffen Mecke
b5f8be8a95 fix heroes must not recruit 2015-02-10 18:17:58 +01:00
Steffen Mecke
7fd32e425a fix spy and volcano messages 2015-02-09 09:15:43 +01:00
Enno Rehling
a2e071d35b Fix broken syntax in message about effects on units. 
Add some missing descriptions.
Bump version number.
 2015-02-08 13:09:04 +01:00
Enno Rehling
5c975655b1 remove french messages that are not french 2015-02-02 21:45:47 +01:00
Steffen Mecke
d288c74aaf fix stork message (mantis 2027), add tests 2015-02-02 21:32:29 +01:00
Enno Rehling
ba26897872 Merge branch 'master' of github.com:eressea/server 2015-02-01 12:25:35 +01:00
Enno Rehling
9a395127ac Merge branch 'nr_localization_fix' of https://github.com/stm2/server into stm2-nr_localization_fix 
Conflicts:
	src/report.c
 2015-02-01 12:24:19 +01:00
Enno Rehling
c75012b61d Merge pull request #119 from stm2/giant_message_typo_fix 
translated English messages and fixed a ton of typos
 2015-02-01 11:44:18 +01:00
Enno Rehling
03cddee6b7 Small plural/singular fix in German message. 2015-02-01 10:39:36 +01:00
Enno Rehling
df5ab02689 Merge branch 'peasantgrowth_acceleration' of https://github.com/stm2/server into stm2-peasantgrowth_acceleration 2015-01-30 22:11:10 +01:00
Steffen Mecke
4c391ae6f6 implemented Enno's suggestions for peasant growth 2015-01-29 23:55:02 +01:00
Enno Rehling
87735c6c8e Merge pull request #121 from badgerman/version-3-4 
Version 3.4 final preparations before launch
 2015-01-29 18:08:58 +01:00
Enno Rehling
c3ed521d4f Merge branch 'version-3-4' of https://github.com/badgerman/eressea into badgerman-version-3-4 
Conflicts:
	src/laws.c
 2015-01-29 18:03:21 +01:00
Enno Rehling
7527e6e903 disable silver weight for the initial rollout of version 3.4 
two weeks after launch, revert this commit
 2015-01-29 16:56:21 +01:00
Steffen Mecke
ec6560a281 adding a nice region message 2015-01-15 03:48:19 +01:00
Enno Rehling
6fb23af66a test that ships are encumbered by money. define money in XML, not just in code. 2015-01-14 17:56:12 +01:00
Steffen Mecke
039ee159cb a bunch of messages in the NR where not localized 2015-01-14 16:17:21 +01:00
Steffen Mecke
e727f9e9d4 translated English messages and fixed a ton of typos 2015-01-14 01:59:10 +01:00
Steffen Mecke
9142b79614 fixed message (bug #1506) 2015-01-14 01:58:26 +01:00
Enno Rehling
4f2d9260d1 add a message to the unit that gets kicked, with tests 2015-01-13 07:43:30 +01:00
CTD
34fc1b3d34 Variablen leserlicher gemacht 2015-01-12 10:55:07 +01:00
CTD
ac3195851a Erstmal nur der Burgenbonus 
Das mit der Größe kommt noch mal extra, der Übersicht wegen.
Sinvoller weise kann man den Bonus jetzt in der castle.xml einstellen.
Mit neuen Defaultwerten in den XML Dateien.
 2015-01-09 15:53:14 +01:00
Enno Rehling
90dd700487 BREED/PLANT/GROW are technically the same command, merge them. 
The new parser makes this easy.
 2015-01-04 15:11:49 +01:00
Enno Rehling
66ba288bae type in spell description (bug 2061). 
https://bugs.eressea.de/view.php?id=2061
 2014-12-31 22:43:08 +01:00
Enno Rehling
b3bec13051 report the unit limit in NR and CR. 
this implements https://bugs.eressea.de/view.php?id=2055
 2014-12-19 19:57:24 +01:00
Enno Rehling
4b1ac68446 let the snowman give items to other units. 
this fixes https://bugs.eressea.de/view.php?id=1924
 2014-12-14 20:09:43 +01:00
Enno Rehling
27b1d55350 enhancement: buildings without an owner report their lack of upkeep to the entire region. 
https://bugs.eressea.de/view.php?id=1713
 2014-12-14 11:48:15 +01:00
Enno Rehling
dd87907566 bugfix: making clones help with upkeep. 
https://bugs.eressea.de/view.php?id=1560
 2014-12-13 23:37:42 +01:00
Enno Rehling
ef415c66d0 Fix GIVE 0 behavior on oceans. 2014-12-11 08:51:03 +01:00
Enno Rehling
ecc3b1b441 Dragons re using the new LOOT command. 
Fixing the income message (missing ")").
 2014-11-02 11:10:26 +01:00
Enno Rehling
bbd4e31cf9 Merge branch 'loot' of github.com:CTD1/eressea-server-bugfixing into CTD1-loot 
Conflicts:
	res/core/de/strings.xml
 2014-11-02 10:02:30 +01:00