Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,472 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

79 Commits

Author SHA1 Message Date
Enno Rehling 083c848db1 merge with latest hotfix 2015-07-12 04:53:10 +02:00
Enno Rehling 7906d4469d return to old mechanism of equipping the first unit, and give some basic necessities to special races. 2015-07-05 16:40:49 +02:00
Enno Rehling 4e67c4ac3f do not remove new players for missing their first turn. 2015-07-05 15:24:46 +02:00
Enno Rehling ae8c448698 do not remove new players for missing their first turn. 2015-07-05 14:07:59 +02:00
Enno Rehling aee4fb4570 disable SIEGE in E2. The feature is bad and broken. 
https://bugs.eressea.de/view.php?id=1896
 2015-07-02 12:07:52 +02:00
Enno Rehling 5667b6dc8c Merge branch 'develop' of github.com:eressea/server into develop 2015-06-21 16:24:46 +02:00
Enno Rehling 5afd58faff Revert "disable force_leave code, it is too surprising" 
This reverts commit f27d60e1b2.
 2015-06-19 13:37:15 +02:00
Enno Rehling f27d60e1b2 disable force_leave code, it is too surprising 2015-06-18 00:01:11 +02:00
Enno Rehling 6e4c7c12d5 disable force_leave code, it is too surprising 2015-06-17 23:58:18 +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 0de5d698de Fix the 'B' island generation to use the newfactions file, for use by new GMs. 
configurable island size.
 2015-06-02 15:29:21 +02:00
Enno Rehling b7826c8025 Enable rules.owners.force_leave for all running games. 
https://bugs.eressea.de/view.php?id=2059 "(TEMP?)-Einheit in feindlichem Gebäude nach Kampf"
 2015-05-18 07:28:56 +02:00
Enno Rehling ce94c9805d rules.give.max_men == -1 für unlimitierte Übergaben in E2 2015-04-28 17:40:41 +02:00
Enno Rehling 293190703f make maximum number of people transferred to a faction configurable 
make E2 transfers basically unlimited.
 2015-03-13 21:10:39 +01:00
CTD c914c83947 Grenze für E2 
auf 500 Bauern erhöht.
 2014-12-18 11:57:30 +01:00
Enno Rehling 6bd52012c0 read keywords from json configuration, use German imperative forms. 2014-10-29 19:40:09 +01:00
Enno Rehling 077d7d8d49 cmp_taxes ruft regionowner() auf, und das hat ein assert, welches 
testet das die Regel für Regionsbesitz aktiv ist. E2 hat aber keine
Regionsbesitzer. Ergo kann in E2 auch der Regionebesitzer nicht für
Leuchttürme zahlen, der Eintrag aus config.xml muss da wieder raus.
 2014-10-06 07:17:46 +02:00
Enno Rehling 49128bdc79 syntax error in configuration files 2014-10-05 19:31:47 +02:00
Enno Rehling 232b935e0f Merge pull request #31 from CTD1/XML_config_changes 
Xml config changes
 2014-10-01 13:47:23 +02:00
Enno Rehling c0230d2662 In the game, there is only ever one special direction, and it is for the astral space. 
less XML, more code.
cleaning up the special direction parsing a bit.
 2014-08-28 19:50:38 +02:00
CTD 3fd4a29356 rules.reserve.twophase für alle Spiele 2014-08-26 16:19:59 +02:00
CTD 80819ad4e5 XML Config 
Ich habe mal alle neuen Sachen in die XML Dateien eingetragen, und
gleich noch 2 kleine Bugs behoben (Natürlich Rüstung war wieder aus und
default Arbeiten gab es nicht mehr).
 2014-08-26 10:53:51 +02:00
Enno Rehling bd2809a975 removing the core directory (moving to res and scripts). 
it's from when open-source Eressea was limited, and we no longer need the separation.
JSON configuration for ship flags.
 2014-07-28 14:27:30 +02:00
Enno Rehling 2bec7e2bbe save game id in the data file, not name of XML file 2014-07-23 11:54:51 +02:00
Enno Rehling 740b646e54 fix keywords 2014-06-22 12:38:11 -07:00
Enno Rehling a144417daa remove reference to former GM command (I killed it last week) 2014-06-15 21:22:22 -07:00
Enno Rehling 08c3d08d7d fix config.xml for test games 
update log levels for some common messages.
 2014-06-02 05:42:56 +02:00
Enno Rehling 038ba723ef remove old equipment file from config everywhere 2014-06-01 23:57:45 +02:00
Enno Rehling 1b039feacb save the xml config, before I accidentally nuke it again 2014-06-01 23:49:09 +02:00