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

7956 Commits

Author SHA1 Message Date
Enno Rehling a754975ef9 fix loading data where embassy uses floats. 2017-02-18 17:52:25 +01:00
Enno Rehling d5dcf14a56 Merge pull request #659 from ennorehling/develop 
gcd and rounding error
 2017-02-18 16:08:08 +01:00
Enno Rehling 9bc34a242f Merge branch '2279-fixes' into develop 2017-02-18 15:55:42 +01:00
Enno Rehling 9682d6b48c implement quick-and-dirty gcd 2017-02-18 15:45:57 +01:00
Enno Rehling aee68fbd0f github issue #658 
MACHE 1 EISEN use 1 iron even with savings.
 2017-02-18 11:19:42 +01:00
Enno Rehling d43ccd406a Merge pull request #657 from ennorehling/develop 
BUG 2279: store material savings as a fraction
 2017-02-17 22:16:24 +01:00
Enno Rehling 0a3e3de5a3 refactor fractions a little bit. 2017-02-17 22:01:51 +01:00
Enno Rehling 2328975dc2 do not use floats for material-save. 
abusing variants for storing short fractions.
remove unused RMF_SAVERESOURCE.
 2017-02-17 21:45:10 +01:00
Enno Rehling 01cdfcd2a6 Merge pull request #656 from ennorehling/develop 
BUG 2279: Zuviel Eisen aus der Region abgezogen
 2017-02-16 20:52:28 +01:00
Enno Rehling ed94ef6d48 Merge branch '2279-alloc-save' into develop 2017-02-16 20:36:30 +01:00
Enno Rehling a624915a06 error message if building is required. 
was broken in recent commit.
also fix reference counts.
 2017-02-16 20:26:34 +01:00
Enno Rehling a5dfe12d48 initialize variable 2017-02-16 19:38:09 +01:00
Enno Rehling 20ff8981df trying to extract allocation modifiers into a separate function 2017-02-16 10:19:59 +01:00
Enno Rehling 50083fc668 BUG 2279: too many resources used. 
diddling the resource-save formula until test passes.
 2017-02-15 21:16:54 +01:00
Enno Rehling 5902a6922f BUG 2279: add a failing unit test. 2017-02-15 20:50:45 +01:00
Enno Rehling 5680057e7f adding simple test for MAKE <ITEM> 2017-02-15 17:09:23 +01:00
Enno Rehling 635edf314d Merge pull request #655 from ennorehling/develop 
BUG 2281: guardhouses are unlimited
 2017-02-14 21:16:58 +01:00
Enno Rehling 7947101899 factor out some function to make future debugging easier. 2017-02-14 21:01:22 +01:00
Enno Rehling 4ce415be50 BUG 2281: fix maxsize of guard towers. 2017-02-14 20:51:03 +01:00
Enno Rehling 1dcb21b08c bug 2281: add a failing test 
https://bugs.eressea.de/view.php?id=2281
 2017-02-14 20:30:24 +01:00
Enno Rehling 623137e872 test guardhouse level limits. 2017-02-14 19:57:31 +01:00
Enno Rehling 08e14f3095 coverity warnings 2017-02-14 16:23:40 +01:00
Enno Rehling aa230cc191 fix coverity warnings 2017-02-14 12:15:36 +01:00
Enno Rehling 3ea12be564 BENUTZE Muschel repariert. 
at_keys hat jetzt auch zu jedem key ein value, und Funktionen zum Update altee Daten.
 2017-02-13 18:48:38 +01:00
Enno Rehling b031002bc2 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-12 20:09:30 +01:00
Enno Rehling e9ca536e8e Merge branch 'master' into develop 2017-02-12 20:08:29 +01:00
Enno Rehling 2a71a3fc8f Merge pull request #654 from ennorehling/master 
bug 2282: at_keys can have 0 keys
 2017-02-12 20:06:51 +01:00
Enno Rehling f132dfe4d4 bug 2282: Datenfile 2012 kaputt. 
make the reader for at_keys accept that sometimes, there are 0 keys.
 2017-02-12 19:57:02 +01:00
Enno Rehling e282035859 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-12 19:38:00 +01:00
Enno Rehling 160ba008ed Merge pull request #653 from ennorehling/develop 
Bug 2253: never give mages to another unit
 2017-02-12 19:37:29 +01:00
Enno Rehling 182fc3fa3c remove test for bug 2253 2017-02-12 19:32:27 +01:00
Enno Rehling 4828045fd7 there is no NEWATSROI, remove dead code 2017-02-12 18:52:41 +01:00
Enno Rehling b05c2564e5 make att_modification not crash when a good/bad dream curse has no magician. 2017-02-12 13:22:44 +01:00
Enno Rehling 69fd8edb8b Merge pull request #652 from ennorehling/develop 
finish locale refactoring for now.
 2017-02-12 06:31:40 +01:00
Enno Rehling a4bd4320e5 fix bad read_orders call 2017-02-12 06:24:25 +01:00
Enno Rehling 75514014bc no need to create locale here 2017-02-12 06:20:37 +01:00
Enno Rehling ac8250ecd8 remove global read_orders binding 2017-02-12 06:14:29 +01:00
Enno Rehling 6893248473 jsonconf should not need to create locales 2017-02-12 06:06:33 +01:00
Enno Rehling 17ff2ead41 make_locales from config_get 2017-02-12 05:52:46 +01:00
Enno Rehling e5c95f1501 avoid division by zero when no calendar is configured 2017-02-12 05:09:23 +01:00
Enno Rehling e69a7f0063 Merge remote-tracking branch 'upstream/develop' into develop 2017-02-11 22:50:24 +01:00
Enno Rehling 17fc2adcb5 Merge pull request #651 from ennorehling/develop 
refactoring: race, locale, dict removal pt. 1
 2017-02-11 22:48:41 +01:00
Enno Rehling b56538e092 remove test for dicts 2017-02-11 22:37:15 +01:00
Enno Rehling 422af9dd4d Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-02-11 22:29:02 +01:00
Enno Rehling f6fcd39293 add a failing test for familiars (disabled). 
remove superfluous init_locales calls.
 2017-02-11 22:28:57 +01:00
Enno Rehling 40de740a0a remove dict from ships and buildings, too 2017-02-11 22:24:36 +01:00
Enno Rehling 10e78b1455 remove code for dict and lua .objects properties. 
rewrite muschelplateau code to use keys.
 2017-02-11 22:15:21 +01:00
Enno Rehling c897108a2c clibs latest 2017-02-11 20:58:34 +01:00
Enno Rehling 853f63b501 delete unitmessage trigger, it is unused 2017-02-11 20:27:13 +01:00
Enno Rehling 2ee0e599b1 initialize game after loading config 2017-02-11 17:38:39 +01:00