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

5029 Commits

Author SHA1 Message Date
Enno Rehling eba75c52f3 Merge branch 'CTD1-loot' 2014-11-02 10:07:48 +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 367307575c Merge branch 'master' of github.com:eressea/server 2014-11-01 22:12:11 +01:00
Enno Rehling 14bcaf7d71 Merge branch 'version-3-3' 
Update build number
 2014-11-01 21:58:33 +01:00
Enno Rehling dc7cbd886c fix the quit command, asserting the wrong keyword (probably copypasta). 2014-11-01 21:57:06 +01:00
Enno Rehling 59c1c23324 refactor config.c, move the find* functions into the modules they belong to. 2014-11-01 18:34:53 +01:00
Enno Rehling 27f94783bc fix gcc build, forward-declare structs in the header. 
MSVC allows structs to be declared in a function signature, gcc wants
to know about them earlier.
 2014-11-01 13:10:22 +01:00
Enno Rehling 1af315ebf2 move magic out of kernel, into src. 
clean up/remove a ton of includes, especially of types.h (include in header if you need it, not in every .c file).
 2014-11-01 12:57:01 +01:00
Enno Rehling 81bfb598d0 refactoring modules, cleaning out the config.c kitchen sink. 
- cansee_* rules to laws.c
- translations to language.c
- stealth to attributes/,
- rename build.h -> buildno.h
 2014-11-01 12:09:56 +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 17e86ab6cd Merge branch 'master' of github.com:badgerman/eressea 2014-10-31 22:11:09 +01:00
Enno Rehling af616b5b09 fix segmentation fault in test. 2014-10-31 22:10:52 +01:00
Enno Rehling 5b6663cad7 Assert that magicians are single-person units in a few places. 
Bug 2028 claims that this is not always the case, though I cannot prove it.
 2014-10-31 22:03:00 +01:00
Enno Rehling 483a2ba3de add missing tests for groups. 2014-10-31 19:15:26 +01:00
Enno Rehling 1d7c193de6 more test coverage for resource pooling. 2014-10-31 19:01:13 +01:00
Enno Rehling 2a77f77745 Merge pull request #47 from badgerman/master 
refactoring, tests, old datafile compatibility.
 2014-10-31 17:32:13 +01:00
Enno Rehling 6e24fe9be2 fix gcc build, ebable new test. 2014-10-31 16:51:57 +01:00
Enno Rehling 9848ba08d0 fix gcc and clang builds: missing include 2014-10-31 15:54:25 +01:00
Enno Rehling 997d1ffd4b Fix some crashes that happened while debugging an old data file. 2014-10-31 15:52:40 +01:00
Enno Rehling 838155179f fix backwards compatible code for at_permission. 2014-10-31 15:38:53 +01:00
Enno Rehling cf110d7788 fix allies with null faction (to be resolved later). 2014-10-31 15:38:37 +01:00
Enno Rehling f27a77d288 refactoring: use add_ally instead of manually crating the structure all over the code. 2014-10-31 15:13:05 +01:00
Enno Rehling c8d5d52412 add test for pool, fix a problem with (unused) feature that pools from allies. 2014-10-31 07:51:57 +01:00
Enno Rehling e9c13cc328 cosmetic changes, quick and easy assert to prevent too many magicians. 2014-10-30 17:48:02 +01:00
Enno Rehling aa4a93435e add missing tests for contacting during a siege. 2014-10-30 07:50:01 +01:00
Enno Rehling 526c561b90 some minor cleanup in laws.h 2014-10-29 21:08:16 +01:00
Enno Rehling fe5ea49506 Merge pull request #46 from badgerman/master 
German keywords in the imperative.
 2014-10-29 20:38:26 +01:00
Enno Rehling 9f2d2e0f92 fix broken test that didn't like the new init_locale() requirements. 2014-10-29 20:01:55 +01:00
Enno Rehling 6bd52012c0 read keywords from json configuration, use German imperative forms. 2014-10-29 19:40:09 +01:00
Enno Rehling f9c5d58f41 read json config file if available. 
missed an include, broke the build.
 2014-10-29 08:30:07 +01:00
Enno Rehling 0aec5592a0 allow json config to contain a list of config files (includes). 2014-10-29 07:50:06 +01:00
Enno Rehling 209776b751 Merge pull request #45 from badgerman/master 
Bug 2032: Rename FIGHT -> COMBAT, again
 2014-10-26 21:38:22 +01:00
Enno Rehling b67d42b45e Merge branch 'version-3-3' 2014-10-26 21:19:16 +01:00
Enno Rehling f3e54e103a fix a crash when selling nothing. 
build 687
 2014-10-25 23:54:01 +02:00
Enno Rehling 0a1209d031 verify that my plan for making the German infinitive an optional alias will work. 2014-10-23 16:37:00 +02:00
Enno Rehling f788f19f6c fix tests that relied on translation structures being statically cached. 
clean up static cache, add test for German imperative (WIP)
 2014-10-23 16:14:01 +02:00
Enno Rehling 96d5544b1f Bug 2032: rename FIGHT back to COMBAT 2014-10-20 17:13:32 +02:00
Enno Rehling 356697e44e improve test for attrib::nexttype correctness. 2014-10-19 20:02:06 +02:00
Enno Rehling eb1d73e2c2 basic test for tolower function. 2014-10-19 06:42:40 +02:00
Enno Rehling f4f9e74e90 Merge branch 'master' of github.com:eressea/server 2014-10-19 05:56:41 +02:00
Enno Rehling aadd9377c2 update build number 2014-10-18 21:43:04 +02:00
Enno Rehling adcd4ec1c6 increase build number. 2014-10-18 21:40:56 +02:00
Enno Rehling 79c8c4a034 fix a crash when testing for the RESHOW ANY command. 
E2 crashed when no parameter was given.
 2014-10-18 21:40:25 +02:00
Enno Rehling f069df2345 Merge branch 'master' of github.com:eressea/server 2014-10-18 21:37:40 +02:00
Enno Rehling 58547969f8 fix a crash when testing for the RESHOW ANY command. 
E2 crashed when no parameter was given.
 2014-10-18 21:36:46 +02:00
Enno Rehling c337d3f505 Merge pull request #40 from CTD1/Fix-0001865-for-E2 
Bug 1865: largest building or region owner pays for certain empty buildings. Fix for E2,
 2014-10-18 20:35:51 +02:00
Enno Rehling e4ab34115b Merge pull request #44 from badgerman/master 
Automatic Teaching feature by CTD
 2014-10-18 20:32:00 +02:00
Enno Rehling 78db167802 Merge branch 'master' of github.com:badgerman/eressea 2014-10-18 19:57:50 +02:00
Enno Rehling 837227f69c PR code review comments. 
- make study rule an enum, for easier debugging
- change parameter name (it's not a type)
 2014-10-18 19:53:13 +02:00
Enno Rehling a09b53c0c4 Merge branch 'Autolehrer' of github.com:CTD1/eressea-server-bugfixing into CTD1-Autolehrer 2014-10-18 19:46:26 +02:00