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

4661 commits

Author SHA1 Message Date
Enno Rehling
eb16d7bf47 Bug 2645 TARNE [Stufe] reagiert auf Talentänderungen. 2020-03-01 17:55:07 +01:00
Enno Rehling
41cf41120f Bug 2640: Fehler in LERNE AUTO bei teilweisen Lehrern. 2020-03-01 14:24:31 +01:00
Enno Rehling
6ecd172ff4 LERNE AUTO: fix tests and logic some more. 
still haven't fixed the actual bug, algorithm is wrong.
 2020-02-25 20:35:55 +01:00
Enno Rehling
e5e936acc6 Bug 2640: LERNE AUTO sollte nicht alle Einheiten zu Lehrern delegieren. 
Fixt den konkreten Bug, fühlt sich aber immer noch nach einemn Spezialfall an?
 2020-02-21 21:12:19 +01:00
Enno Rehling
5ee5751475 Keine Befehle löschen, ist nicht nötig und verwirtr nur. 2020-02-20 21:09:04 +01:00
Enno Rehling
095e3d39ce Bug 2637: Monster sollen sich nicht parteitarnen. 2020-02-09 15:24:36 +01:00
Enno Rehling
b1098f7838 broke several monster behaviors, fixed. 2020-02-08 21:24:07 +01:00
Enno Rehling
3771b88bc6 typo, opps 2020-02-08 21:02:18 +01:00
Enno Rehling
40d63264d3 bug 2635: let only swimming units attack on ocean. 2020-02-07 22:12:24 +01:00
Enno Rehling
4886d29401 small code cleanup 2020-02-02 18:52:30 +01:00
Enno Rehling
bf867eb2d6 bug 2634 display number of ships to all factions. 2020-01-31 20:54:32 +01:00
Enno Rehling
63f4853875 crash in quit faction 
fix test modules that have no setup
add test for lazy trolls
 2020-01-26 12:32:31 +01:00
Enno Rehling
80b8bd7158 Merge branch 'master' into develop 2020-01-26 10:15:18 +01:00
Enno Rehling
42e17f3ba9 bug 2221: buildings cannot exceed maxsize. 
* enable the allies.lua tests
 2020-01-26 00:34:31 +01:00
Enno Rehling
356bb54bf3
Merge pull request #888 from ennorehling/develop 
fix tree growth crash, cew CR version
 2020-01-19 13:56:10 +01:00
Enno Rehling
3efcf97289 Fix for negative tree growth crash. 2020-01-19 13:45:38 +01:00
Enno Rehling
ec0d5b3754 new CR VERSION: remove MESSAGETYPES 2020-01-19 13:45:19 +01:00
Enno Rehling
54d0784b54 Kampfreport: Jede Partei hilft sich selbst, duh. 2020-01-18 21:25:40 +01:00
Enno Rehling
010487ac8d
Merge pull request #887 from ennorehling/develop 
trees and seeds
 2020-01-18 21:11:55 +01:00
Enno Rehling
a94e4219b1 automatic tree growth is a b*tch 2020-01-18 21:06:48 +01:00
Enno Rehling
3b09b401f7 Revert unnecessary trade limit bugfix 
This reverts commit 27aac671a4.
 2020-01-16 18:22:01 +01:00
