Commit graph

4423 commits

Author SHA1 Message Date
Enno Rehling
58fa2d4454 Merge branch 'master' of github.com:eressea/server 2014-06-07 09:26:38 +02:00
Enno Rehling
395410defe formatting (80 characters per line is good)
new chapter on studying skills
2014-06-05 00:41:35 -07:00
Enno Rehling
115d3a8f86 some specialized equipment 2014-06-03 07:35:45 -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
e17a3fc8fa eliminate remaining traces of the wisps spell 2014-06-02 07:22:07 +02:00
Enno Rehling
77a3dc91d5 disable test, because bug 1738 is still not fixed 2014-06-02 05:49:34 +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
1f41131593 remove invalid skills from E3 races 2014-06-02 00:01:24 +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
Enno Rehling
6f29e4dab5 improve logging information (missing race, log levels)
do nothing when thre is no peasant blood
2014-06-01 11:07:22 +02:00
Steffen Mecke
5ee99f97d2 give trolls and others their symmetric-half-additive armor bonus in E3 2014-05-28 17:14:45 +02:00
Enno Rehling
d388a94f36 report missing itemtype before crashing 2014-05-24 20:35:00 -07:00
Enno Rehling
7038b021de fix counting of units, making it slower but more correct 2014-05-24 20:25:06 -07:00
Enno Rehling
649a43a27e sqlite updater, rewrite 2014-05-16 22:49:28 -07:00
Enno Rehling
41c6b13111 familiars with differnt skills for different games 2014-05-10 13:50:16 -07:00
Enno Rehling
c508f48f54 Merge branch 'master' of github.com:eressea/server 2014-05-10 13:33:58 -07:00
Enno Rehling
5c70c45b50 read famililars equipment from separate file 2014-05-10 22:33:46 +02:00
Enno Rehling
515b582144 Merge branch 'master' of github.com:eressea/server 2014-05-10 11:45:14 -07:00
Enno Rehling
2587c069b4 quick mapping tool 2014-05-10 19:00:50 +02:00
Enno Rehling
c2329f7f2b changing unsigned flags to regular ints
the storage library does not understand unsigned at the moment, and using the highest order bit causes trouble
new version of datafile
2014-05-10 18:57:04 +02:00
Enno Rehling
0d087d6bb1 Merge branch 'master' of github.com:eressea/server 2014-05-05 19:15:32 -07:00
Enno Rehling
1e7e5877a1 Merge branch 'master' of github.com:eressea/server 2014-05-05 19:14:55 -07:00
Enno Rehling
86bc4e7aef reading and writing the NPC flag was broken, because flags were a fully loaded unsigned int. making it an int instead, and adding a test.
fixing a bad test in which shadowmasters were deserting to faction null (causing a crash).
2014-05-05 19:11:40 -07:00
Enno Rehling
465f3f7ce9 Merge branch 'master' of github.com:eressea/server 2014-05-05 00:00:10 -07:00
Enno Rehling
19a21772e4 stop tests from crashing 2014-05-04 15:54:56 -07:00
Enno Rehling
cb458db9a1 updating eressea.db, not with a fixed game-id 2014-05-04 22:49:06 +02:00
Enno Rehling
1318c8976a e4 startup 2014-05-03 19:53:59 +02:00
Enno Rehling
ce347a95c9 order processing and other scripts 2014-04-27 03:03:14 +02:00
Enno Rehling
75b7ac3064 new turn processing script,
add adamantium to config
2014-04-27 02:59:02 +02:00
Enno Rehling
535a9e6e53 fix number of units in the report header 2014-04-26 12:24:51 -07:00
Enno Rehling
2c4cae4c7e Merge branch 'master' of github.com:eressea/server 2014-04-24 23:42:30 -07:00
Enno Rehling
94e8a65d4f processing scripts and tools 2014-04-25 08:41:52 +02:00
Enno Rehling
0c06c86fb9 do not kill the wrong nonstarters 2014-04-24 23:36:54 -07:00
Enno Rehling
35c2baafbe do not read turn file for turn 0 2014-04-25 07:47:23 +02:00
Enno Rehling
1588d31a7e fix test runner 2014-04-24 15:39:14 +02:00
Enno Rehling
921ab4947e fixing xml config for e2 and e3 2014-04-24 06:24:35 -07:00
Enno Rehling
985b4376df Merge branch 'master' of github.com:eressea/server 2014-04-24 05:50:20 -07:00
Enno Rehling
ac1149add5 this catalog does not work. why? 2014-04-24 14:47:44 +02:00
Enno Rehling
fece511afb Merge branch 'master' of github.com:eressea/server 2014-04-24 05:43:44 -07:00
Enno Rehling
bf8d37e4f8 reworded acknowledgements 2014-04-24 05:43:09 -07:00
Enno Rehling
e5b54ba953 Merge branch 'master' of github.com:eressea/server 2014-04-24 14:41:21 +02:00
Enno Rehling
c1b840b0b2 remove -Cef, parse any arguments as a file to run.
new xml config file, work in progress, xinclude is broken
2014-04-24 14:41:04 +02:00
Enno Rehling
a485f65562 new config files 2014-04-24 09:14:29 +02:00
Enno Rehling
b875ec872b Do not forget a chapter of orders. 2014-04-23 21:48:21 -07:00
Enno Rehling
cdcc8ae1d3 draft documentation, chapter overview and introduction 2014-04-23 21:36:34 -07:00
Enno Rehling
2cc21b265d remove GM command, remove gm-attributes from data when writing. 2014-04-22 21:42:32 -07:00
Enno Rehling
45168eb7e9 Merge branch 'master' of github.com:eressea/server 2014-04-22 07:21:34 -07:00
Enno Rehling
0d05ae77a3 remove stupid pragmas 2014-04-22 07:21:29 -07:00