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

10774 Commits

Author SHA1 Message Date
Enno Rehling db402c4e2c include custom version of tolua as a submodule. 
change how libm and libbsd are detected.
 2021-02-16 10:12:05 +01:00
Enno Rehling 7fae809aa0 update tolua repo if needed 2021-02-16 10:12:05 +01:00
Enno Rehling a67246ba86 there is only one repository for tolua now 2021-02-16 10:12:05 +01:00
Enno Rehling d1ec2bbb5c tolua creates sources that abuse the LUALIB_API defines. 
Manually fixing the generated files so they don't try to declare dllimports.
 2021-02-16 10:12:05 +01:00
Enno Rehling 73b2895306 fix travis build 2021-02-16 10:12:05 +01:00
Enno Rehling 0b2049151a update package list 2021-02-16 10:12:05 +01:00
Enno Rehling b0093868b3 eliminate cJSON submodule 2021-02-16 10:12:05 +01:00
Enno Rehling f78d667258 find iniparser.h when installed in subdirectory 2021-02-16 10:12:05 +01:00
Enno Rehling fb3047beb5 add cmake support for iniparser package 2021-02-16 10:12:05 +01:00
Enno Rehling d850b28d85 we do not use dlmalloc 2021-02-16 10:12:04 +01:00
Enno Rehling 0d2b3a76b7 fix compilation with Lua 5.4 (LUA_QL no longer exists) 2021-02-16 10:12:04 +01:00
Enno Rehling b6fff5cb5a run tests where we can clean up after them 2021-02-16 10:12:04 +01:00
Enno Rehling ba3b9ae6d3 use pdcurses from vcpkg if available 2021-02-16 10:12:04 +01:00
Enno Rehling ebc8c3f1d2 add FindSQLite3 for older cmake versions 2021-02-16 10:12:04 +01:00
Enno Rehling 70ccef02ae use vcpkg packages on windows 
make cmake files smarter
 2021-02-16 10:12:04 +01:00
Enno Rehling 117edad7e4 more astral spell magic resist fixes 2021-02-16 10:12:04 +01:00
Enno Rehling 31a3f10e8f latest versions do not complain about cmake min version 2021-02-16 10:12:04 +01:00
Enno Rehling 33332aedb4 stop using the tolua-5.3 repository, the 5.2 works up to lua 5.4 2021-02-16 10:12:04 +01:00
Enno Rehling b756fde006 spells must deal with resisting targets, or sigsegv will happen 2021-02-16 10:12:04 +01:00
Enno Rehling 8d286d5e23 fix disabling of tree growth. 2021-02-16 10:12:04 +01:00
Enno Rehling 8fbcf3f379 Neue Option für schnelleres Samenwachstum. 2021-02-16 10:12:04 +01:00
Enno Rehling cc5e062b68 https://bugs.eressea.de/view.php?id=2724 
Magieresistenz reparieren.
 2021-02-16 10:12:04 +01:00
Enno Rehling d03face3c1 simplicate and add more lightness 2021-02-16 10:12:04 +01:00
Enno Rehling 88e0af287e https://bugs.eressea.de/view.php?id=2713 
spelling fix: caravanserai
 2021-02-16 10:12:04 +01:00
Enno Rehling 31f589e76f https://bugs.eressea.de/view.php?id=2716 
improved messages when following a ship.
 2021-02-16 10:12:04 +01:00
Enno Rehling 8ef95e6729 https://bugs.eressea.de/view.php?id=2716 
Bei FOLGE Schiff muss das Zile nicht in der gleichen Region sein!
 2021-02-16 10:12:04 +01:00
Enno Rehling f09bed10b7 personen mit racename können eh nicht übergeben werden, code kann man sich sparen. 2021-02-16 10:12:04 +01:00
Enno Rehling af2dadfc8e https://bugs.eressea.de/view.php?id=2719 
fix shapeshifted units without a timer
do not transfer shapeshift spell when giving to a new unit.
 2021-02-16 10:12:04 +01:00
Enno Rehling fb294d9118 add a debug option, -D 
usually do not need to save the game when debugging
 2021-02-16 10:12:04 +01:00
Enno Rehling f4acff67e4 https://bugs.eressea.de/view.php?id=2720 
report study costs to the correct unit
 2021-02-16 10:12:04 +01:00
Enno Rehling 0bbadf2a66 https://bugs.eressea.de/view.php?id=2718 
Better error messages for drifting ship.
 2021-02-16 10:12:04 +01:00
Enno Rehling e97f80ad3c eliminate some high-level warnings 2021-02-16 10:12:04 +01:00
Enno Rehling da83e3f2f6 coverity CID 215803 Dereference after null check 2021-02-16 10:12:04 +01:00
Steffen Mecke 6bba2a2ed7 PR 929: fix memory leak 2021-02-16 10:11:23 +01:00
Enno Rehling 219ec117c6 fix gcc 10 compatibility 2021-02-16 10:09:14 +01:00
Enno Rehling b078c89dfb addedndum: add a negative test for nono-aquarians, too. 2021-02-07 13:08:13 +01:00
Enno Rehling b7b6c4b668 https://bugs.eressea.de/view.php?id=2723 
Meermenschen konnten nicht aus fahrenden Schiffen springen.
 2021-02-07 12:52:35 +01:00
Enno Rehling dde2f3644e fix gcc complaints 2021-02-05 22:39:27 +01:00
Enno Rehling e8aff3b431 https://bugs.eressea.de/view.php?id=2722 
Weitere Schiffe sind nicht gesegelt, wenn ein Schiff Startregion = Ziel hatte.
 2021-02-05 22:36:30 +01:00
Enno Rehling 2103707489 fix follow_ship crash 
error message for non-captains was not generated
 2021-01-03 10:22:17 +01:00
Enno Rehling 8ef3d1ed3f fix rename orders.dir after creating orders 2021-01-02 09:19:23 +01:00
Enno Rehling cd7f4026ca https://bugs.eressea.de/view.php?id=2582 
Small tweak to an error message.
 2020-12-10 20:54:30 +01:00
Enno Rehling c02107d037 report monsters if they are only seen by lighthouses 2020-12-10 13:05:51 +01:00
Enno Rehling ddd37688f9 https://bugs.eressea.de/view.php?id=2714 2020-12-10 11:58:52 +01:00
Enno Rehling 67025b65d0 https://bugs.eressea.de/view.php?id=2714 
fix test for seen_travel
 2020-12-09 20:32:09 +01:00
Enno Rehling 592fe18779 Bei der Durchreise konnte man große Monster immer sehen. 
https://bugs.eressea.de/view.php?id=2714
 2020-12-08 23:06:31 +01:00
Enno Rehling ba3b608296 vs 2019 build for x86, not x64 2020-12-08 22:02:46 +01:00
Enno Rehling efaa33af35 fix batch file for vs2017 2020-12-07 18:51:32 +01:00
Enno Rehling 8d36403216
Merge pull request #927 from eressea/develop 
changes for 3.26
 2020-12-06 19:54:05 +01:00
Enno Rehling 830a0d9519 in e3, disable the new resource discovery 2020-12-06 19:24:39 +01:00