Commit graph

9931 commits

Author SHA1 Message Date
Enno Rehling
793a666969 remove UTF-8 BOM from sources 2019-02-06 22:29:09 +01:00
Enno Rehling
e2607a3e7c fix merge error 2019-02-03 04:17:11 +01:00
Enno Rehling
818b309ebf eliminate warnings from cppcheck 2019-02-02 21:20:23 +01:00
Enno Rehling
88dd9203dd Merge remote-tracking branch 'upstream/develop' into develop 2019-02-02 21:18:59 +01:00
Enno Rehling
0043690650 Merge branch 'master' into develop 2019-02-02 21:17:23 +01:00
Enno Rehling
4edff66e61
Merge pull request #834 from ennorehling/master
hot stuff
2019-02-02 21:13:05 +01:00
Enno Rehling
97a78ad6b0 Merge branch 'master' of https://github.com/ennorehling/eressea 2019-02-02 20:38:11 +01:00
Enno Rehling
af91459fb1 add some variety to familiar selection.
effskill: use NULL, not 0 for pointer arguments.
2019-02-02 20:38:02 +01:00
Enno Rehling
20e0e8400b eliminate MAX/MIN macros completely 2019-01-24 17:51:26 +01:00
Enno Rehling
9b113c050e eliminate MIN and MAX macros 2019-01-24 16:34:07 +01:00
Enno Rehling
5a01ea14b6 reserve memory for backtrace before it runs out 2019-01-24 16:18:58 +01:00
Enno Rehling
5b167077a9 review some flawfinder warnings 2019-01-24 14:26:11 +01:00
Enno Rehling
a4873d7a12 re-undo splint warning fizes 2019-01-24 14:26:11 +01:00
Enno Rehling
2defef021f fix some weak splint warnings 2019-01-24 14:26:11 +01:00
Enno Rehling
ef8139067e
Remove missing package
Ok
2019-01-22 16:48:22 +01:00
Enno Rehling
dba46ac480 add scan-build to travis build 2019-01-22 16:17:16 +01:00
Enno Rehling
fbdd3c2fee Merge branch 'master' into develop 2019-01-21 11:10:12 +01:00
Enno Rehling
49e186b742
Merge pull request #833 from ennorehling/master
Simple Bugfix
2019-01-21 11:07:25 +01:00
Enno Rehling
148146d94e BUG 2540: Vertraute ohne Auraim CR repariert 2019-01-21 11:00:31 +01:00
Enno Rehling
172387e6bc BUG 2549 promote after recruit
calculating max units before PROMOTE requires that all recruitment has finished.
2019-01-20 16:51:04 +01:00
Enno Rehling
f56bbd64c1
Merge pull request #832 from ennorehling/develop
ongoing development
2019-01-20 03:12:29 +01:00
Enno Rehling
55c8b9f72a fix shellcheck 2019-01-20 03:09:35 +01:00
Enno Rehling
8eba9d6eaf fix getfaction script, return email 2019-01-20 03:06:33 +01:00
Enno Rehling
dda0fd9d27 fix sendreport script 2019-01-20 02:48:14 +01:00
Enno Rehling
5943047745 MSVC debugger gets confused when two structs have the same name 2019-01-18 22:26:55 +01:00
Enno Rehling
291f2d7113 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2019-01-13 19:19:06 +01:00
Enno Rehling
5648830b4d Vereinfachte Statistik für Durchreiseregionen anzeigen. 2019-01-13 19:17:31 +01:00
Enno Rehling
10783a05e3 newline after travelthru message 2019-01-13 09:49:55 +01:00
Enno Rehling
96cf9c3e8d
Merge pull request #831 from ennorehling/develop
2531: Passworte in der Vorlage
2019-01-12 21:39:55 +01:00
Enno Rehling
f96e88e3e0 write a warning in the template about password replacement.
for new factions, put the generated password into the template.
normalize and secure password generation.
2019-01-12 21:26:48 +01:00
Enno Rehling
2477349092 missing newline 2019-01-12 08:05:05 +01:00
Enno Rehling
d5e5993cb0 Some tests for WORK and wages. 2019-01-08 19:51:42 +01:00
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