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

4341 commits

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