Enno Rehling
3be627d6ef
fix compilation
2016-08-18 19:13:31 +02:00
Enno Rehling
ecffed0577
verify data after deleting planes, do not delete plane 50 (yet)
2016-08-18 19:11:26 +02:00
Enno Rehling
e5f5dc6aa4
fail when there are borders that can't be read because their endpoints are missing
2016-08-18 19:11:10 +02:00
Enno Rehling
abd6600cfe
when reading alliances, duplicate ids are impossible.
...
makealliance does too much work, new_alliance is simpler.
2016-08-18 19:09:43 +02:00
Enno Rehling
a3ff8781c4
setting herbs will warn if they are the wrong herbs.
...
planes can be erased.
add a script that erases unused planes from E2.
2016-08-18 19:04:48 +02:00
Enno Rehling
0c6defad91
extract read_planes into a separate function.
2016-08-18 18:59:30 +02:00
Enno Rehling
851ae00835
Merge pull request #537 from ennorehling/develop
...
CID 141509 Unchecked return value from library
2016-08-09 18:37:06 +02:00
Enno Rehling
1735ec9eee
coverity CID 141509 Unchecked return value from library
2016-08-09 18:28:15 +02:00
Enno Rehling
391ef692b9
Merge branch 'ennorehling-test-alliance' into develop
2016-08-08 08:46:49 +02:00
Enno Rehling
238a0e22f2
Merge branch 'test-alliance' of https://github.com/ennorehling/eressea into ennorehling-test-alliance
...
Conflicts:
src/util/CMakeLists.txt
2016-08-08 08:46:09 +02:00
Enno Rehling
f83770dca8
Merge pull request #535 from ennorehling/gmtool-unicode
...
gmtool: clumsy codepage translation
2016-08-07 19:34:58 +02:00
Enno Rehling
b4135e49fb
unused variable
2016-08-07 19:20:41 +02:00
Enno Rehling
731238dfb1
support different editor codepages
2016-08-07 19:19:35 +02:00
Enno Rehling
400051332a
Trying out some different codepages for pdcurses/WIN32 and ncurses/Linux.
2016-08-07 18:55:03 +02:00
Enno Rehling
69c0194628
curses output doesn't deal well with non-ascii characters. "Fix" UTF8 characters by replacing them with ?
2016-08-07 18:25:28 +02:00
Enno Rehling
4f5bd43dcf
Merge branch 'master' into develop
...
Conflicts:
src/buildno.h
2016-08-07 00:47:50 +02:00
Enno Rehling
bea8b05ee9
Merge pull request #534 from ennorehling/hotfix-bug-2222-nmrdeath
...
bug 2222: death by NMR was broken
2016-08-07 00:45:30 +02:00
Enno Rehling
44b6a87649
death by NMR was broken, because I can't write loops good.
2016-08-07 00:40:10 +02:00
Enno Rehling
575f5fa355
Merge branch 'develop' of github.com:eressea/server into develop
2016-08-06 23:31:33 +02:00
Enno Rehling
b1f729a379
Merge branch 'master' into develop
...
Conflicts:
src/buildno.h
2016-08-06 23:30:59 +02:00
Enno Rehling
ae3e5b8088
release version 3.8.15
2016-08-06 23:27:23 +02:00
Enno Rehling
42703de217
Merge pull request #533 from ennorehling/develop
...
fix duplicate market effect
2016-08-06 22:01:28 +02:00
Enno Rehling
6aebb12fd5
Fix duplicate market effect.
...
https://bugs.eressea.de/view.php?id=2225
The Lua markets module is wrong, so the C code is being used.
Disable the Lua module for now, either fix or delete it later?
2016-08-06 21:51:31 +02:00
Enno Rehling
7cbd23c26b
fix error detection during report writing
2016-08-06 20:50:27 +02:00
Enno Rehling
aa7fcd3589
Merge pull request #532 from ennorehling/develop
...
fix stardust item and some small memory leaks
2016-08-06 18:31:03 +02:00
Enno Rehling
3ea33c6895
repair magic item: stardust
...
https://bugs.eressea.de/view.php?id=2226
2016-08-06 18:16:50 +02:00
Enno Rehling
257ae38749
fix spellbook leak
2016-08-06 15:15:11 +02:00
Enno Rehling
be54c60a34
Merge pull request #531 from ennorehling/bug-1859-maxsize
...
bugfix 2221 (maxsize) and 2227 (wisps)
2016-08-06 14:49:02 +02:00
Enno Rehling
fef2852c5e
Reparatur Irrlichter
...
https://bugs.eressea.de/view.php?id=2227
2016-08-06 14:36:54 +02:00
Enno Rehling
e2808eeea9
reqsize defaults to 1.
...
remove default values from xml to make it smaller and simpler.
2016-08-06 13:53:07 +02:00
Enno Rehling
db5b90e80b
clarify building_type.maxsize and add error logging for bug 2221.
...
https://bugs.eressea.de/view.php?id=2221
2016-08-06 13:52:29 +02:00
Enno Rehling
0d54a2da35
Merge pull request #530 from ennorehling/develop
...
fix logging, old datafiles
2016-08-05 22:24:31 +02:00
Enno Rehling
3dab1876ae
Merge remote-tracking branch 'upstream/develop' into develop
2016-08-05 22:19:16 +02:00
Enno Rehling
c5d266ff72
better defaults for logging to file and stderr.
...
https://bugs.eressea.de/view.php?id=2224
2016-08-05 22:15:41 +02:00
Enno Rehling
30135fc1b9
Merge branch 'develop' of github.com:ennorehling/eressea into develop
2016-08-05 21:59:49 +02:00
Enno Rehling
50860ea0ef
fix reading data from very old files
2016-08-05 21:58:06 +02:00
Enno Rehling
03a8b7383c
fix log_rotate warnings ( #529 )
...
* ignore file-not-found errors when trying to rotate logs.
I suspect this is faster and safer than testing existence.
* block rename warnings, part deux
2016-08-05 20:15:05 +02:00
Enno Rehling
170ca3e396
block rename warnings, part deux
2016-08-05 20:09:07 +02:00
Enno Rehling
32384f9fd7
ignore file-not-found errors when trying to rotate logs.
...
I suspect this is faster and safer than testing existence.
2016-08-05 17:21:29 +02:00
Enno Rehling
8f9bfe85b6
Merge pull request #526 from ennorehling/develop
...
turn maxsize assert into an error
2016-07-31 19:00:02 +02:00
Enno Rehling
36e1060fc7
turn maxsize assert into an error
...
fix log rotation on windows
2016-07-31 18:48:27 +02:00
Enno Rehling
ba6f75df3e
Merge branch 'develop' of github.com:ennorehling/eressea into develop
2016-07-30 23:28:16 +02:00
Enno Rehling
47e38d1e4a
Merge branch 'ennorehling-feature/kill-maintenance' into develop
2016-07-30 23:27:30 +02:00
Enno Rehling
d0f54bf69a
Merge branch 'feature/kill-maintenance' of https://github.com/ennorehling/eressea into ennorehling-feature/kill-maintenance
...
Conflicts:
src/kernel/config.c
src/kernel/config.h
src/tests.c
2016-07-30 23:27:03 +02:00
Enno Rehling
51ffce6b24
fix merge conflicts
2016-07-30 23:19:27 +02:00
Enno Rehling
0a9cbc308b
Merge pull request #523 from ennorehling/feature/bug-2207
...
fix seeding new players (bug 2207)
2016-07-30 22:54:51 +02:00
Enno Rehling
48615f3d66
Merge pull request #524 from ennorehling/feature/loglevels
...
control log levels with -l command line option
2016-07-30 22:54:25 +02:00
Enno Rehling
eebdcf5d93
control log level from command line (with -l, like -v)
...
make newplayer.lua use the autoseed module, eliminate duplication
seeding new players is broken
Conflicts:
src/gmtool.c
src/main.c
src/util/log.c
src/util/log.h
2016-07-30 22:46:57 +02:00
Enno Rehling
eb57473af5
slightly relax limits on quality for new player regions
2016-07-30 22:01:24 +02:00
Enno Rehling
f2c02232cd
http://bugs.eressea.de/view.php?id=2207
...
check that there are any regions that we can seed new factions into
don't run into endless loop
2016-07-30 22:01:10 +02:00