Enno Rehling
b88f9e8610 remove duplicate calculation. 2020-01-15 23:08:11 +01:00
Enno Rehling
7aaa0fc301 Bug 2633: Porting the test from my "fix" to prove that it wasn't required. 2020-01-15 22:48:20 +01:00
Enno Rehling
27aac671a4 simplicate and add lightness 2020-01-14 21:00:54 +01:00
Enno Rehling
6626cfe297 Bug 2633: implement combined trade limits. 2020-01-14 20:57:29 +01:00
Enno Rehling
e02c1e9d00 Bug 2631: Kein Konvoi mit Sonnensegel. 2020-01-13 22:24:48 +01:00
Enno Rehling
06f00cae53 Bug 2632: no flying convoy 2020-01-13 22:21:26 +01:00
Enno Rehling
00ac549750 idiot-proofing the newfactions file parser 2020-01-08 20:57:29 +01:00
Enno Rehling
bfd89687cd when planting saplings, plant remaining seeds. 2020-01-07 20:37:21 +01:00
Enno Rehling
043949c8d0 Bug 2625 PFLANZE Implementation aufgeklärt, Tests geschrieben. 2020-01-07 20:28:43 +01:00
Enno Rehling
2e054f27cc Bug 2630: Drachen 
1. Jungdrachen sind Drachen (RCF_DRAGON)
2. Ein Monster das nicht kämpfen kann, braucht nicht zu plündern.
3. make code more readable.
4. Wer schon bewacht, braucht keinen BEWACHE Befehl.
 2020-01-07 19:24:10 +01:00
Enno Rehling
fb21d6d932 kill ancient godcursezone code. 
add some tests for planting seeds.
 2020-01-04 12:22:14 +01:00
Enno Rehling
32d2970965
Merge pull request #886 from ennorehling/develop 
Baumwachstum und Flotten-Meldungen
 2020-01-03 20:28:00 +01:00
Enno Rehling
84dfe46ce5 Revert "bug 2625 samen werden direkt zu schoesslingen" 
This reverts commit 4f88bf137e.
 2020-01-03 20:21:14 +01:00
Enno Rehling
e337b8b494 Bug 2626: Korrekter Meldungstext. 2020-01-03 17:14:44 +01:00
Enno Rehling
c8c22aea1b bug 2624: short range conversion bug in tree growth 2020-01-02 12:52:39 +01:00
Enno Rehling
4f88bf137e bug 2625 samen werden direkt zu schoesslingen 2020-01-02 12:10:38 +01:00
Enno Rehling
dcf9b9df26 bug 2626: fehlende neue messages nachtragen 2020-01-02 11:34:26 +01:00
Enno Rehling
d949d9a6d0 Bug 2623: Untote dürfen nicht in heilige Regionen ziehen. 
Code style fixes.
 2019-12-29 14:28:55 +01:00
Enno Rehling
cef5ff44eb Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-12-01 17:30:34 +01:00
Enno Rehling
5428211751 Merge remote-tracking branch 'upstream/master' into develop 2019-12-01 17:29:25 +01:00
Enno Rehling
0b623d0768 monster include structure, contd. 2019-12-01 17:28:51 +01:00
Enno Rehling
2573ab19b5 begin work on v3.23 2019-12-01 17:20:34 +01:00
Enno Rehling
08f7d267b8 version 3.22 is released 2019-12-01 17:18:59 +01:00
Enno Rehling
d6b5dea014 version 3.22 is released 2019-12-01 17:16:12 +01:00
Enno Rehling
b0792b57e9 move binding function declarations to headers. 2019-12-01 17:07:09 +01:00
Enno Rehling
633866c814 STIRB PARTEI: Versuche, Helden zu übernehmen. 2019-11-30 16:29:23 +01:00
Enno Rehling
1a8b94da59 STIRB PARTEI löscht die Befehle nicht. 
Reparatur des Tests für VERGESSE MAGIE (Vertraute)
 2019-11-24 16:39:21 +01:00
