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
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
Enno Rehling
c31f543718
Merge pull request #522 from ennorehling/feature/bug-2221
...
logging and fixing of live data for bug 2221
2016-07-30 21:24:44 +02:00
Enno Rehling
31feeecbd8
logging and fixing of live data for bug 2221
...
additional lua test that failed to find the issue
https://bugs.eressea.de/view.php?id=2221
2016-07-30 21:13:42 +02:00
Enno Rehling
9f836e2f4b
Merge pull request #519 from CTD1/master
...
Fix VS Warning about bool - int convertion
2016-07-15 11:10:12 +02:00
CTD
f324408b6f
Fix bool - int conversion the other way
2016-07-15 10:48:37 +02:00
Enno Rehling
4b0463557f
Merge pull request #521 from ennorehling/feature/nocrypt
...
remove all password hashing code
2016-07-13 19:40:20 +02:00
Enno Rehling
87eafaeb99
remove all password hashing code
2016-07-13 19:10:22 +02:00
CTD
65eab060a0
fix vs bool - int conversion warning
2016-07-12 13:24:17 +02:00
CTD
c63b8a2028
Merge remote-tracking branch 'refs/remotes/eressea/develop'
2016-07-12 10:26:38 +02:00
Enno Rehling
3fa34f8238
Merge pull request #494 from stm2/bug_2193
...
fixed a few typos in E3 spells (bug 2193)
2016-07-08 10:31:39 +02:00
Enno Rehling
8d4a2ed688
Merge branch 'master' into develop
...
Conflicts:
src/buildno.h
2016-07-03 11:10:04 +02:00
Enno Rehling
ca7b250c46
otherfaction can be null if not f->alive
2016-07-03 11:02:21 +02:00
Enno Rehling
dbaad4c403
release version 3.8.14
2016-07-03 10:59:50 +02:00
Enno Rehling
defc5c19e7
Merge branch 'stm2-healing_potion' into develop
2016-06-17 21:53:56 +02:00
Enno Rehling
40dbe2b0cb
delete old healing effects on read
...
remove obsolete effect-handling from battle.c
2016-06-17 21:49:31 +02:00
Steffen Mecke
e6907f570e
use up old potion effects
2016-06-13 09:25:08 +02:00
Steffen Mecke
afdd20c4dd
healing potion works once per battle with 100%
2016-06-12 23:23:22 +02:00
Steffen Mecke
61d93b7931
fix two bugs concerning horse bonus
...
switched E3 horse damage and attack bonuses
horses help fleeing if when riding is 0
2016-06-12 23:16:06 +02:00
Steffen Mecke
eaa94086eb
one more fix
2016-06-12 00:05:19 +02:00
Enno Rehling
61acd40424
Merge pull request #512 from stm2/dragon_growl
...
Dragon growl
2016-06-11 23:16:23 +02:00
Enno Rehling
9b284b424f
Merge pull request #513 from ennorehling/feature/bug-2211-reshow-race
...
Bug 2211: ZEIGE Elf
2016-06-11 23:14:41 +02:00
Enno Rehling
3a61326e1a
Merge pull request #514 from ennorehling/feature/bug-2206-parse_token
...
parse_token buffer overrun
2016-06-11 23:14:29 +02:00
Enno Rehling
2fa9f7efeb
Merge pull request #515 from ennorehling/bug-2191-terrain-flags
...
simplify terrain flags
2016-06-11 23:14:16 +02:00
Steffen Mecke
c5014fd766
integrated Ennos suggestions for dragon growls
...
Dragons now growl 20% more elegantly!
2016-06-11 13:47:38 +02:00
Enno Rehling
78fa6d3a47
remove the SAIL_INTO flag
2016-06-10 20:55:27 +02:00
Enno Rehling
7fd1d3d616
remove ocean from coasts, SEA_REGION is enough
2016-06-10 20:50:22 +02:00
Enno Rehling
2b17656efe
custom message for insects that cannot enter a region.
2016-06-10 20:45:23 +02:00
Enno Rehling
f08957b513
test target selection rules for drifting ships.
2016-06-10 18:24:18 +02:00
Enno Rehling
546ffe87b8
change ship_allowed constants just a little bit
2016-06-10 18:00:22 +02:00
Enno Rehling
394621956d
missing include, gcc fix
2016-06-07 21:51:56 +02:00
Enno Rehling
4414d7ef57
fix parse_token buffer overrun.
...
missing tests for parse_token.
this fixes http://bugs.eressea.de/view.php?id=2206
2016-06-07 21:47:09 +02:00
Enno Rehling
1443c24b36
fix gcc build
2016-06-06 23:45:11 +02:00