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

4222 Commits

Author SHA1 Message Date
Enno Rehling 7dbb417b93 Bug 2575 2019-05-11 20:52:06 +02:00
Enno Rehling 7a59a11c20 Merge branch 'master' into develop 2019-05-08 21:09:39 +02:00
Enno Rehling 5c7788ecdd Merge branch '2541-quit' into develop 2019-05-04 12:01:55 +02:00
Enno Rehling cd28f3aee4 heroes lose their status when gifted. 2019-05-04 11:11:30 +02:00
Enno Rehling 2cb4287268 do not transfer migrants. comments are good. 2019-05-04 11:06:56 +02:00
Enno Rehling 8605409ed3 limited-skill units are only transferred up to the limit. 2019-05-04 10:45:51 +02:00
Enno Rehling 6637c94852 do not allow transfer of heros and limited units. 2019-05-01 20:46:26 +02:00
Enno Rehling 7b3b792d01 Nicht Sonnensegel verhindert Sturmelementar, sondern Sturmelementar verhindert Sturmelementar. 2019-05-01 20:08:14 +02:00
Enno Rehling b13deb2b04 test maximum shipspeed with all modifiers 2019-04-30 22:06:08 +02:00
Enno Rehling 8c0fc4bd91 2577: Fix resource values, again. 2019-04-30 18:56:37 +02:00
Enno Rehling bbcb2113d7 WIP feature: STIRB <password> [PARTEI <nr>] 2019-04-30 18:40:24 +02:00
Enno Rehling 968f67a567 delete intermittent test: ents have no special guarding powers. 2019-04-27 18:30:30 +02:00
Enno Rehling cffcac8af7 fix binding faction.no to sqlite statement. 2019-04-26 23:54:22 +02:00
Enno Rehling 2442aed1db null pointer handling for strlcpy 2019-04-25 16:31:35 +02:00
Enno Rehling 692cdcea13 Rechtschreibung 
Dragon Evolution: hitpoint tweaking.
 2019-04-25 08:44:48 +02:00
Enno Rehling 5acfdf5cd0 fix unused variable warning. 2019-04-24 15:13:27 +02:00
Enno Rehling 75dfed8082 Leerzeichen aus Beschreibungen trimmen. 2019-04-24 13:09:59 +02:00
Enno Rehling 7298968921 schema version 2 
faction no is a char(4), not an int.
 2019-04-24 08:08:50 +02:00
Enno Rehling aab234a3f4 update to schema version 1 
- factions table is now faction
- no turn column
- new update logic
 2019-04-23 13:19:14 +02:00
Enno Rehling 91e40b7061 Bug 1982: Klone auflösen, und Magiern ihre permanete Aura und Trank zurück geben. 2019-04-07 21:37:06 +02:00
Enno Rehling 3f021b21cd Bug 1982: disable the clone spell. 2019-04-07 17:55:04 +02:00
Enno Rehling 94f54dc105 Merge branch 'master' of github.com:ennorehling/eressea 2019-04-07 16:07:10 +02:00
Enno Rehling c92f7505e5 Bug 2576: additional logging. 
increase log verbosity, decrease some log levels.
 2019-04-07 15:28:47 +02:00
Enno Rehling ca5e7b82ae Bug 2570: Linie vor jeder Region, Leerzeilen aufgeräumt. 2019-04-07 15:27:11 +02:00
Enno Rehling bcca812ecc Bug 2576: additional logging. 
increase log verbosity, decrease some log levels.
 2019-04-07 13:11:02 +02:00
Enno Rehling 510b6c2628 Zeige keine Luxusgüter-Statistik im Ozean. 2019-04-06 19:00:59 +02:00
Enno Rehling df746dd342 Newbie islands should not have volcano terrain. 2019-04-05 17:14:28 +02:00
Enno Rehling 6351f04916 blnak line conflict? 2019-04-03 18:24:42 +02:00
Enno Rehling 3b1a615f25 Merge branch 'master' into develop 2019-03-31 21:20:21 +02:00
Enno Rehling 29a9d8d30b Merge remote-tracking branch 'upstream/master' 2019-03-31 21:18:35 +02:00
Enno Rehling 17484e220f Bug 2569: Rostregen macht zu viele Waffen kaputt. 2019-03-31 21:03:31 +02:00
Enno Rehling 8868855837 allow setting password to null 2019-03-31 18:14:37 +02:00
Enno Rehling 53662878aa minor cleanup 2019-03-31 10:19:02 +02:00
Enno Rehling fc6bb36ee4 BUG 2566 mountains with no low-level resources. 
NB: new data version
 2019-03-24 21:27:43 +01:00