Enno Rehling
6b1baec2de Merge branch 'master' into develop 2019-11-18 19:44:37 +01:00
Enno Rehling
cd165d94ec Magier dürfen bei STIRB nicht übergeben werden. 2019-11-18 19:44:24 +01:00
Enno Rehling
dccde58221 Merge branch 'master' into develop 2019-11-18 19:34:05 +01:00
Enno Rehling
1bff7801ff transfer_faction respects magic schools. 2019-11-18 19:33:37 +01:00
Enno Rehling
beffa1d536 CID 205842: con is never NULL. 2019-11-18 18:48:28 +01:00
Enno Rehling
75000f2663 reduce struct person by 12 bytes on a 32-bit arch. 2019-11-17 19:55:41 +01:00
Enno Rehling
7850e84cea let's try increasing MAX_UNITSIZE to 128K 2019-11-02 21:37:33 +01:00
Enno Rehling
fd1b981983 simplify sail/travel, remove route from arguments. 2019-11-02 21:32:11 +01:00
Enno Rehling
52ee682a48 Bug 2617: Berechnung von Überladung berechnet Flotten korrekt. 2019-11-02 19:09:15 +01:00
Enno Rehling
0db8f2167b Bug 2618: Zusätzlicher Test Piraterie 2019-10-28 20:12:52 +01:00
Enno Rehling
7f57aa2a18 small copy/paste error 2019-10-27 10:57:32 +01:00
Enno Rehling
9b54784c94 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-10-27 10:56:32 +01:00
Enno Rehling
c8769a4412 Fehler in ship_crewed Berechnung 2019-10-27 10:56:16 +01:00
Enno Rehling
533a0aceec fix crash when following a lost ship 2019-10-23 23:17:31 +02:00
Enno Rehling
c82b3b27dd Bug 2616: FOLGE schiesst über das Ziel hinaus. 2019-10-22 21:30:14 +02:00
Enno Rehling
75a71c36aa ZERSTOERE Schiffe evtl. auch richtig? Best effort. 2019-10-22 18:46:00 +02:00
Enno Rehling
70b148296f MACHE beschädigte Konvois 2019-10-21 20:04:32 +02:00
Enno Rehling
d04fe741a9 https://bugs.eressea.de/view.php?id=2615 
in the report, calculate max size of ships correctly.
 2019-10-20 18:55:40 +02:00
Enno Rehling
d9cbbd9052 Bug 2614: Einheiten bewachen Region vor sich selbst. 2019-10-20 17:11:58 +02:00
Enno Rehling
12491ffc16 GIB 0 an Land kann alle Schiffe geben, auf Ozean nicht. 2019-10-10 20:24:18 +02:00
Enno Rehling
1d405e2ef8 GIB 0 n SCHIFFE 
Keine Boote erlauben
Übergabe an eigene Besatzung.
 2019-10-10 20:17:25 +02:00
Enno Rehling
78e44e0fe3 check compatible costs 2019-10-10 16:12:25 +02:00
Enno Rehling
24978a5b80 Schiffstransfer nur zwischen Kapitänen. 2019-10-08 21:14:01 +02:00
Enno Rehling
1e0afdc961 spells can only be cast on single ships. 2019-10-08 21:08:33 +02:00
Enno Rehling
b0e6ed430b GIB alle Schiffe an andere Einheit. 2019-10-08 04:52:41 +02:00
Enno Rehling
4052cb71ff Show convoy in reports. 2019-10-07 22:01:02 +02:00
Enno Rehling
f4011af784 GIB unit n SCHIFF implementiert. 2019-10-07 21:50:52 +02:00
Enno Rehling
39e3001a50 start implementing give_ship 2019-10-06 20:42:47 +02:00
Enno Rehling
5cf417d16d must have one captain per ship. 2019-10-06 20:22:19 +02:00
Enno Rehling
178f7c2e19 add number of ships for convoys. 
check required crew skills.
require number of captains >= ship.number.
 2019-10-06 18:11:10 +02:00
Enno Rehling
84633b50e1 gamedata version SHIP_NUMBER_VERSION 2019-10-05 21:00:17 +02:00
Enno Rehling
f02c4cbaeb disable magic resistant to prevent 2% intermittent test. 2019-10-05 20:59:55 +02:00
Enno Rehling
b4f3120658 delete unused function 2019-09-29 18:31:11 +02:00
Enno Rehling
7b9ea75d16 make disrupt_astral use callback, not region_list. 2019-09-29 18:28:44 +02:00
Enno Rehling
17fbd0d67d Bug 2612 Zauberreparatur. 2019-09-29 17:56:56 +02:00
Enno Rehling
a6ea80f5f8 create a for_all_in_range function to avoid use of region_list. 
functional programming is good.
 2019-09-29 16:57:26 +02:00
