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

8550 Commits

Author SHA1 Message Date
Enno Rehling 406f8ca3e6 BUG 2315: always use plural for resources 2017-03-26 20:25:01 +02:00
Enno Rehling 89a20824e3 backwards compat for old rm_iron etc. tokens in save 2017-03-26 17:46:55 +02:00
Enno Rehling 588914bc36 fix duplicate _LP64 define 2017-03-26 17:41:53 +02:00
Enno Rehling 39a5b55753 bugfix? mine grants +1 to laen production. 
not certain that this is actually a bug.
 2017-03-26 17:40:13 +02:00
Enno Rehling bd40de1142 additional testing for production rules. 2017-03-26 17:38:45 +02:00
Enno Rehling dcf1c7138b make region:set_resource do the right thing 
also for adamantium
 2017-03-26 14:33:14 +02:00
Enno Rehling 10edb1d3e9 enable process_orders to be done in steps. 
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
 2017-03-26 13:10:23 +02:00
Enno Rehling ec375baa03 Zwergenbonus gibt es nur in E2 2017-03-26 12:48:44 +02:00
Enno Rehling afd1cb4039 cherry-pick test for mine and smithy 2017-03-26 12:45:38 +02:00
Enno Rehling 8b87eb608f pdcurses version 3.4 warning suppression. 2017-03-26 12:39:14 +02:00
Enno Rehling d238e18191 fix duplicate definition 2017-03-25 18:36:27 +01:00
Enno Rehling ce0c6a0d32 pdcurses version 3.4 warning suppression. 2017-03-25 18:35:00 +01:00
Enno Rehling 733c754e0f rename some configuration options. 
add them to the valid keys for eressea.ini, too.
 2017-03-25 14:15:01 +01:00
Enno Rehling 868f4e6cef also apply noerror rules to msg_feedback. 2017-03-25 11:36:29 +01:00
Enno Rehling b44c5e54bf Neuer Befehlespräfix: ! zur Unterdrückung von Fehlern. 2017-03-25 11:18:48 +01:00
Enno Rehling f4f287f33c Merge pull request #679 from ennorehling/develop 
ongoing refactoring and tests
 2017-03-24 20:22:43 +01:00
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