Enno Rehling 63b762a627 missing nul-termination triggers valgrind. 2019-03-24 17:51:41 +01:00
Enno Rehling 7c01170563 Merge branch 'master' into develop 2019-03-24 17:27:58 +01:00
Enno Rehling f1c27f09e3 dragon evolution gives full hitpoints. 2019-03-24 17:24:16 +01:00
Enno Rehling ea1bf3d3b9 Bug 2567: we had alliances with status 0 in the data. 2019-03-24 17:18:25 +01:00
Enno Rehling 2a702cbabc Merge remote-tracking branch 'upstream/develop' into develop 2019-03-18 10:37:13 +01:00
Enno Rehling d1fbd924e0 increase version number 2019-03-18 10:36:33 +01:00
Enno Rehling ef81a20c6e 2565 Leerzeile nach Helfe-Status. 
Helfestatus an das Ende des Reports.
 2019-03-11 21:37:32 +01:00
Enno Rehling 8cc38420f0 missing nul-termination triggers valgrind. 2019-03-03 13:13:46 +01:00
Enno Rehling 2a0688d1b4 re-enable undead check, I think it is fixed. 2019-03-03 13:12:37 +01:00
Enno Rehling 9f3f9d7c56 fix the new password test 2019-03-03 13:12:08 +01:00
Enno Rehling 8253d8f833 new players should have lastorders = 0, get password. 2019-03-03 13:11:20 +01:00
Enno Rehling 5dd12df100 BUG 2564: show new spells. 2019-03-03 13:11:03 +01:00
Enno Rehling 9210f77a1a fix bcrypt use 2019-03-03 09:44:44 +01:00
Enno Rehling 894bb4db4c BUG 2504: skeletons can learn. 
There was a mixup between the AI feature and the race capability, so I cleared up the code a little bit.
It's annoying that these flags are in the same int.
 2019-03-03 09:42:42 +01:00
Enno Rehling de06600394 fix coverity errors 2019-03-03 09:42:42 +01:00
Enno Rehling d03f2cdab6 Mantis 2552: rewrite goblin stealing to be more readable. 2019-03-03 09:42:42 +01:00
Enno Rehling 2e1bd01c54 asciification 2019-03-03 09:42:42 +01:00
Enno Rehling ffccf8014f asciification 2019-03-03 09:42:42 +01:00
Enno Rehling 1944c2c136 asciify more files 2019-03-03 09:42:42 +01:00
Enno Rehling debb86601b umlaut substitutions 2019-03-03 09:42:42 +01:00
Enno Rehling 9e44b8a989 kaputte umlaute ersetzt, ascii 4 lyfe 2019-03-03 09:42:42 +01:00
Enno Rehling 9436640d22 remove UTF-8 BOM from sources 2019-03-03 09:42:42 +01:00
Enno Rehling 35bbcac97b eliminate warnings from cppcheck 2019-03-03 09:42:41 +01:00
Enno Rehling 3b81b7797f eliminate MAX/MIN macros completely 2019-03-03 09:42:41 +01:00
Enno Rehling 24eacbb40d eliminate MIN and MAX macros 2019-03-03 09:41:53 +01:00
Enno Rehling 9214975732 reserve memory for backtrace before it runs out 2019-03-03 09:41:53 +01:00
Enno Rehling ebe1df4cb9 review some flawfinder warnings 2019-03-03 09:41:53 +01:00
Enno Rehling 6f771ace3e re-undo splint warning fizes 2019-03-03 09:41:53 +01:00
Enno Rehling 6f61ca87a7 fix some weak splint warnings 2019-03-03 09:41:53 +01:00
Enno Rehling f054bdf8cf BUG 2549 promote after recruit 
calculating max units before PROMOTE requires that all recruitment has finished.
 2019-03-03 09:41:53 +01:00
