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

59 commits

Author SHA1 Message Date
Enno Rehling
33701ab891 make describe_braineater more generic (describe_race). 2016-08-28 20:44:45 +01:00
Enno Rehling
e2808eeea9 reqsize defaults to 1. 
remove default values from xml to make it smaller and simpler.
 2016-08-06 13:53:07 +02:00
Enno Rehling
db5b90e80b clarify building_type.maxsize and add error logging for bug 2221. 
https://bugs.eressea.de/view.php?id=2221
 2016-08-06 13:52:29 +02:00
Enno Rehling
3fa34f8238 Merge pull request #494 from stm2/bug_2193 
fixed a few typos in E3 spells (bug 2193)
 2016-07-08 10:31:39 +02:00
Steffen Mecke
eaa94086eb one more fix 2016-06-12 00:05:19 +02:00
Enno Rehling
7fd1d3d616 remove ocean from coasts, SEA_REGION is enough 2016-06-10 20:50:22 +02:00
Enno Rehling
75f2be75d8 remove code for alp (non-functional) 
remove code for removecurse trigger (only used by alp)
 2016-03-25 21:18:57 +01:00
Steffen Mecke
e143843b2c fixed a few typos in E3 spells (bug 2193) 2016-02-28 14:29:53 +01:00
Enno Rehling
cc88f56a26 no optioinal argument 
http://bugs.eressea.de/view.php?id=2175#c6408
 2015-12-15 07:59:55 +01:00
Enno Rehling
18bcf83d9b Merge pull request #432 from ennorehling/braineaters 
no natural ac for braineaters
 2015-12-10 22:12:38 +01:00
Enno Rehling
d26cd57934 no natural ac for braineaters 2015-12-10 21:59:14 +01:00
Enno Rehling
6a20345b53 issue #428, fix writing spell description for break_curse 2015-12-06 16:45:31 +01:00
Enno Rehling
b3e7fa63e0 Merge pull request #396 from stm2/spell_parameters 
fixed treatment of spell parameters (bug 1867)
 2015-12-03 11:04:57 +01:00
Enno Rehling
c85e489f4f Merge branch 'monster_leftovers' of https://github.com/stm2/server into stm2-monster_leftovers 
Conflicts:
	src/kernel/unit.c
	src/laws.test.c
	src/monsters.c
 2015-11-25 14:25:42 +01:00
Steffen Mecke
742a30cc39 fix seaserpents 
seaserpents could not do piracy
seaserpents should be able to attack after move
 2015-11-17 12:17:28 +01:00
Enno Rehling
d07f359acb fix a minor warning, get ready for 3.7 release 2015-11-16 14:12:51 +01:00
Steffen Mecke
4ab92e3caf fixed descriptions of spells with parameters (bug #2060+1867) 2015-11-13 00:57:14 +01:00
Enno Rehling
4eb4ff40ac https://bugs.eressea.de/view.php?id=2155 
monsters do not attack units inside a castle or watch
dragons do not attack guards
 2015-11-11 14:36:56 +01:00
Enno Rehling
c57918ede0 replace XML terrains for E3 and E4 with JSON configuration 2015-09-11 22:43:08 +02:00
Enno Rehling
b8e17839a7 eliminate some spammy warnings. 2015-07-08 18:27:27 +02:00
Enno Rehling
c8ffe8da7a Bug 2115: fix cerrdor -> cerddor spelling errors. 2015-07-07 20:30:34 +02:00
Enno Rehling
3e48b9b966 libxml 1.9.x seems to be a bit pickier about how XML catalogs are written. 2015-06-08 16:51:41 +02: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
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
e31b671b84 https://bugs.eressea.de/view.php?id=2092 
Tippfehler
 2015-04-20 19:03:53 +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
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
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
9ca206ec3f remove reference to thieves and spies from this spell for non-E2 games. 
this fixes https://bugs.eressea.de/view.php?id=1548
 2014-08-14 07:05:12 +02:00
Enno Rehling
5c78a3883e cleaning up terrains, reading race flags from a JSON array 2014-06-16 22:43:40 -07:00
Enno Rehling
1f41131593 remove invalid skills from E3 races 2014-06-02 00:01:24 +02:00
Enno Rehling
41c6b13111 familiars with differnt skills for different games 2014-05-10 13:50:16 -07:00
Enno Rehling
75b7ac3064 new turn processing script, 
add adamantium to config
 2014-04-27 02:59:02 +02:00
Enno Rehling
fa5dc43b98 reorganizing the way configuration data is read (WIP) 2014-04-20 09:36:25 -07:00
Enno Rehling
31b083a19f E3 hatte keine flammenschwerter 
Fixing http://bugs.eressea.de/view.php?id=1925
 2013-12-27 05:47:11 +01:00
Enno Rehling
10e7f0dd72 new directory layout, all tests pass 2012-06-05 07:36:33 -07:00
Enno Rehling
6362d26e50 kill tybied in E3, make common spells the source for random choices 2012-05-26 14:20:01 -07:00
Enno Rehling
1ba2ed200b remove spell-levels from XML file, we no longer read these or need these. 2012-05-26 09:41:32 -07:00
Enno Rehling
6482b748c8 remove leveled resources from fixed-level spells 2012-05-25 23:32:03 -07:00
Enno Rehling
c3cd519152 specify levels with magic attacks (step one to removing spell->level) 2012-05-24 01:45:13 -07:00
Enno Rehling
1296e45109 fix spellbook data for E2 and E3 2012-05-23 22:24:00 -07:00
Enno Rehling
d4d39b43e9 add xml spellbooks for the magic schools in E2 and E3 
this is being read, but not used by the code yet.
 2012-05-23 21:50:59 -07:00
Enno Rehling
ea7eaf87aa spells that have no function in the xml file get one from an array, cleaning up and simplifying that code. 2012-05-09 23:23:40 -07:00
Enno Rehling
7d4205a3d1 Fix carts in E3. 
Store fighters in a quicklist, not a cvector.
 2011-02-27 12:04:29 -08:00
Enno Rehling
22ab8ae620 frost / packice has no land_region strucutre (no peasants, no name and all that jazz) 2010-09-11 19:38:32 -07:00
Enno Rehling
92f0ba6dcf frost / packice 2010-09-11 19:30:19 -07:00
Enno Rehling
be2d7d203d frost module: during winter, some oceans freeze over 2010-09-11 18:48:08 -07:00
Enno
0f93601454 undo CRLF crazy 2010-08-08 09:40:42 +02:00