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

7213 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Enno Rehling
44d8f49bc3 test SHOW <race> only works for your own race. 
testing message contents is hard!
 2016-06-06 23:39:40 +02:00
Enno Rehling
c79ecc1a78 fix bug 2211, ignore a match for items we don't have. 2016-06-06 23:24:33 +02:00
Enno Rehling
eac94bdf4a add a test that demonstrates bug 2211 2016-06-06 22:14:28 +02:00
Steffen Mecke
cafa29426f simplified message_test 2016-05-31 10:37:01 +02:00
Steffen Mecke
ce312afc95 fix dragon growl for regions with an apostrophe 2016-05-31 01:54:06 +02:00
Steffen Mecke
96b7c92d81 fail fast for wrong message parameters 
simplifies debugging
 2016-05-31 01:54:06 +02:00
Enno Rehling
5535beed61 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/save.c
 2016-05-29 11:13:19 +02:00
Enno Rehling
0639e2ef1f Merge pull request #511 from ennorehling/master 
Fix 55 NMR abort, E2 turn 978
 2016-05-29 11:11:15 +02:00
Enno Rehling
72d9f8adf0 For NMR purposes, count cursed factions like NPCs (i.e. not). 
fix warnings in log tests
log whitespace cleanup
 2016-05-29 10:58:49 +02:00
Enno Rehling
a313d87c00 Merge pull request #510 from ennorehling/develop 
Bugfix at_keys
 2016-05-28 20:29:58 +02:00
Enno Rehling
6148273d97 http://bugs.eressea.de/view.php?id=2210 
fix deprecated attributes (at_key) yet again.
 2016-05-28 20:26:59 +02:00
Enno Rehling
2282bdf3d1 release version 3.8.12 2016-05-20 23:08:23 +02:00
Enno Rehling
c1b0395a6c Merge branch 'master' into develop 
Conflicts:
	src/kernel/save.test.c
	src/kernel/version.h
 2016-05-20 23:07:18 +02:00
Enno Rehling
400bca30b1 Merge pull request #509 from ennorehling/hotfix-passwords 
fixing the password saving test.
 2016-05-20 22:56:17 +02:00
Enno Rehling
cdd7606f02 fixing the password saving test. 2016-05-20 22:38:18 +02:00
Enno Rehling
01035a7325 password reading from external file is active, but broken. yikes 2016-05-20 20:49:47 +02:00