Enno Rehling dea177cc5e MSVC debugger gets confused when two structs have the same name 2019-03-03 09:41:53 +01:00
Enno Rehling 1f95a46e64 Vereinfachte Statistik für Durchreiseregionen anzeigen. 2019-03-03 09:41:53 +01:00
Enno Rehling 765e2c5c61 newline after travelthru message 2019-03-03 09:41:53 +01:00
Enno Rehling acbbf42db1 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-03-03 09:41:53 +01:00
Enno Rehling 9b3e651e9f missing newline 2019-03-03 09:41:15 +01:00
Enno Rehling b5624e6a8a Some tests for WORK and wages. 2019-03-03 09:41:15 +01:00
Enno Rehling cdb648b761 Check that groups are cleared when units are transferred. 2019-03-03 09:41:15 +01:00
Enno Rehling 92725faee6 New tests for give_unit and migrants. 2019-03-03 09:41:15 +01:00
Enno Rehling e9b2918209 fix source encodings, break umlauts, ASCII everywhere 2019-03-03 09:41:15 +01:00
Enno Rehling a597e97708 Someone was casting leaveastral with more than 32 arguments recently. 2019-03-03 09:41:15 +01:00
Enno Rehling 0de71b424a fix compilation 2019-03-03 09:41:15 +01:00
Enno Rehling 2a96fffeb5 starting to see diminishing returns. 2019-03-03 09:41:15 +01:00
Enno Rehling 484945d42a more allocation checks. 2019-03-03 09:41:15 +01:00
Enno Rehling 033070663a code analysis scan. 
add checks for malloc results.
reduce stack size.
 2019-03-03 09:41:15 +01:00
Enno Rehling a16c829218 include what you use 2019-03-03 09:41:15 +01:00
Enno Rehling 3d2bd2f1cd remove unused function 2019-03-03 09:41:15 +01:00
Enno Rehling 5764f71985 readorders was deprecated and is now gone. 2019-03-03 09:41:15 +01:00
Enno Rehling 0137d70221 order atoi36 conditions by likeliness. 2019-03-03 09:41:15 +01:00
Enno Rehling ca7f3fbf88 reduce variables scope (cppcheck warnings). 2019-03-03 09:41:15 +01:00
Enno Rehling 230a2d8fba do not use macros for va_copy, which is available from C99 on and with gcc >= 3.0. 
this somehow eliminates bogus cppcheck warnings
 2019-03-03 09:41:15 +01:00
Enno Rehling 6bf33f9fc2 stop coverity warning (realloc). 2019-03-03 09:41:15 +01:00
Enno Rehling 07d2278741 re-enable intermittent test, supplement unit test. 
Untote reservieren nichts von anderen Einheiten.
 2019-03-03 09:41:15 +01:00
Enno Rehling 230f7ca11f BUG 2535: Anzeige von Kampfzaubern. 
use sbs_printf where possible.
 2019-03-03 09:40:54 +01:00
Enno Rehling d0577a5d6a cppcheck style warnings: reduce variable scope 2019-03-03 09:40:22 +01:00
Enno Rehling 11c21d035a fix dupe declaration merge snafu 2019-03-03 09:39:52 +01:00
Enno Rehling 45c44a03fb some static analysis warnings (cppcheck and msvc). 2019-03-03 09:39:52 +01:00
Enno Rehling 83556f8010 cppcheck style 2019-03-03 09:39:52 +01:00
Enno Rehling 933914a301 re-enable disabled test. 2019-03-03 09:39:52 +01:00
Enno Rehling 11316a4992 remove jsreport. 
fix some cppcheck warnings.
 2019-03-03 09:39:52 +01:00
