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

4605 Commits

Author SHA1 Message Date
Enno Rehling 91eead0993 fix test runner 2014-08-07 13:23:11 +02:00
Enno Rehling b839fcc5c9 Merge branch 'master' of github.com:eressea/server 
Conflicts:
	scripts/eressea/init.lua
 2014-08-07 13:20:53 +02:00
Enno Rehling 9606675168 remove unnecessary print 2014-08-07 13:19:56 +02:00
Enno Rehling d2bee4e185 new test script, rule-independent tests. 2014-08-07 13:19:19 +02:00
Enno Rehling 6889f186a9 Merge branch 'master' of https://github.com/eressea/server 2014-08-06 23:48:24 +02:00
Enno Rehling 7348ce698b add config.path parsing to a module of its own. 2014-08-06 23:47:16 +02:00
Enno Rehling 405c63f447 this old race alias stuff has been dead code for years. 2014-08-06 23:44:47 +02:00
Enno Rehling b90b744287 removing unused RECRUIT_CLASSIC option. Dead code is dead. 2014-08-04 19:53:16 +02:00
Enno Rehling 71056cc2e5 in Lua 5.2, table.getn no longer exists 2014-08-03 20:51:22 +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 ebe078df61 replace backslash with forward for unix-style paths 2014-08-03 12:43:16 +02:00
Enno Rehling 9cb0deb4f9 Eressea tests, rewritten 2014-08-02 23:17:55 +02:00
Enno Rehling 7d9442d360 missing include 2014-08-02 23:05:01 +02:00
Enno Rehling d44656189d deleting the core directory. 2014-08-02 23:01:28 +02:00
Enno Rehling 64ef71143a Use two-phase RESERVE in regular process_orders 2014-08-01 13:12:18 +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 44c89e26ec Lua module rewrite, part deux. 
rules for E3 and E4
some missing files.
 2014-07-26 23:41:56 +02:00
