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

4374 commits

Author SHA1 Message Date
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