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

4466 commits

Author SHA1 Message Date
Enno Rehling
8cabd04b75 division by zero error 2020-12-06 15:47:47 +01:00
Enno Rehling
a3f55de9a7 teachers do not need to be in an academy. 
remove source files for academy.
 2020-12-06 15:47:47 +01:00
Enno Rehling
0c080ad7dd coverity complains about possibly missing warden. 2020-12-06 15:47:47 +01:00
Enno Rehling
2c71e7fb82 start version 3.26 development Q4/2020 2020-12-06 15:47:47 +01:00
Enno Rehling
f78aa507f8 https://bugs.eressea.de/view.php?id=2701 
fix the academy
make academy, curses and potions work for LERNE AUTO
remove E3 study.speedup
 2020-12-06 15:47:47 +01:00
Enno Rehling
4e9bc53288 avoid division by zero for uninitialized btype->magres fractions 2020-11-07 21:28:25 +01:00
Enno Rehling
44ce77e0c4 allow setting region age from lua 2020-10-14 18:55:06 +02:00
Enno Rehling
79924f0551 disable iwyu 2020-10-12 08:52:05 +02:00
Enno Rehling
4a7dadfb9b make regions age only once someone discovers then 2020-10-12 08:47:54 +02:00
Enno Rehling
c7aab36c6e GIB KOMMANDO erst nach drittem BETRETE 2020-09-24 19:16:46 +02:00
Enno Rehling
513e448976 academy changes light: teacher does not need to be in an academy 2020-09-11 21:58:42 +02:00
Enno Rehling
573404e390 https://bugs.eressea.de/view.php?id=2699 
Sichtbarkeit aus Leuchttürmen korrigiert.
 2020-09-11 21:35:35 +02:00
Enno Rehling
ba39de9d25 Fix CR output for list of regions 
Add pvp/pve battle statistics
 2020-09-05 23:08:44 +02:00
Enno Rehling
712e1c3052 FOLGE SCHIFF repariert. 
https://bugs.eressea.de/view.php?id=2698
FOLGE generell verbessert, so daß man mehrere FOLGE Befehle setzen kann.
Bugfix: findship findet auch "leere" Schiffe, der Caller muss jetzt auf sh->number testen.
Schiffe und Burgen können ab sofort die selben IDs benutzen.
Befehlsreihenfolge: FOLGE erst nach VERLASSE/GIB
 2020-09-03 21:42:38 +02:00
Enno Rehling
d9a0bc7016 undo the crazy region_id hack. 
accept that the CR is what it is, and it has a coordinate type.
 2020-08-29 10:43:42 +02:00
Enno Rehling
f95549a91a Fehlendes \n bei einfachen attributen im CR 2020-08-23 21:28:15 +02:00
Enno Rehling
9c71139bf4 add region_id to messages that include a region. 2020-08-23 20:55:58 +02:00
Enno Rehling
708abf4997 CR version 69, new attribute: section 
MESSAGE.section replaces MESSAGETYPE.section
 2020-08-23 20:19:30 +02:00
Enno Rehling
7ddb7bc181 fix a TODO and a coverity warning. 2020-08-16 21:19:50 +02:00
Enno Rehling
b4fb721db4 make var_copy_regions not leaak (coverity) 2020-08-16 21:17:23 +02:00
Enno Rehling
740f4a568b refactor new_border's relationship to nextborder. 
loading a connection was unnecessarily changing nextborder.
 2020-08-16 20:39:08 +02:00
Enno Rehling
e9baa06a63 remove existing roads from oceans. 
new datafile version!
 2020-08-16 20:32:19 +02:00
Enno Rehling
d53a901d8a https://bugs.eressea.de/view.php?id=2694 
when terraforming, remove roads.
 2020-08-16 20:04:56 +02:00
Enno Rehling
11ce5a2f32 remove deprecated report functions 2020-08-16 16:00:30 +02:00
Enno Rehling
d4400bb583 remove deprecated init_order_depr 2020-08-16 16:00:30 +02:00
Enno Rehling
2e44e2dd09 eliminate deprecated function. 2020-08-16 16:00:30 +02:00
Enno Rehling
bf00a9a994 create_data: remove short-lived allocation. 2020-08-16 16:00:30 +02:00
Enno Rehling
f7dc15b64f move_cmd caller no longer has to call init_order. 
refactor move_cmd to be more like other command processors.
 2020-08-16 16:00:30 +02:00
Enno Rehling
734614ab6f deal with gcc's -Werror=switch 2020-08-16 16:00:30 +02:00
Enno Rehling
aa28ad323a LOCALE command: do not delete orders with incomplete translations 
Instead, we let the player fix them from echeck warnings.
 2020-08-16 16:00:30 +02:00
Enno Rehling
7759f7840a VERGESSE <talent> Optimierung wie bei LERNE [AUTO] 
Kein Grund, das in der Datenbank zu speichern.
 2020-08-16 16:00:30 +02:00