Enno Rehling
2ef753bd16 Tod den region_list Listen. 
Weg mit astralregions().
 2019-09-24 21:42:53 +02:00
Enno Rehling
24552613c8 fetch_astral braucht astralregions eigentlich nicht. 2019-09-24 21:26:34 +02:00
Enno Rehling
7335d8c5c9 fix build (bad merge, self is now f) 2019-09-24 09:35:38 +02:00
Enno Rehling
00e39717e1 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-24 09:28:44 +02:00
Enno Rehling
ddc23ca3ab Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-23 20:45:09 +02:00
Enno Rehling
a2ece4e749 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-23 20:44:59 +02:00
Enno Rehling
a2963a8621 stop using astralregions, avoid dynamic allocations. 2019-09-23 20:44:19 +02:00
Enno Rehling
ade50af60b Merge branch 'master' into develop 2019-09-23 17:37:02 +02:00
Enno Rehling
b6edc0b940 Bug 2611: password_cmd erzeugt ungültige Passworte. 2019-09-22 16:31:02 +02:00
Enno Rehling
c1a36a0963 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-09-22 13:51:23 +02:00
Enno Rehling
3ac343a997 Pestmeldung, Regionen Singular/Plural. 2019-09-22 13:51:02 +02:00
Enno Rehling
0db9389df6 coverity thinks I should check return values 2019-09-21 22:28:13 +02:00
Enno Rehling
08e45dc722 appease gcc const-check 2019-09-21 22:18:41 +02:00
Enno Rehling
6c73a58608 Bug 2607: BEnutze format_list für Schemen. 2019-09-21 22:16:46 +02:00
Enno Rehling
8433052c64 CID 204092: Memory - illegal accesses (NEGATIVE_RETURNS) 2019-09-19 05:05:13 +02:00
Enno Rehling
96facd21d9 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-19 05:03:55 +02:00
Enno Rehling
17ba4e7746 allow clearing attributes from lua 2019-09-19 05:03:01 +02:00
Enno Rehling
d5104fa55a Bug 2609 VERGESSE Magie 2019-09-18 20:55:44 +02:00
Enno Rehling
ea9e31d1b2 tests for trolls riding on carts. 2019-09-15 20:32:07 +02:00
Enno Rehling
52f08917d5 getn is deprecated 2019-09-15 14:33:48 +02:00
Enno Rehling
fa3abe8c32 new bindings for allies. 
script to fix damage from bug 2608.
 2019-09-15 14:33:48 +02:00
Enno Rehling
fef57d3fcf factions that idle out gift their stuff to friends 2019-09-15 14:32:48 +02:00
Enno Rehling
e90b7acd4c Merge remote-tracking branch 'upstream/master' 2019-09-15 14:17:37 +02:00
Enno Rehling
f06fd8945c getn is deprecated 2019-09-15 14:02:53 +02:00
Enno Rehling
e58f51e536 new bindings for allies. 
script to fix damage from bug 2608.
 2019-09-15 14:02:32 +02:00
Enno Rehling
bd25c0bf6e helfe-status nach lua exponieren. 2019-09-15 14:01:33 +02:00
Enno Rehling
aecd79dab1 factions that idle out gift their stuff to friends 2019-09-15 13:59:42 +02:00
Enno Rehling
434aa15b9a factions that idle out gift their stuff to friends 2019-09-14 21:51:13 +02:00
Enno Rehling
f30a7848a5 rule_give is crufty, do not involve it in destroyfaction 2019-09-13 22:00:47 +02:00
Enno Rehling
b9ae927aa3 remove copyright notices. 2019-09-13 21:35:44 +02:00
Enno Rehling
ddc8c27489 Bug 2605: testing horses and carts 
fixing indentation in battle.c
 2019-09-12 22:23:50 +02:00
