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

1270 Commits

Author SHA1 Message Date
Enno Rehling 936c201d0b Merge pull request #312 from eressea/master 
pull latest changes from master into develop
 2015-10-11 16:47:29 +02:00
Enno Rehling 6a074fd294 only disable MSVC2015 warnings in MSVC2015, do not break confuse compilers. 2015-10-11 14:39:51 +02:00
Enno Rehling e8880db447 get the code to compile under vs2015 (disable warnings) 2015-10-11 14:39:43 +02:00
Enno Rehling c47c9dbf64 add mail_cmd tests for FACTION 2015-10-11 12:54:27 +02:00
Enno Rehling 403b8a2e7e add mail_cmd tests for REGION 2015-10-11 12:44:22 +02:00
Enno Rehling 070ed1a941 clean up hastily written tests, eliminate duplicate code 2015-10-11 12:38:05 +02:00
Enno Rehling 9e49e10d11 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/unit.test.c
 2015-10-10 22:55:29 +02:00
Enno Rehling 99c385412a fix crash in mail_cmd when order is missing a message 2015-10-10 22:50:15 +02:00
Enno Rehling 7f81cee36d Merge pull request #305 from ennorehling/feature/log-reduce 
reduced log spam in cron emails
 2015-09-28 12:27:04 +02:00
Enno Rehling 3eead446d0 reduce cron log spam 2015-09-26 22:42:22 +02:00
Enno Rehling d153846769 test: ageing ship trails works as expected. cannot find a bug here. 
Conflicts:
	src/move.test.c
 2015-09-25 14:10:25 +02:00
Enno Rehling f07802bab5 add a test to check that move_ship creates a trail when given a route 
Conflicts:
	src/move.test.c
 2015-09-25 14:09:22 +02:00
Enno Rehling f018016feb rename hunt to follow_ship, because why was it ever called anything else? 2015-09-25 14:06:18 +02:00
Enno Rehling ae513c5f23 Merge branch 'hotfix/bug-2138-familiarmage' of github.com:ennorehling/eressea into hotfix/bug-2138-familiarmage 2015-09-23 18:31:46 +02:00
Enno Rehling 1028539adb version number increase 2015-09-23 18:29:18 +02:00
Enno Rehling 84a92124bd Merge branch 'feature/bug-2053-attack-monsters' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-2053-attack-monsters 
Conflicts:
	conf/e3/config.xml
 2015-09-19 13:35:53 +02:00
Enno Rehling e217a4b550 age_unit accidentally returned AT_AGE_REMOVE (caused by a recent change to curse_age) 2015-09-14 22:58:12 +02:00
Enno Rehling 3a1444f378 backport (failing) at_familiarmage test from 3.7 branch 2015-09-14 17:38:58 +02:00
Enno Rehling 23a7ed59ac backport familiar skill test from 3.7 development 2015-09-14 17:17:29 +02:00
Enno Rehling 90bcf30628 fix bad terrain definitions in E2 (string, not number: these values are used for dice throws). 
clean up the jsonconf.c code for reading these a little bit, report more specific errors.
 2015-09-13 09:46:40 +02:00
Enno Rehling 71c4cb53c0 add missing guard.h include everywhere, remove duplicate prototypes from config.h 2015-09-12 23:41:37 +02:00
Enno Rehling dd9420fc38 move at_guard into guard module as well 2015-09-12 23:38:31 +02:00
Enno Rehling 3055f517dc move guard implementation into a module (WIP) 2015-09-12 22:53:54 +02:00
Enno Rehling 5f7b9129bc Merge branch 'master' into develop 
Conflicts:
	tests/runtests.bat
 2015-09-12 22:47:33 +02:00
Enno Rehling a027139057 remove global variable `verbosity` in favor of static in main.c (use log_* functions everywhere) 2015-09-12 20:58:09 +02:00
Enno Rehling 06a04d0e20 fix logging for sp_igjarjuk, temporarily set log-levels for the game to error|warn|info 
remove some code that accesses `verbosity` variable (todo: hide it more, fix logging)
 2015-09-12 19:48:03 +02:00
Enno Rehling 63c983e197 Merge branch 'develop' of github.com:eressea/server into develop 2015-09-12 19:28:49 +02:00
Enno Rehling c7a0fb5f28 development build is 3.7 2015-09-12 19:28:28 +02:00
Enno Rehling 44dd66f2fb Merge branch 'master' into develop 2015-09-12 19:27:56 +02:00
Enno Rehling 28f17b6a08 release version 3.6.3 2015-09-12 19:27:11 +02:00
Enno Rehling 7259a4b45e remove parse_main from xmlreader, everything superseeded by jsonconf 2015-09-12 18:16:23 +02:00
Enno Rehling 1e75255d51 allow disabling skills through json 2015-09-12 17:43:31 +02:00
Enno Rehling a01955e06a disable features by name that are not keywords 2015-09-12 17:37:29 +02:00
Enno Rehling c76b118fb8 eliminate game/order from XML data 2015-09-12 17:12:02 +02:00
Enno Rehling 44eb3a4f58 disable keywords through JSON configuration 2015-09-12 17:06:55 +02:00
Enno Rehling 32ff7c89bc Merge pull request #296 from ennorehling/feature/config-producexpchance 
Bug 2137: calculating produceexp correctly
 2015-09-12 16:52:55 +02:00
Enno Rehling 7906cdbcb6 do not read gamename from XML, read it from JSON only (two mechanisms for the same feature are too many) 2015-09-12 16:49:18 +02:00
Enno Rehling d65e9aaf94 eliminate xml reading of produceexp chance 2015-09-12 16:42:02 +02:00
Enno Rehling 8a95ea0c00 speeding up produceexp_chance 2015-09-12 16:41:22 +02:00
Enno Rehling 9bdc811582 produceexp uses a json-configurable constant 
make get_param_flt return a double, floats are for wimps.
 2015-09-12 16:38:51 +02:00
Enno Rehling 68c448b3fb fix signature of callback 2015-09-12 16:29:57 +02:00
Enno Rehling d1686849e0 refactoring: move produceexp into unit module, for want of a better one. add a bit of test coverage. 
https://bugs.eressea.de/view.php?id=2137 - fix learning-by-doing with less than u->number people.
 2015-09-12 16:25:47 +02:00
Enno Rehling c704cd5784 release version 3.6.2 2015-09-12 15:41:25 +02:00
Enno Rehling 9563aa712f eliminate junk function 2015-09-12 14:16:18 +02:00
Enno Rehling 42f1030251 separate test script for E4: 
even though it has mostly the same rules, it does not have xmastrees, and loads a different config
remove dead `inactivefaction` function, we have no use for the file it creates.
 2015-09-12 14:10:08 +02:00
Enno Rehling aa32cf190e remove xmlreader code for prefixes 2015-09-12 13:40:10 +02:00
Enno Rehling 09efd9c2a9 fix anything that uses the calendar module. opps. 2015-09-12 12:54:49 +02:00
Enno Rehling 13e1573611 moving the calendar module out of the kernel directory, it does not belong with the major game objects 2015-09-12 12:54:09 +02:00
Enno Rehling 47c95aee35 implement JSON prefixes. fix free_prefixes not resetting size (TODO: quicklist). 2015-09-12 12:49:12 +02:00
Enno Rehling f0e255924f add a unit test for add/free prefixes. fix bad free_prefixes call site. 2015-09-12 12:41:04 +02:00