Enno Rehling
b4e0640c08 add a happy-case test for follow_unit 2020-08-16 16:00:29 +02:00
Enno Rehling
afb7b4f8e8 Test error message when following yourself. 2020-08-16 16:00:29 +02:00
Enno Rehling
b657873488 let swimming and flying units follow a ship 2020-08-16 16:00:29 +02:00
Enno Rehling
05a200698a https://bugs.eressea.de/view.php?id=2479 
Einheiten folgen sich selbst nicht.
Remove unused copy of follow_ship logic from follow_unit.
 2020-08-16 16:00:29 +02:00
Enno Rehling
55704cfce8 Parser fallback to latin1 when detecting invalid utf-8 2020-08-16 16:00:29 +02:00
Enno Rehling
d5f3bf7aed https://bugs.eressea.de/view.php?id=2638 
flying units may leave a ship on the ocean.
 2020-08-16 16:00:29 +02:00
Enno Rehling
73df4adde7 https://bugs.eressea.de/view.php?id=2676 
Neue Meldung für Konvois mit zu wenigen Kapitänen.
 2020-08-16 16:00:29 +02:00
Enno Rehling
043cb88d91 https://bugs.eressea.de/view.php?id=2629 
make ship_ownernot test u->number, hope that wasn't important.
 2020-08-16 16:00:29 +02:00
Enno Rehling
d55cfb8cbf https://bugs.eressea.de/view.php?id=2689 
Implement a working LOCALE command.
OBS: Throws away any command that isn't easy to translate.
 2020-08-16 16:00:29 +02:00
Enno Rehling
6c2f6a98eb Reduce weight limit, lighthouses also show all dragons. 2020-08-16 16:00:29 +02:00
Enno Rehling
19a2a69f33 Lighthouse: only show large swimming units (more than 10 weight). 
Eliminate RCF_INVISIBLE and the spell race.
 2020-08-16 16:00:29 +02:00
Enno Rehling
90511b434c update test for lighthouse visibility 2020-08-16 16:00:29 +02:00
Enno Rehling
7cedc4c9dd quick performance improvement for scale_number 2020-08-16 16:00:29 +02:00
Enno Rehling
beb673a28b spotting monsters from lighthouses 2020-08-16 16:00:29 +02:00
Enno Rehling
68e2a6e892 tree growth is rounded up. 2020-08-16 16:00:29 +02:00
Enno Rehling
6ccaaee4ea report 2682: simplify tree growth 
each spring, 2/3 of all saplings become trees over a 6 week period (1/9 per week).
 2020-08-16 16:00:28 +02:00
Enno Rehling
b2689e3a9e Bug 2621: Fehlermeldung bei fehlender Anzahl 
bei Personen- und Schiffsübergaben.

closing https://bugs.eressea.de/view.php?id=2621
 2020-08-16 16:00:28 +02:00
Enno Rehling
09c9ba32eb small bug: argument is not const. 2020-08-16 16:00:28 +02:00
Enno Rehling
6d542327f9 bug 2660 delayed canibalism 
monsters now eat each other in randenc.
 2020-08-16 16:00:28 +02:00
Enno Rehling
d0149f334f test for new parser behavior. 2020-08-16 16:00:28 +02:00
Enno Rehling
a3300d5b59 fix parser crash from turn 1179 2020-08-16 16:00:28 +02:00
Enno Rehling
9e3dc18daa bug 2684: update sp_showastral and sp_viewreality. 
add more messages
add unit tests
closes https://bugs.eressea.de/view.php?id=2684
 2020-08-16 16:00:28 +02:00
Enno Rehling
b06f3cf0e2 Bug 2684 Astraler Blick 
Old implementation was bad, using set_observer is better. Still missing a test, but improved the one for sp_viewreality, which is almost doing the same thing - adaptation should be easy.

Fixes https://bugs.eressea.de/view.php?id=2684
 2020-08-16 16:00:28 +02:00
Enno Rehling
e80701ef35 Allow alternative names for some spells. 2020-08-16 16:00:28 +02:00
Enno Rehling
a5bca33bf7 fake wormhole in test had negative size 2020-08-16 16:00:27 +02:00
Enno Rehling
a5b39962fd make it impossible to create buildings with size 0 2020-08-16 16:00:27 +02:00
Enno Rehling
2d39641e3f Bug 2668 Spruchstärke Ritual der Aufnahme 
Zauber sollen force benutzen, nicht level.
 2020-08-16 16:00:27 +02:00
Enno Rehling
0c9153396c Bug 2683: fix buildings with size 0 
Fixing the symptoms, not the cause, becasue I don't know how this happened.
 2020-08-16 16:00:27 +02:00
Enno Rehling
76468197d7 empty convoys cannot be built on. 2020-08-16 16:00:27 +02:00
Enno Rehling
1eaa6a9ec4 Bug 2680: shapeshift spell cannot be cast twice. 
Add a message and don't pay for the failed spell.
 2020-08-16 16:00:27 +02:00
Enno Rehling
e5be92da19 Bug 2679: Nur Bergwächter bewachen Eisen. 2020-08-16 16:00:27 +02:00
Enno Rehling
183981f3c7 bug 2678: fix trade_needs_castle 
The logic for "insects do not need castles in deserts or swamps" was broken.
 2020-08-16 16:00:27 +02:00