Enno Rehling
d9febc30d8 rostregen bugfix commit ruined indentation 2019-09-12 08:40:27 +02:00
Enno Rehling
cc77ce6f20 Tests für Einheiten mit Pferden. 2019-09-10 06:40:42 +02:00
Enno Rehling
007721991d Bug 2606: DRY, share code between buy and sell. 2019-09-08 13:29:10 +02:00
Enno Rehling
d2d782c761 Bug 2606: KAUFE braucht eine Burg. 2019-09-08 13:06:24 +02:00
Enno Rehling
99f7ddd1c0
Merge pull request #873 from ennorehling/develop 
mapper enhancement
 2019-09-02 20:59:41 +02:00
Enno Rehling
40a484774e gmtool: reset an entire world's age to zero. 2019-09-02 20:42:23 +02:00
Enno Rehling
a3299ed926 Verifikation dass Erbschaft wie gewollt verteilt wird. 2019-09-01 19:42:12 +02:00
Enno Rehling
7e4d7bf286
Merge pull request #872 from ennorehling/develop 
bug 2603: when familiars cast spells, use their name in messages.
 2019-09-01 04:10:08 +02:00
Enno Rehling
02f6f2f014 bug 2603: when familiars cast spells, use their name in messages. 2019-08-31 12:19:25 +02:00
Enno Rehling
7eb1e59d5d
Merge pull request #871 from ennorehling/develop 
BENENNE FREMDE und pathfinding
 2019-08-27 22:25:47 +02:00
Enno Rehling
aef98424ea fix pathfinding 
fix BENENNE FREMDE BURG
 2019-08-27 22:17:28 +02:00
Enno Rehling
c87944afad actually, rconnect is better, since we don't always need the entire scan. 2019-08-26 22:49:32 +02:00
Enno Rehling
b81fe4e244 Merge branch 'develop' of github.com:ennorehling/eressea into develop 2019-08-26 22:47:11 +02:00
Enno Rehling
a5e59a6464 we prefer get_neighbours over rconnect 2019-08-26 22:46:59 +02:00
Enno Rehling
d639c2418c delete unused function 2019-08-26 20:47:02 +02:00
Enno Rehling
331546eec4 at_npcfaction is deprecated stuff. 2019-08-26 19:09:40 +02:00
Enno Rehling
ef92734483
Merge pull request #870 from ennorehling/develop 
refactoring, to go into 3.21
 2019-08-25 19:40:09 +02:00
Enno Rehling
fc29b492a2 last gcc thing, I hope. 2019-08-25 19:34:04 +02:00
Enno Rehling
eb95613996 fix gcc issues with new season_t type. 2019-08-25 18:14:03 +02:00
Enno Rehling
8bed3f3329 fix give_unit test for E3 
extract read_factions from read_game, now small and nice.
 2019-08-25 18:11:14 +02:00
Enno Rehling
827532dd49 extract read_regions from read_game. 2019-08-25 17:55:04 +02:00
Enno Rehling
cf7971bcfc Tests for GIVE UNIT and groups. 2019-08-25 17:43:18 +02:00
Enno Rehling
ea4f402ddc
Merge pull request #869 from ennorehling/develop 
insect warning
 2019-08-25 15:19:10 +02:00
Enno Rehling
8ddca8ab0e Bug 2458 strikes again: wrong insect warning. 
simplify calendar code, add tests.
 2019-08-25 15:14:21 +02:00
Enno Rehling
ae7a6cb5c1 Merge branch 'master' into develop 2019-08-24 22:02:15 +02:00
Enno Rehling
8916a1756a rule_give is crufty, do not involve it in destroyfaction 2019-08-24 12:14:57 +02:00
Enno Rehling
b4867e4679 Keine Burgen oder Schiffe in Land-Turmregionen zeigen. 2019-08-20 19:31:52 +02:00
Enno Rehling
62a45496e4 Sichtbarkeit von Landregionen aus Leuchttürmen. 
https://bugs.eressea.de/view.php?id=2490
 2019-08-20 17:24:05 +02:00
Enno Rehling
5264b6e4f5 fix and test implementation of ship_type.minskill 2019-08-18 12:13:51 +02:00
Enno Rehling
e616449fd0 Leuchttürme zeigen minimale Info über Landregionen an. 
https://bugs.eressea.de/view.php?id=2490
Neues Schiff Galleone
https://bugs.eressea.de/view.php?id=2542
 2019-08-17 22:48:14 +02:00
