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

10833 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
b87d1c955c remove debug output 2021-03-07 13:05:39 +01:00
Enno Rehling
e056955839 Merge branch 'master' into develop 2021-03-06 21:31:49 +01:00
Enno Rehling
1d6825f179 Merge branch 'develop' of github.com:eressea/server into develop 2021-03-06 21:31:16 +01:00
Enno Rehling
1d353fdc2a fix LUA_PATH for run-eressea.cron 2021-03-06 21:30:47 +01:00
Enno Rehling
87a08ad8ba fix LUA_PATH for run-eressea.cron 2021-03-06 21:29:36 +01:00
Enno Rehling
9109a7a61e fix output directory and point runtests script at it. 2021-03-05 18:53:44 +01:00
Enno Rehling
010dde1cb8 fix bug in last change, could not give items to peasants. 2021-03-04 15:49:12 +01:00
Enno Rehling
5df3c3dc4b fix a crash in give_cmd. 
do give_unit last, because it kills the actively iterated list.
 2021-03-03 20:10:51 +01:00
Enno Rehling
026bcb22cb set LUA_PATH for preview 2021-02-28 17:15:33 +01:00
Enno Rehling
7d434323a7 make use of build no. 2021-02-28 17:11:31 +01:00
Enno Rehling
d53d3d9e12 set LUA_PATH for cron jobs 2021-02-28 16:02:09 +01:00
Enno Rehling
3df552676c begin work on version 3.28 2021-02-24 19:46:55 +01:00
Enno Rehling
ccba09390b compile with ERESSEA_VERSION 2021-02-24 19:45:45 +01:00
Enno Rehling
961b936086
Merge pull request #930 from eressea/develop 
release 3.27
 2021-02-24 19:34:51 +01:00
Enno Rehling
5fd974d399 https://bugs.eressea.de/view.php?id=2573 magical resistance of adamantium 2021-02-24 19:06:04 +01:00
Enno Rehling
f48551ebcb remove unicode from autoseed (races are always english tokens) 2021-02-24 18:48:12 +01:00
Enno Rehling
9f9b6f4faf rename ERESSEA_DIR to ERESSEA_ROOT 2021-02-23 17:57:44 +01:00
Enno Rehling
e36cac1188 find config files in ERESSEA_DIR if config.install is not set 2021-02-23 17:19:48 +01:00
Enno Rehling
8421e64c6e travis lua_path, again 2021-02-22 20:50:49 +01:00
Enno Rehling
c5cc314c46 travis, install luarocks 2021-02-22 20:08:30 +01:00
Enno Rehling
355b9ff7fc remove lunit from repository (use luarocks) 
make info panel bigger, do not cut off names.
 2021-02-22 19:51:46 +01:00
Enno Rehling
3508fceddc Add CMakeSettings.json to git 
Expect the system LUA_PATH to point to luarocks
 2021-02-22 19:32:08 +01:00
Enno Rehling
56896361fb remove luarocks from scripts 2021-02-22 09:54:02 +01:00
Enno Rehling
26bb5d4f07 remove unused ini settings 2021-02-22 02:05:47 +01:00
Enno Rehling
f69a823a14 fix LUA_PATH for runtests script 2021-02-22 02:03:45 +01:00
Enno Rehling
2bb18d27bc replace config.install with environment variable 2021-02-22 01:53:01 +01:00
Enno Rehling
6176e5e754 gmtool no longer needs unicode.h 2021-02-21 22:58:17 +01:00
Enno Rehling
df4317f9f1 remove non-utf8 hacks from mapper. 
correclty refresh map window after listboxes close.
 2021-02-21 22:32:40 +01:00
Enno Rehling
979f2f7b6e build with ncursesw 
Now we can display special characters and proper boxes
 2021-02-21 22:05:43 +01:00
Enno Rehling
a3499dd895 fix new bug in ascii converter. 2021-02-21 21:01:52 +01:00
Enno Rehling
abf548cecd overdue unicode cleanup. 
our new pdcurses can do utf8 output, let's use it.
convert output on a windows tty to codepage 1252.
 2021-02-21 20:49:03 +01:00
Enno Rehling
b9eea2c8a2 forgot to increase verison number for 3.27 2021-02-21 13:41:36 +01:00
Enno Rehling
e0ff829b61 clarify the find_package (Lua) logic 2021-02-21 10:15:27 +01:00
Enno Rehling
f447f35ad3 turn magic resistance off during test of spells 2021-02-21 10:06:22 +01:00
Enno Rehling
61d86cf175 Auch Schiffe haben eine natürliche Resistenz gegen Verzauberung. 2021-02-21 10:00:05 +01:00
Enno Rehling
7dcf9a27e0 windows fixes broke linux build 
also disable magic resistance in shipspell tests
 2021-02-21 09:53:38 +01:00
Enno Rehling
6b5ddc57d9 MSVC builds go to a single output folder 
Fix batch files to deal with new structure.
 2021-02-21 09:48:27 +01:00
Enno Rehling
d8c0b57864 we don't need to track age statistics for any but the new factions. rename global age to newbies. 2021-02-21 00:54:33 +01:00
Enno Rehling
e1d117754a fix new callback signature for jsonconf 2021-02-21 00:37:31 +01:00
Enno Rehling
43066b6720 size_t fix in storage 2021-02-21 00:22:38 +01:00
Enno Rehling
d4f09fbf74 fix tests that expected the old storage library behavior 2021-02-21 00:21:19 +01:00
Enno Rehling
b0a23f390c wrong storage library version 2021-02-21 00:18:32 +01:00
Enno Rehling
3db561ec3a require cmake 3.13, not more 2021-02-20 23:24:50 +01:00
Enno Rehling
e0e82c5fa5 fix MSVC warning levels, move _CRT_SECURE_NO_WARNINGS define to sources 2021-02-20 23:22:10 +01:00
Enno Rehling
0af9fd18ef make clean target cleans cmake 2021-02-20 20:17:22 +01:00
Enno Rehling
50f84adc37 build with or without libbsd installed 2021-02-19 18:13:05 +01:00
Enno Rehling
4dfa1035b6 fix libbsd and string function detection 2021-02-18 22:26:41 +01:00
Enno Rehling
74f6076022 add lunitx module for systems without luarocks. 
add LUA_PATH to runtests.bat
 2021-02-16 10:12:05 +01:00
Enno Rehling
ec645010fa update changelog 2021-02-16 10:12:05 +01:00
Enno Rehling
a17191eb56 remove remainder of custom tolua build 2021-02-16 10:12:05 +01:00