Enno Rehling
c35ba4cf92 stop showing unhandled keycodes in status 2020-08-16 16:00:27 +02:00
Enno Rehling
15f2e014d2 make coverity understand that there is no buffer overflow here. 2020-08-16 16:00:27 +02:00
Enno Rehling
515fcb3c86 Lighthouse shows roads in both CR and NR. 
This closes bug 2669.
 2020-08-16 16:00:27 +02:00
Enno Rehling
0ea9717b5a bug 2674 fix null-ptr deref 2020-08-16 16:00:27 +02:00
Enno Rehling
40493bdc64 bug 2674 send message to player, not monsters 2020-08-16 16:00:27 +02:00
Enno Rehling
ed0b7f8af2 Durch GIB "leer" gewordene Schiffe können nicht sinken. 2020-08-16 16:00:27 +02:00
Enno Rehling
dee8b306d0 update default version number 2020-08-16 16:00:26 +02:00
Enno Rehling
276db404ba bug 2673 ignore commands that have fewer than 2 characters. 2020-08-16 16:00:26 +02:00
Enno Rehling
f9c3f74117 Bug 2670 trim &nbsp; and others from strings. 2020-08-16 16:00:26 +02:00
Enno Rehling
83232eb556 remove legacy filereader code 2020-08-16 16:00:26 +02:00
Enno Rehling
e19b386e7f fix tests for parsing single-letter keywords. 2020-08-16 16:00:26 +02:00
Steffen Mecke
5455037dbc fix NOTLOST items lost in battle 2020-08-16 16:00:26 +02:00
Enno Rehling
6a9cea219c https://bugs.eressea.de/view.php?id=2692 inherit racial stealth from creator unit 2020-08-16 16:00:08 +02:00
Enno Rehling
f1a0a7a55c https://bugs.eressea.de/view.php?id=2693 
STIRB + PARTEI transferiert auch Magier des gleichen Gebietes.
 2020-08-16 12:44:03 +02:00
Enno Rehling
afa160c4c3 fix crash in turn 1181 2020-08-15 23:29:40 +02:00
Enno Rehling
eed0473421 remove the stealthany race flag 2020-08-03 10:33:24 +02:00
Enno Rehling
3b864b10fc bug 2686: stealth races not translated correctly. 2020-08-03 10:31:58 +02:00
Enno Rehling
085115c4e4 Merge branch 'master' into develop 2020-05-24 16:14:38 +02:00
Enno Rehling
3a76261302 bug 2666 english creport is broken 2020-05-24 15:41:19 +02:00
Enno Rehling
405f8f240a No! Static variables are BAD! 2020-05-23 11:21:16 +02:00
Enno Rehling
dc466fef5d join_monsters merge conflict 2020-05-23 10:19:39 +02:00
Enno Rehling
c53aa27597 bug 2661: desertierende einheiten, spoils 
Kampfstatus und Tarnung setzen.
Spoils-Texte für mehr Rassen.
 2020-05-23 10:18:18 +02:00
Enno Rehling
2d849b17d7 Merge branch 'master' into develop 2020-05-10 18:01:43 +02:00
Enno Rehling
08b9f03afc Fix demon stealth in English reports. 2020-05-10 17:50:56 +02:00
Enno Rehling
8ef2ec71e9 Merge branch 'master' into develop 2020-05-09 21:08:20 +02:00
Enno Rehling
1a63e41929 Bug 2659: units inside building AND ship 2020-05-09 21:06:25 +02:00
Enno Rehling
97cb46933e typo, ccidental bit-shift operation 2020-05-03 15:16:32 +02:00
Enno Rehling
268d93293c Fehlermeldungen für GIB ALLES 
Entkomplizierung lange Befehle.
 2020-04-18 16:28:23 +02:00
Enno Rehling
6ebb5c7591 Merge branch 'ships' into develop 2020-03-28 09:37:40 +01:00
Enno Rehling
a60859ad08 ship report crash, fix error number 2020-03-28 09:05:52 +01:00
Enno Rehling
112126b07b Bug 2653: Fehlermeldungen bei Übergabe von Schiffen. 2020-03-25 19:20:51 +01:00
Enno Rehling
609d0daed3 Merge branch 'master' into develop 2020-03-14 12:00:41 +01:00
Enno Rehling
8bf8b68571 make parse_token trim ignored characters like zero-width spaces. 2020-03-14 11:59:35 +01:00
Enno Rehling
b09de26d33 update version 2020-03-14 11:58:39 +01:00
Enno Rehling
34ac5154e7 make parse_token trim ignored characters like zero-width spaces. 2020-03-14 11:57:29 +01:00
Enno Rehling
c4cb44f961 better starting conditions 
- demons start cloaked
- regions have at least 50 trees
 2020-03-08 10:07:04 +01:00
Enno Rehling
bea657b128 Merge branch 'master' into develop 2020-03-02 21:37:54 +01:00