Enno Rehling
c8c2a6fe58 2587: Trennlinie vor Allianzstatus und Adressliste. 
https://bugs.eressea.de/view.php?id=2587
 2019-08-13 17:42:45 +02:00
Enno Rehling
4f80569ebf try using iwyu on travis 2019-08-11 18:03:52 +02:00
Enno Rehling
b89eed2f2a Bugfix in Berechnung von neuem Entertainment-Code. 2019-08-10 05:52:34 +02:00
Enno Rehling
55016e8a02 resource leak: forgot to free recruitment data. 2019-08-10 05:12:46 +02:00
Enno Rehling
061cadfce8 null-pointer check befor strcmp. 2019-08-10 05:10:00 +02:00
Enno Rehling
12117776a0 ignore some code more points, but leave emoji intact. 2019-08-08 18:23:31 +02:00
Enno Rehling
a0bd0378c3 rechenfehler unterhaltung 2019-08-06 20:04:47 +02:00
Enno Rehling
c97e881dbf let horses be short, too. 2019-08-03 20:58:13 +02:00
Enno Rehling
8106cf15a1 morale is ony [0-10], so unsigned short is more than fine. 2019-08-03 15:28:50 +02:00
Enno Rehling
a51d3edee7 region.peasants can be short 2019-08-03 15:12:07 +02:00
Enno Rehling
867dcd27f7 512 is not enough economy 2019-08-03 10:02:34 +02:00
Enno Rehling
16cad15dec change test for trimming non-printable chars 2019-08-02 12:24:32 +02:00
Enno Rehling
a2a7bc5f61 add missing include 2019-08-01 23:11:52 +02:00
Enno Rehling
964a0586dc fix UTF8 trimming 2019-08-01 22:58:20 +02:00
Enno Rehling
55299346f8 use wint_t, not long. 2019-08-01 18:49:39 +02:00
Enno Rehling
0fef06a661 Bug 2594: KONTAKTIERE vor STIRB 2019-07-31 08:31:19 +02:00
Enno Rehling
c880b6c99b merge conflict resolution MAXSCHOLARS 2019-07-30 11:18:09 +02:00
Enno Rehling
909a839adf simplify: WORK and ENTERTAIN use the same request array. 
reduce need for global variables.
 2019-07-30 11:13:25 +02:00
Enno Rehling
fdfe0d3b35 check MAX_ENTERTAINERS. 
extract recruit from economy.
Bug 2600 (WIP).
 2019-07-29 23:53:59 +02:00
Enno Rehling
28a4cfa55d bug 2597 wormholes teleport more than one unit. 2019-07-28 22:32:08 +02:00
Enno Rehling
7bb17225c9 Seaserpents are cannibals. 2019-07-28 18:41:26 +02:00
Enno Rehling
5cf680997e implement atoi36 with strtol 2019-07-28 12:56:59 +02:00
Enno Rehling
141e95c5c9 bugfix: KONTAKTIERE ohne Parameter crasht. 2019-07-28 07:43:54 +02:00
Enno Rehling
c3e86ff6da Make the worst-case number of Golems look better. 2019-07-27 16:50:45 +02:00
Enno Rehling
a33ac3b402 Increase MAX_WORKERS for Blumenkinder. 2019-07-27 09:28:50 +02:00
Enno Rehling
c70e597b05 Update copyright notice with current date. 2019-07-14 09:37:35 +02:00
Enno Rehling
0281ebc44b Bug 2596: Crash durch leeres Banner 
https://bugs.eressea.de/view.php?id=2596
 2019-07-14 09:26:32 +02:00