Enno Rehling 781acdbf6b start adding legacy tests for paragraph 2019-03-03 09:39:52 +01:00
Enno Rehling 2e79c51d00 fix overly long lines in NR. 2019-03-03 09:39:52 +01:00
Enno Rehling 3f9331cd09 fix string unit tests after strcpy was removed 2019-03-03 09:39:52 +01:00
Enno Rehling d162c2dee1 excise bsdstring from the project 2019-03-03 09:39:52 +01:00
Enno Rehling 5d99dc7014 add a printf function to sbstring (about time) 2019-03-03 09:39:52 +01:00
Enno Rehling 2766ed8de4 Bug 2521: Übersetzung von at_racename für Geister 2019-03-03 09:39:52 +01:00
Enno Rehling fbb7a6c418 convert report_template to sbstring 2019-03-03 09:39:52 +01:00
Enno Rehling 08cf00e700 more sbstring conversions 2019-03-03 09:39:52 +01:00
Enno Rehling 892b07c64c oops. broke test again with another case of too many periods. 2019-03-03 09:39:52 +01:00
Enno Rehling 97af710e97 fix display of luxury prices, period at end of description. 2019-03-03 09:39:52 +01:00
Enno Rehling 3291dcbe5b more sbstring use in reports. 
fix paragraph lines with very long words, indirectly test through region report.
 2019-03-03 09:39:52 +01:00
Enno Rehling 847361fef2 split region reporting into more and smaller functions. 2019-03-03 09:39:52 +01:00
Enno Rehling 5d80f99552 add a str_adopt constructor for sbstring. 2019-03-03 09:39:52 +01:00
Enno Rehling 164baecbd8 print spells with sbstring 2019-03-03 09:39:52 +01:00
Enno Rehling 32519e1683 version number increment 2019-03-03 09:39:52 +01:00
Enno Rehling 6c24956da7 unsigned/signed comparison 2019-03-03 09:39:52 +01:00
Enno Rehling 2483232537 unfuck str_strlcpy again. 2019-03-03 09:39:52 +01:00
Enno Rehling 5520372dfa define SIZE_MAX if needed. 2019-03-03 09:39:52 +01:00
Enno Rehling d4d7394e29 replace sbs_cut with more powerful sbs_substr 2019-03-03 09:39:52 +01:00
Enno Rehling 3be5211a53 fix a previously undetected bug in str_strlcpy. 2019-03-03 09:39:51 +01:00
Enno Rehling a597d06484 some factions have very long names, breaking my buffer. 
use sbstring with care.
fix hackish utf8 space detection.
 2019-03-03 09:39:27 +01:00
Enno Rehling 84871cc6c4 coverity 189780, realloc result check 2019-03-03 09:39:27 +01:00
Enno Rehling 56251ffdaf reduce big arrays on the stack, report allies with new pump_paragraph function (WIP) 2019-03-03 09:39:27 +01:00
Enno Rehling c200199569 fix the new password test 2019-03-03 09:37:16 +01:00
Enno Rehling d642ff0fe7 new players should have lastorders = 0, get password. 2019-03-03 09:32:24 +01:00
Enno Rehling d56eee9687 BUG 2504: skeletons can learn. 
There was a mixup between the AI feature and the race capability, so I cleared up the code a little bit.
It's annoying that these flags are in the same int.
 2019-02-16 20:14:34 +01:00
Enno Rehling f744cebe66 fix coverity errors 2019-02-15 10:07:55 +01:00
Enno Rehling 717fe4a803 Merge branch 'develop' of https://github.com/ennorehling/eressea into develop 2019-02-09 20:50:56 +01:00
Enno Rehling 7490a827d9 Mantis 2552: rewrite goblin stealing to be more readable. 2019-02-09 20:50:47 +01:00
Enno Rehling a84a89dc51 asciification 2019-02-09 13:39:28 +01:00
Enno Rehling 5868316537 asciification 2019-02-09 12:50:12 +01:00
Enno Rehling 642d043e7c asciify more files 2019-02-09 11:49:09 +01:00
Enno Rehling 35c6f30511 umlaut substitutions 2019-02-08 11:37:32 +01:00
Enno Rehling 2ecc710122 kaputte umlaute ersetzt, ascii 4 lyfe 2019-02-07 14:48:51 +01:00
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 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 fbdd3c2fee Merge branch 'master' into develop 2019-01-21 11:10:12 +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 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 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