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

10478 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Enno Rehling
0895ccd5d9 Bug 2527: PASSWORD command handling of bad passwords. 2018-12-03 19:19:06 +01:00
Enno Rehling
37f964e0ca Merge remote-tracking branch 'upstream/master' 2018-12-03 16:22:47 +01:00
Enno Rehling
7d9280b463 fix problems with passwords > 15 characters 2018-12-03 10:09:03 +01:00
Enno Rehling
76ec564f78 Merge branch 'master' into develop 2018-12-02 21:41:23 +01:00
Enno Rehling
069a94f830
Merge pull request #823 from ennorehling/master 
bugfixes for 3.18.2
 2018-12-02 21:02:25 +01:00
Enno Rehling
ae0415cf8d fixing itoa on unix 2018-12-02 20:33:11 +01:00
Enno Rehling
ba3c63160d fixing itoa on unix 2018-12-02 20:32:34 +01:00
Enno Rehling
c203ffce08 Bug 2526: Fehlende Leerzeichen bei Items. 2018-12-02 17:13:55 +01:00
Enno Rehling
3057031077 Merge branch 'master' of https://github.com/ennorehling/eressea 2018-12-02 16:33:41 +01:00
Enno Rehling
ac9db0c87b Bug 2525: fix default oder preservation. 2018-12-02 15:55:01 +01:00
Enno Rehling
c856228d5e variable scope reduction 2018-12-02 15:52:16 +01:00
Enno Rehling
a9f3592228 Bug 2525: failing test for default orders. 2018-12-02 15:51:35 +01:00
Enno Rehling
15a6d9217b cppcheck style 2018-12-02 11:13:58 +01:00
Enno Rehling
bcdeaaa83a fewer warnings from cppcheck 2018-12-02 11:07:34 +01:00
Enno Rehling
a949cfd345 ignore cppcheck configurations, but not tests 2018-12-02 11:07:34 +01:00
Enno Rehling
dd7b0e4db3 re-enable disabled test. 2018-12-02 05:10:39 +01:00
Enno Rehling
01b7538ffd remove jsreport. 
fix some cppcheck warnings.
 2018-12-02 05:04:58 +01:00
Enno Rehling
025cf18ab2 start adding legacy tests for paragraph 2018-12-01 21:56:21 +01:00
Enno Rehling
924ce441dd fix overly long lines in NR. 2018-12-01 21:51:52 +01:00
Enno Rehling
3193c74fe2 Merge remote-tracking branch 'upstream/develop' into develop 2018-12-01 21:24:41 +01:00
Enno Rehling
e58b3acfd7 Merge remote-tracking branch 'upstream/master' 2018-12-01 21:24:24 +01:00