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

7938 Commits

Author SHA1 Message Date
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
Enno Rehling 6a612b3b2a Merge branch 'locales' into develop 2017-02-09 23:33:27 +01:00
Enno Rehling b504899b07 fix locale initialization 2017-02-09 23:28:50 +01:00
Enno Rehling f48dd41538 fix a segfault in free_Races 2017-02-07 21:37:38 +01:00
Enno Rehling 60497da87b print error message when missing parameter translation. 2017-02-07 20:52:31 +01:00
Enno Rehling 9c6a72f55e Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-02-07 18:23:12 +01:00
Enno Rehling 8ffa091936 do not abort xml parsing when there is no calendar 2017-02-06 20:34:11 +01:00
Enno Rehling d851554ebe MSVC doesn't like to do integer->char conversions. 2017-02-06 18:16:34 +01:00
Enno Rehling baf3275eba valgrind: always terminate options 2017-02-06 11:52:07 +01:00
Enno Rehling 2267373b2e gcc warning 2017-02-06 10:44:11 +01:00
Enno Rehling 28c951bdfd eliminate race.parameters. 
move all special properties to race.options
 2017-02-06 09:46:36 +01:00
Enno Rehling 998dcffab2 introduce an rcoption struct. 
used for pretty rare options that have no property in the race struct.
 2017-02-06 09:03:08 +01:00
Enno Rehling de10a8ad65 reduce side-effects in snowglobe tests. 
should no longer be intermittent.
 2017-02-05 20:48:44 +01:00
Enno Rehling 492aba543b delete at_scare 
delete dead code (race.attribs has no at_skillmod)
delete race.attribs
 2017-02-05 19:30:09 +01:00
Enno Rehling 67414f29eb wrap ai.scare and at_scare in rc_set_param 2017-02-05 19:26:07 +01:00
Enno Rehling f2ed2c892a bugfix: Drachen "scare" attribut 
muss mit MOD, nicht AND angewendet werden. rng_int() & 400 ist eine bekloppte Rechnung.
 2017-02-05 18:42:06 +01:00
Enno Rehling bd836b76e1 channel XML race.parameters through a single, tested, function 2017-02-05 16:55:51 +01:00
Enno Rehling 117d37e2ea do not specify rules at command line. it is in eressea.ini 2017-02-05 14:48:43 +01:00
Enno Rehling 381b03cfd9 Merge pull request #650 from ennorehling/develop 
struct race refactorings
 2017-02-04 23:53:30 +01:00