Enno Rehling d994caf7a3 Merge branch 'master' of https://github.com/eressea/server 2014-07-26 22:52:31 +02:00
Enno Rehling d9457a2488 rewrite of the Lua module system. 
At this time, only E2 is working.
Fixing a lot of old code (monster is no longer id 0).
package.paths configured from eressea.ini
install directory configured from eressea.ini
moving building_action into a seaprate module (it's deprecated)
 2014-07-26 22:52:25 +02:00
Enno Rehling 46ab9e7bb6 version 280 installed in production 2014-07-24 08:07:34 +02:00
Enno Rehling 1342b625cc Merge branch 'master' of github.com:eressea/server 2014-07-24 08:06:27 +02:00
Enno Rehling e048e86985 Merge pull request #15 from CTD1/patch-bug1690 
Bug 1690: [E3] +1 Bonus für Zauber von Elfen im Wald
 2014-07-24 08:06:17 +02:00
Enno Rehling 955a57273d code review changes 2014-07-24 08:04:30 +02:00
Enno Rehling 10e08ab306 Merge pull request #14 from CTD1/master 
Bug 1755 Beschworene Skelette mit Ausdauerproblemen
 2014-07-24 07:58:50 +02:00
Enno Rehling 67cf73d42c update ini files so tests will pass again 2014-07-23 16:01:56 +02:00
Enno Rehling 44327d91f6 setting the rules directory with -r (overrides config.rules from eressea.ini) 2014-07-23 15:44:57 +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
CTD 4670767a3b Bug 1690: [E3] +1 Bonus für Zauber von Elfen im Wald 
Es wurden immer 5 und nicht wie im kommentar beschrieben stufe/spellpwer
* 5 Personen von dem Spruch betroffen.
 2014-07-23 10:52:39 +02:00
Enno Rehling 51207167c8 allow reading the configuration from a different directory (-c dir). 2014-07-23 08:10:14 +02:00
Enno Rehling af73c6dcdf Output a message, give feedback about keys used. 
Remove unused variable.
 2014-07-22 11:27:43 +02:00
Enno Rehling 018d4ca38e fix quest keys to work again. 
add a function to walk borders with a callback.
 2014-07-22 10:59:47 +02:00
Enno Rehling 13165f2354 Move quest objects to the module that uses them (museum portals). 2014-07-21 11:34:57 +02:00
Enno Rehling d7803eb318 trying to fix the museum. WIP. 2014-07-21 11:13:16 +02:00
Enno Rehling 2a95c5c1be new server release 2014-07-20 09:53:55 +02:00
Enno Rehling 956efc48d5 new two-phase reserve for e4 2014-07-20 09:42:45 +02:00
Enno Rehling 2eda4036b0 Merge branch 'master' of github.com:eressea/server 2014-07-20 09:40:06 +02:00
Enno Rehling e44d4aa9b9 implemented a suggested change to RESERVE. 
http://bugs.eressea.de/view.php?id=1675#c5240
new setting "rule.reserve.twophase" reserves from self first, before reserving from others.
fix a crash when trying to flush logs and there is no logfile.
 2014-07-20 06:19:21 +02:00
Enno Rehling fbe9822e9c mpve sceipts tp the roght place. 2014-07-19 23:55:41 +02:00
CTD 9d102fd069 BUG 1786 Fehlschlag ZERSTÖRE Gerüst 
Einheiten ohne Personen können nichts zerstören (das ist OK), da aber
Zerstöre vor Rekrutiere und zusammen mit Gib abgearbeitet wird, kann
eine Temp-Einheit normalerweise nichts Zerstören, auch wenn sie in der
Auswertung Pesonen hat.
Wenn sie Personen übergeben bekommt hängt es von der genauen
Reihenfolger der Einheiten in der Region ab.
Daher habe ich Zerstöre nach Gib, Vergessen und Rekrutieren geschoben.
 2014-07-18 15:21:10 +02:00
CTD 4cfa1ec7c3 Bug 1755 Beschworene Skelette mit Ausdauerproblemen 
Sowohl Beschworenen Untote als auch Monster (Drachen, für Monster-Untote
war es Ok) hatten keine Anpassung ihrer Max-HP nach der Zuweisung von
Skills.
 2014-07-18 13:15:18 +02:00
Enno Rehling 5458fce59c install configuration files 2014-07-18 03:22:54 +02:00
Enno Rehling a4675c61fd installing resource files through cmake. 2014-07-17 15:55:50 +02:00
Enno Rehling 4506bff522 new server version installed. 2014-07-17 15:18:18 +02:00
Enno Rehling 4c4652667c fix code to work with gcc, move init_locales() outside of util. 2014-07-17 15:16:57 +02:00
Enno Rehling 97de950884 Merge pull request #13 from TomBraun/master 
Change umlauts in the german comment
 2014-07-17 15:13:30 +02:00
Enno Rehling ae238799b4 Merge pull request #12 from CTD1/master 
Bugfix http://bugs.eressea.de/view.php?id=2009
 2014-07-17 15:11:00 +02:00
Enno Rehling 1500bcac70 REKRUTIERE RASSE funktioniert nicht (Bug 2012) 
http://bugs.eressea.de/view.php?id=2012
init_locales must not be called before races have been configured.
make jsonconf initialize translations
handle missing strings in translations, log errors.
 2014-07-17 14:38:56 +02:00
CTD 5e2c5657bd Falscher Magischer Beutel bei Gewichtsberechnung 
Bei der Änderung
92f43a7b51
wurde der Magische Beutel durch den Magischen Kräuterbeutel ersetzt, so
das dieser nun das Gewicht reduzierte und der "Bag of Holding" völlig
nutzlos wurde.
 2014-07-17 12:59:47 +02:00
TomBraun 19ce861120 Change umlauts in the german comment 2014-07-16 12:10:58 +02:00