Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity
8684 commits 10 branches 0 tags 41 MiB
Commit graph

8684 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
f941c5552f remove RF_SELECT code from split_allocations. 
the flag was only ever written, never read.
 2017-03-23 19:32:17 +01:00
Enno Rehling
485e8f0ce4 Revert "add failing test for skill bonus from mine, start work" 
This reverts commit ab87b1da85.
 2017-03-23 19:28:56 +01:00
Enno Rehling
ab87b1da85 add failing test for skill bonus from mine, start work 2017-03-23 18:51:30 +01:00
Enno Rehling
68e36e9252 test that adamantium requires a mine 2017-03-23 08:29:24 +01:00
Enno Rehling
0c8a9354db rmt_find no longer used. 
handle old data files with rm_iron, etc.
 2017-03-22 20:46:29 +01:00
Enno Rehling
17145eaf10 make region:set_resource do the right thing 
also for adamantium
 2017-03-22 20:37:09 +01:00
Enno Rehling
e7c290cb84 Merge pull request #678 from ennorehling/develop 
BUG 1889: locale for EFFECTS
 2017-03-19 06:42:19 +01:00
Enno Rehling
27d66adc74 eliminate duplicate keyword warning 2017-03-18 21:33:47 +01:00
Enno Rehling
bdf7411954 backfill a test for smithies 2017-03-18 10:33:52 +01:00
Enno Rehling
ae6d9f0e1a Zwergenbonus gibt es nur in E2 2017-03-18 08:00:35 +01:00
Enno Rehling
4c67e0603b remove attribs from rtype (it's only in rtype->construction that we use it?) 
test to verify that mine bonus for iron works as advertised.
change the oder of arguments for faction.create (race is the only thing not optional).
 2017-03-17 22:46:10 +01:00
Enno Rehling
49140f131e allow PROMOTION and PROMOTE alternatives. 
German already allows this, and my ECheck change made it necessary for English, too:
https://bugs.eressea.de/view.php?id=2280
 2017-03-17 20:30:07 +01:00
Enno Rehling
beb498d70c remove leftover code/data for artrewards. 2017-03-16 19:40:51 +01:00
Enno Rehling
ac12cb966d implement fixed wage functions, select by constant value 2017-03-16 16:07:52 +01:00
Enno Rehling
67a566d728 remove CRTAG_LOCLE define and lookups 2017-03-16 08:13:36 +01:00
Enno Rehling
e68510a07e use report locae, not default, for EFFECTS and GRENZE 2017-03-15 21:30:53 +01:00
Enno Rehling
8d8173def3 remove the functions struct from settings (next: remove wage, too) 2017-03-13 09:30:20 +01:00
Enno Rehling
8cfcffc4aa remove data_turn and gamename from global settings. 
make run-turn.sh work without valgrind
 2017-03-13 09:19:37 +01:00
Enno Rehling
907f07aada Merge pull request #677 from ennorehling/develop 
BUG 2301: validate entries in eressea.ini
 2017-03-12 21:10:59 +01:00
Enno Rehling
ba3f3a17d3 require that main.c declare any ini variables that we might expect. 2017-03-12 21:03:38 +01:00
Enno Rehling
4b88a5abc7 BUG 2301: validate [game] section in eressea.ini 
load_inifile is old stuff, should use config_get instead.
 2017-03-12 19:48:44 +01:00
Enno Rehling
121b54f58b Merge pull request #676 from ennorehling/develop 
BUG 2313: count of units and people is wrong
 2017-03-12 17:36:02 +01:00
Enno Rehling
7b4550b9d6 kill faction.nregions, it is calculated but never read. 2017-03-12 14:20:34 +01:00
Enno Rehling
627f5ba2d1 BUG 2313: summary should not reset num_people. 
it did not count spells correctly.
 2017-03-12 14:18:42 +01:00
Enno Rehling
a93dc5459b BUG 2313: spells must not be counted. 
https://bugs.eressea.de/view.php?id=2313
 2017-03-12 13:39:25 +01:00
Enno Rehling
d8e5feac61 additional test for bug 2313. 
do not count spells toward num_unit or num_people.
 2017-03-12 13:24:32 +01:00
Enno Rehling
decc38a056 BUG 2313: proper accounting in remove_unit. 
https://bugs.eressea.de/view.php?id=2313
 2017-03-12 13:02:55 +01:00
Enno Rehling
720c41c1bf reproduce bug 2313. 
recruiting breaks f->num_units.
 2017-03-12 12:53:10 +01:00
Enno Rehling
39ec03b2af coverity CID 164473 
remove logically dead code.
 2017-03-12 12:02:29 +01:00
Enno Rehling
ae41cafcb4 fix double free in new lighthouse code 2017-03-12 11:19:40 +01:00
Enno Rehling
a71dc4f93e Merge pull request #675 from ennorehling/develop 
BUG 2285, 2310, 2311: enforce unit limits
 2017-03-11 20:53:22 +01:00
Enno Rehling
4c21ff5d63 BUG 2311: enforce all unit limits. 2017-03-11 20:30:17 +01:00
Enno Rehling
21e260907c BUG 2311: unit limits were not enforced by GIVE. 2017-03-11 20:03:49 +01:00
Enno Rehling
d633c2a9fb BUG 2310: counting units and people. 
reduce number of count_all loops made,
make f->num_units and f->num_people be correct.
 2017-03-11 19:36:26 +01:00
Enno Rehling
0f2744fcf3 BUG 2285: remove factions' wealthfrom statistics. 2017-03-11 18:10:23 +01:00
Enno Rehling
d40a4372fc Merge pull request #674 from ennorehling/master 
BUG 2306, TRANSLATIONS
 2017-03-11 17:34:53 +01:00
Enno Rehling
94fe14769e Merge branch 'master' of https://github.com/ennorehling/eressea.git 2017-03-11 17:22:43 +01:00
Enno Rehling
a31de0da4f BUG 2306: TRANSLATIONS Plural/Singular mixup. 
https://bugs.eressea.de/view.php?id=2306
 2017-03-11 17:22:40 +01:00
Enno Rehling
f7ca4627d1 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2017-03-11 16:55:29 +01:00
Enno Rehling
19e1882eec Merge remote-tracking branch 'upstream/develop' into develop 2017-03-11 16:39:59 +01:00
Enno Rehling
858074501e additional comments 2017-03-11 16:37:54 +01:00
Enno Rehling
66a0bc83e5 Merge pull request #673 from ennorehling/profile-hashstring 
speed up some code based on profiling
 2017-03-11 16:28:25 +01:00
Enno Rehling
2b4d2db112 VS 15 not yet supported. 2017-03-11 16:23:33 +01:00
Enno Rehling
783bba0467 Merge pull request #672 from ennorehling/lighthouse-speedup 
lighthouses speedup
 2017-03-11 16:17:37 +01:00
Enno Rehling
496c57cb3d Merge branch 'develop' into profile-hashstring 2017-03-11 16:14:31 +01:00
Enno Rehling
3f562e7fc9 Merge branch 'develop' into lighthouse-speedup 
Conflicts:
	src/reports.c
	src/reports.test.c
 2017-03-11 16:08:14 +01:00
Enno Rehling
0bfd1feee6 Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	src/kernel/item.c
 2017-03-11 14:49:31 +01:00
Enno Rehling
18179a550d Merge remote-tracking branch 'upstream/master' 2017-03-11 14:48:48 +01:00
Enno Rehling
51ec560f72 Merge branch 'master' into develop 
Conflicts:
	scripts/tests/e2/init.lua
	scripts/tests/e3/init.lua
	src/economy.c
	src/economy.test.c
	src/kernel/item.c
	src/modules/arena.c
 2017-03-11 14:41:25 +01:00
Enno Rehling
ec68f0a0ae Merge pull request #671 from ennorehling/master 
refactoring tests
 2017-03-11 14:34:54 +01:00