Enno Rehling
|
3eead446d0
|
reduce cron log spam
|
2015-09-26 22:42:22 +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
|
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 |
|
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
|
13d88fa4fd
|
Merge pull request #295 from eressea/master
change the release naming scheme
|
2015-09-12 15:46:34 +02:00 |
|
Enno Rehling
|
8f00d5293f
|
change the release naming scheme
|
2015-09-12 15:42:46 +02:00 |
|
Enno Rehling
|
864454877e
|
change the release naming scheme
|
2015-09-12 15:42:03 +02:00 |
|
Enno Rehling
|
c704cd5784
|
release version 3.6.2
|
2015-09-12 15:41:25 +02:00 |
|
Enno Rehling
|
6c8342d1c1
|
Merge branch 'master' into develop
|
2015-09-12 15:39:58 +02:00 |
|
Enno Rehling
|
17342b7c5d
|
add a release-tagging script
|
2015-09-12 15:39:36 +02:00 |
|
Enno Rehling
|
3f39569710
|
add compression scripts to installer
|
2015-09-12 15:26:00 +02:00 |
|
Enno Rehling
|
c6fb869ae2
|
Merge pull request #294 from ennorehling/feature/json-prefixes
JSON Prefixes
|
2015-09-12 14:26:46 +02:00 |
|
Enno Rehling
|
9563aa712f
|
eliminate junk function
|
2015-09-12 14:16:18 +02:00 |
|