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

9949 Commits

Author SHA1 Message Date
Enno Rehling 946690a805 Check that groups are cleared when units are transferred. 2019-01-05 14:13:52 +01:00
Enno Rehling 162f927e5a New tests for give_unit and migrants. 2019-01-04 21:34:37 +01:00
Enno Rehling c214535591 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-12-18 16:39:51 +01:00
Enno Rehling a848a1b2ee fix source encodings, break umlauts, ASCII everywhere 2018-12-17 12:07:51 +01:00
Enno Rehling 45de8535a0 Someone was casting leaveastral with more than 32 arguments recently. 2018-12-16 16:36:09 +01:00
Enno Rehling 4fee151f35 fix compilation 2018-12-16 09:48:39 +01:00
Enno Rehling 3fec7eb4e3 starting to see diminishing returns. 2018-12-15 20:13:44 +01:00
Enno Rehling 7b8bc8af0f more allocation checks. 2018-12-15 20:01:51 +01:00
Enno Rehling 7ea64be314 code analysis scan. 
add checks for malloc results.
reduce stack size.
 2018-12-15 19:38:40 +01:00
Enno Rehling 933bf2c596 include what you use 2018-12-15 18:42:31 +01:00
Enno Rehling 48dc5057b3 remove unused function 2018-12-15 18:17:06 +01:00
Enno Rehling 6bf9bf7f35 readorders was deprecated and is now gone. 2018-12-15 18:15:39 +01:00
Enno Rehling e7b6bff827 order atoi36 conditions by likeliness. 2018-12-15 18:14:36 +01:00
Enno Rehling 3e793f11be
Merge pull request #829 from ennorehling/develop 
ongoing updates, new releases
 2018-12-15 17:52:55 +01:00
Enno Rehling a6a86520d6 Merge branch 'master' into develop 2018-12-15 15:44:07 +01:00
Enno Rehling 199b9abcf6 Merge remote-tracking branch 'upstream/develop' into develop 2018-12-15 15:44:02 +01:00
Enno Rehling 2564603b67 Merge remote-tracking branch 'upstream/master' 2018-12-15 15:43:34 +01:00
Enno Rehling 0473d76f45
Merge pull request #828 from ennorehling/master 
Vertrautenzauber reparieren.
 2018-12-15 15:40:02 +01:00
Enno Rehling 21c7266a8f cmake (on macOS) already has a FindLua module 2018-12-12 09:41:21 +01:00
Enno Rehling 54579c95aa Merge branch 'develop' of github.com:ennorehling/eressea into develop 2018-12-12 09:12:22 +01:00
Enno Rehling 264822a354 reduce variables scope (cppcheck warnings). 2018-12-11 19:57:27 +01:00
Enno Rehling dd7ffb5987 comment copypasta 2018-12-11 19:37:34 +01:00
Enno Rehling 6d5ab44411 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-12-11 19:36:14 +01:00
Enno Rehling bb5fb78a46 comment copypasta 2018-12-11 19:36:07 +01:00
Enno Rehling 4e9b4a35c3 do not use macros for va_copy, which is available from C99 on and with gcc >= 3.0. 
this somehow eliminates bogus cppcheck warnings
 2018-12-11 19:34:28 +01:00
Enno Rehling 494e2054bf Merge branch 'master' into develop 2018-12-09 20:06:12 +01:00
Enno Rehling f0a1fe6134 BUG 2536 fix broken familiar spellbooks 2018-12-09 20:05:44 +01:00
Enno Rehling 14444915df stop coverity warning (realloc). 2018-12-09 18:56:04 +01:00
Enno Rehling 1ca1c7cfea re-enable intermittent test, supplement unit test. 
Untote reservieren nichts von anderen Einheiten.
 2018-12-09 14:41:14 +01:00
Enno Rehling 6e070849fd
Merge pull request #827 from ennorehling/develop 
Kampfzauber, Waffenwahl
 2018-12-09 10:42:14 +01:00
Enno Rehling c867120772 BUG 2535: Anzeige von Kampfzaubern. 
use sbs_printf where possible.
 2018-12-09 10:30:33 +01:00
Enno Rehling c815916fda Merge branch 'master' into develop 2018-12-09 10:27:53 +01:00
Enno Rehling 9ae603803f Bug 2533 fix weapon selection 
disable undead_reserve test in master, because it is intermittent.
 2018-12-09 10:21:58 +01:00
Enno Rehling fdf60c9dd5
Merge pull request #826 from ennorehling/develop 
cppcheck and password stuff
 2018-12-09 03:54:06 +01:00
Enno Rehling e47da17cc6 Merge branch 'master' into develop 2018-12-09 03:48:29 +01:00
Enno Rehling f7b9153083 Merge branch 'master' of https://github.com/ennorehling/eressea 2018-12-09 03:43:42 +01:00
Enno Rehling c27975f01b Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-12-09 03:43:10 +01:00
Enno Rehling 089be4bca8 cppcheck style warnings: reduce variable scope 2018-12-09 03:42:57 +01:00
Enno Rehling 208ed4c74a
Merge pull request #825 from ennorehling/develop 
Vorwärts!
 2018-12-08 20:15:53 +01:00
Enno Rehling e03f3c95a3 BUG 2531: new factions get a fresh password every turn until they send their first orders, which is shown in the report. 2018-12-06 20:04:45 +01:00
Enno Rehling 201a685d12 Merge branch 'master' into develop 2018-12-06 18:49:43 +01:00
Enno Rehling 07383bd94f fix warning for no orders received 2018-12-06 18:49:10 +01:00
Enno Rehling 1a07b3bf66 fix dupe declaration merge snafu 2018-12-04 21:16:47 +01:00
Enno Rehling c2eaf704d1 Merge branch 'master' into develop 2018-12-04 21:14:48 +01:00
Enno Rehling 290a90ac22 Merge remote-tracking branch 'upstream/master' 2018-12-04 21:14:13 +01:00
Enno Rehling 95498171d7 cppcheck: bug in defense weapon selection 2018-12-04 21:12:39 +01:00
Enno Rehling bf61a2284e Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2018-12-04 21:11:50 +01:00
Enno Rehling 2ac6a6826d some static analysis warnings (cppcheck and msvc). 2018-12-04 21:11:40 +01:00
Enno Rehling f46f91e162
Merge pull request #824 from ennorehling/master 
password fixes for 3.18.2
 2018-12-03 21:17:19 +01:00
Enno Rehling 0f95e77a7b BUG 2528: fix windows newlines 2018-12-03 21:05:48 +01:00