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

37 Commits

Author SHA1 Message Date
Enno Rehling 8716e5fdc5 repair spellbooks that broke in E3 and E4 (temporary measure, remember to remove this code). 2015-08-20 12:13:09 +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 6e9f889e77 Merge branch 'master' of github.com:eressea/server 
Conflicts:
	src/laws.test.c
 2015-06-08 08:47:36 +02:00
Enno Rehling 4b721e074d diable test_peasantluck, it fails on master 
do not load any config for run-tests.lua
 2015-05-24 10:31:11 +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
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 9ce9cddd1f I have no idea why this worked, since my eressea/git is a symlink, 
and that means ../git is not equal to cwd.
 2015-01-09 21:53:06 +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 d67ecdb8cf Merge pull request #64 from CTD1/Bauern 
Bauern in leeren Regionen
 2014-12-19 20:08:42 +01:00
CTD c914c83947 Grenze für E2 
auf 500 Bauern erhöht.
 2014-12-18 11:57:30 +01:00
Enno Rehling 440d78596c Add missing keywords, fix disappearing units. 
https://bugs.eressea.de/view.php?id=2051
. The orders PASSWORT, FAHRE, KÄMPFE were not recognized (new imperative syntax).
. Added backwards compatibility for FIGHT (now COMBAT).

https://bugs.eressea.de/view.php?id=2050
. units were always giving away ALL persons, not the number in their GIVE command.
 2014-12-12 13:32:21 +01:00
Enno Rehling 00ba5538f5 Merge pull request #48 from badgerman/master 
more refactoring, no new features.
 2014-11-02 10:34:37 +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
Enno Rehling a29e6a7f40 fix segmentation fault in new assert (units without a faction) 2014-10-31 22:20:07 +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 bd8d28cfb7 reduce E3 chance to attack to zero for turn re-run 2014-08-20 11:55:17 +02:00
Enno Rehling 68fc4df74d Configurable monster attack chance, default to 40%. 
E3 chance to attack is only 10%.
 2014-08-20 11:54:11 +02:00
Enno Rehling afd41286b5 config file reading based on game name and install location. 2014-08-03 20:37:05 +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 30e9565ae6 update config files to use game.rules from eressea.ini. 
ToDo: set rules from command line with -r
 2014-07-23 12:19:24 +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 956efc48d5 new two-phase reserve for e4 2014-07-20 09:42:45 +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 fa256360b9 eliminate kill_nonstarters 2014-06-03 06:29:33 +02:00
Enno Rehling 9940025a96 eliminate multiple warnings about missing default order 
fix e3 catalog file syntax
 2014-06-02 07:31:46 +02: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