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

6833 Commits

Author SHA1 Message Date
Enno Rehling ecc2eaf999 Merge branch 'master' of github.com:ennorehling/eressea 
Conflicts:
	src/kernel/save.c
 2016-08-13 19:56:48 +02:00
Enno Rehling bea8b05ee9 Merge pull request #534 from ennorehling/hotfix-bug-2222-nmrdeath 
bug 2222: death by NMR was broken
 2016-08-07 00:45:30 +02:00
Enno Rehling 44b6a87649 death by NMR was broken, because I can't write loops good. 2016-08-07 00:40:10 +02:00
Enno Rehling ae3e5b8088 release version 3.8.15 2016-08-06 23:27:23 +02:00
Enno Rehling ca7b250c46 otherfaction can be null if not f->alive 2016-07-03 11:02:21 +02:00
Enno Rehling dbaad4c403 release version 3.8.14 2016-07-03 10:59:50 +02:00
Enno Rehling 0639e2ef1f Merge pull request #511 from ennorehling/master 
Fix 55 NMR abort, E2 turn 978
 2016-05-29 11:11:15 +02:00
Enno Rehling 72d9f8adf0 For NMR purposes, count cursed factions like NPCs (i.e. not). 
fix warnings in log tests
log whitespace cleanup
 2016-05-29 10:58:49 +02:00
Enno Rehling 2282bdf3d1 release version 3.8.12 2016-05-20 23:08:23 +02:00
Enno Rehling 400bca30b1 Merge pull request #509 from ennorehling/hotfix-passwords 
fixing the password saving test.
 2016-05-20 22:56:17 +02:00
Enno Rehling cdd7606f02 fixing the password saving test. 2016-05-20 22:38:18 +02:00
Enno Rehling 01035a7325 password reading from external file is active, but broken. yikes 2016-05-20 20:49:47 +02:00
Enno Rehling b5a84f07ba release version 3.8.11 
- disable autoseed (endless loop)
 2016-05-17 15:46:14 +02:00
Enno Rehling 21ee84dc65 autoseed barfs on blank lines, catch that case 2016-05-15 10:35:23 +02:00
Enno Rehling 65a163b4d9 do not seed new factions if there isn't a minimum number of them 2016-05-05 13:51:31 +02:00
Enno Rehling 0557aa84ac release version 3.8.9 2016-05-01 13:40:10 +02:00
Enno Rehling f24b1c1cdc fix multi-logging 2016-05-01 13:40:01 +02:00
Enno Rehling 41277ed5ee prove that logging is broken (new test segfaults) 2016-05-01 13:39:25 +02:00
Enno Rehling 1fa1693119 test multiple loggers 2016-05-01 13:36:00 +02:00
Enno Rehling 13156a47a4 Merge pull request #507 from ennorehling/hotfix/bug-2201-remove_empty_factions 
Hotfix bug 2201, crash E3 turn 351
 2016-04-03 13:23:29 +02:00
Enno Rehling b2e8c75c02 add a test that should have crashed before my fix. 2016-04-03 12:37:26 +02:00
Enno Rehling 30b3cff657 fix a crash in write_game caused by remove_empty_factions 
https://bugs.eressea.de/view.php?id=2201
 2016-04-03 12:23:51 +02:00
Enno Rehling bc8c39f4bb fix message-crash https://bugs.eressea.de/view.php?id=2199 
release version 3.8.7
 2016-03-26 22:09:21 +01:00
Enno Rehling 2c6a39ebb0 release version 3.8.6 2016-03-12 15:25:13 +01:00
Enno Rehling 3e6d4ab908 Merge pull request #501 from ennorehling/stm2-bug_2187 
hotfix: bug 2187 (demon hunger)
 2016-03-12 15:23:49 +01:00
Enno Rehling fcc26bcbf3 fix broken json 2016-03-12 15:06:45 +01:00
Enno Rehling ff395b2e24 Merge branch 'bug_2187' of https://github.com/stm2/server into stm2-bug_2187 2016-03-12 15:03:06 +01:00
Enno Rehling eb86ba325e Merge remote-tracking branch 'upstream/master' 2016-02-29 22:55:26 +01:00
Enno Rehling 197241df0d fix datafile reading problems for versions 350 and 351 2016-02-29 16:18:14 +01:00
Steffen Mecke e3f27e3571 clean up after your tests, young grashopper 2016-02-28 20:34:37 +01:00
Steffen Mecke 11b8d85167 fixed reversed logic for demon peasant hunger (bug 2187) 
renamed config variable hunger.demons to hunger.demons.peasant_tolerance and reversed reversed logic in upkeep.c
 2016-02-28 16:15:48 +01:00
Steffen Mecke aa3397a24f reduced report directory spam 2016-02-28 16:15:47 +01:00
Enno Rehling 92038aae1a Merge remote-tracking branch 'upstream/master' 2016-02-25 11:05:24 +01:00
Enno Rehling bb03517619 disable most password formats 2016-02-25 10:46:46 +01:00
Enno Rehling 1bb215dd52 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/kernel/save.c
	src/triggers/createunit.c
 2016-02-23 08:35:31 +01:00
Enno Rehling d6a8d12dbb Merge pull request #489 from ennorehling/hotfix/fix-faction-references 
fix writing faction references
 2016-02-23 07:30:26 +01:00
Enno Rehling 7807e9e710 fix integration test data file 2016-02-22 21:35:37 +01:00
Enno Rehling 1e4b860a2e some trivial assertions 2016-02-22 20:48:24 +01:00
Enno Rehling 77ed6f3722 add missing file 2016-02-22 20:48:24 +01:00
Enno Rehling be99c02a82 fix valgrind report 2016-02-22 20:48:24 +01:00
Enno Rehling 370338736c gcc is picky, fix gcc warnings 2016-02-22 20:47:06 +01:00
Enno Rehling 4f7e1cb80f integration test update. 
- have a faction that quits,
- try to reload the datafile we just wrote.
 2016-02-22 20:47:06 +01:00
Enno Rehling c823a3b036 handle regions that have no owner 2016-02-22 20:47:06 +01:00
Enno Rehling 7fe07439f5 fix write_faction_reference, check for f->alive in other places 
TODO:
1. I added some new TODOs
2. What happens to morale when region owners die?
3. Needs tests
 2016-02-22 20:47:06 +01:00
Enno Rehling 6b1367dff1 fix gcc build 2016-02-22 15:48:43 +01:00
Enno Rehling 4f01d7041f Merge branch 'upstream-master' 
Conflicts:
	src/kernel/save.test.c
	src/kernel/version.h
 2016-02-22 08:55:46 +01:00
Enno Rehling c7ad807396 Merge branch 'master' of https://github.com/ennorehling/eressea 2016-02-21 23:11:21 +01:00
Enno Rehling 7d913d7257 unused variable 2016-02-21 23:07:44 +01:00
Enno Rehling dc4bdef5b3 fix linux build 
Conflicts:
	src/util/password.test.c
 2016-02-21 19:16:55 +01:00
Enno Rehling ff7dc25c90 fix syntax of suppression files 2016-02-21 17:25:42 +01:00