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

6019 Commits

Author SHA1 Message Date
CTD 74d583461e update submodule iniparser 2015-10-01 15:48:31 +02:00
CTD 300608586f Merge remote-tracking branch 'upstream/develop' 2015-10-01 14:08:20 +02:00
CTD e13d90f357 Merge remote-tracking branch 'eressea/develop' 2015-10-01 09:10:01 +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 5e28cc9de3 re-enable valgrind 2015-09-28 11:31:58 +02:00
Enno Rehling 3eead446d0 reduce cron log spam 2015-09-26 22:42:22 +02:00
Enno Rehling baacd9b5cc Merge pull request #304 from ennorehling/feature/test-follow-ship 
additional tests: follow ship (bug 2140 is invalid)
 2015-09-25 14:14:38 +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 9ceea5bd44 Merge branch 'develop' of github.com:badgerman/eressea into develop 2015-09-23 17:33:43 +02:00
Enno Rehling 3de0426b86 Merge branch 'ennorehling-feature/bug-2053-attack-monsters' into develop 2015-09-19 13:36:05 +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 a795226368 just a script for fixing broken familiar links between releases 2015-09-15 17:43:22 +02:00
Enno Rehling 1122bb70a4 fix museum terrains 2015-09-13 10:05:52 +02:00
Enno Rehling 2dcd69cb46 Merge pull request #301 from ennorehling/develop 
fix terrains.json in E2
 2015-09-13 09:55:47 +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 a9abf4d87d Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	src/guard.c
	src/guard.h
 2015-09-12 23:48:01 +02:00
Enno Rehling 599a2bbc86 Merge pull request #300 from ennorehling/feature/guard-module 
guard module
 2015-09-12 23:45:44 +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 a931ac4fb6 move guard implementation into a module (WIP) 2015-09-12 22:49:43 +02:00
Enno Rehling 772b1cf203 Merge remote-tracking branch 'upstream/develop' into develop 2015-09-12 22:48:49 +02:00
Enno Rehling 5f7b9129bc Merge branch 'master' into develop 
Conflicts:
	tests/runtests.bat
 2015-09-12 22:47:33 +02:00
Enno Rehling ee9586bc2e crontab time changes 2015-09-12 22:47:09 +02:00
Enno Rehling b93a75c529 Merge pull request #299 from ennorehling/master 
fix logging for sp_igjarjuk
 2015-09-12 22:44:40 +02:00
Enno Rehling 47c48d2985 Merge branch 'master' into develop 2015-09-12 22:27:14 +02:00
Enno Rehling 871373a0e5 be less verbose about cursing 2015-09-12 22:26:54 +02:00
Enno Rehling 7e6312441c cron fixes 2015-09-12 21:43:36 +02:00
Enno Rehling de9fec8eed fix bug in a python script 
do not install crontab anywhere but eressea@gruenbaer
 2015-09-12 21:21:58 +02:00
Enno Rehling 8fa3234159 Merge branch 'master' into develop 
Conflicts:
	tests/runtests.bat
 2015-09-12 21:00:28 +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 a35ed82f43 Merge pull request #298 from ennorehling/feature/json-disable-skills 
disable everything from JSON, not XML
 2015-09-12 19:21:53 +02:00
Enno Rehling 7259a4b45e remove parse_main from xmlreader, everything superseeded by jsonconf 2015-09-12 18:16:23 +02:00
Enno Rehling 0ed365e539 remove the game section from XML config 2015-09-12 18:15:36 +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 e80f53d35e Merge pull request #297 from ennorehling/feature/json-disable-keywords 
disable keywords in JSON, not XML
 2015-09-12 17:23:08 +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