Enno Rehling
26521bcd2b hide unused function 2019-07-06 17:30:09 +02:00
Enno Rehling
3f395541e1 Merge branch 'master' of github.com:ennorehling/eressea 2019-07-06 12:09:11 +02:00
Enno Rehling
7eb0e580a0 increase MAXSCHOLARS 2019-07-06 12:05:32 +02:00
Enno Rehling
f677a21541 disable QUIT FACTION with ifdef QUIT_WITH_TRANSFER 2019-07-06 12:02:52 +02:00
Enno Rehling
05b8477b8a STIRB PARTEI hat immer nur eine Einheit übergeben. 2019-07-04 20:44:11 +02:00
Enno Rehling
33d3ce8e6a more intelligent batching of automated students. 2019-06-26 21:31:47 +02:00
Enno Rehling
38ff25042b Allow batching of too many students. 
Limit number of batched units to 128.
 2019-06-24 21:41:04 +02:00
Enno Rehling
6e64d749b0 tricks to reduce sizeof(scholar) 2019-06-24 20:51:09 +02:00
Enno Rehling
e6b84410b9 start work on next major release 2019-05-26 20:13:02 +02:00
Enno Rehling
9f2741f3dc fix any migrants that have received aura. 2019-05-19 15:47:13 +02:00
Enno Rehling
1c01f4d083 fix the fix_fam_spells function (2585 WIP) 2019-05-19 15:28:16 +02:00
Enno Rehling
670aa56d4e fix_fam_spells happy case test (is familiar) 2019-05-19 15:14:01 +02:00
Enno Rehling
cab3f4309f simple test for aurafocus effect on max spellpoints. 2019-05-19 12:38:54 +02:00
Enno Rehling
a35a0ca516 2582 WIP: failing test for regenerate_aura 2019-05-19 10:52:32 +02:00
Enno Rehling
4391ab95fa Bug 2483: FLIEHE als Default für neue Parteien, nicht AGGRESSIV. 2019-05-18 16:16:30 +02:00
Enno Rehling
2018238263 Bug 2584: gray mages can regenerate aura. 2019-05-18 13:16:13 +02:00
Enno Rehling
d2ee91bc88 Bug 2584: failing test for aura regeneration. 2019-05-18 12:56:40 +02:00
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
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
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
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
e47da17cc6 Merge branch 'master' into develop 2018-12-09 03:48:29 +01:00
Enno Rehling
089be4bca8 cppcheck style warnings: reduce variable scope 2018-12-09 03:42:57 +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
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
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
0895ccd5d9 Bug 2527: PASSWORD command handling of bad passwords. 2018-12-03 19:19:06 +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
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
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
22ed6b6c25 Durchreisemeldung Komma 2018-12-01 21:08:32 +01:00
Enno Rehling
dba687974b fix string unit tests after strcpy was removed 2018-12-01 20:39:39 +01:00
Enno Rehling
06ccc7df42 excise bsdstring from the project 2018-12-01 20:25:06 +01:00
Enno Rehling
c5acb2f351 add a printf function to sbstring (about time) 2018-12-01 19:54:07 +01:00
Enno Rehling
2071121346 Bug 2521: Übersetzung von at_racename für Geister 2018-12-01 12:27:11 +01:00
Enno Rehling
5d7eb1d0a3 BUG 2520: LERNE AUTO multi-teacher assignment 2018-12-01 11:09:31 +01:00
Enno Rehling
b74e8c0ebd simpler hack, um den brypt workfactor einzustellen (oder passwort-checks abzuschalten), weil man manchmal halt keine Zeit hat. 2018-12-01 10:30:15 +01:00
Enno Rehling
fc23926559 BUG 2520: LERNE AUTO multi-teacher assignment 2018-12-01 10:29:48 +01:00
Enno Rehling
f9ee13b435 convert report_template to sbstring 2018-11-30 10:52:32 +01:00
Enno Rehling
2de63536f7 more sbstring conversions 2018-11-30 10:26:49 +01:00
Enno Rehling
3c703653aa oops. broke test again with another case of too many periods. 2018-11-29 06:46:08 +01:00
Enno Rehling
88792e1d09 fix display of luxury prices, period at end of description. 2018-11-28 20:57:17 +01:00