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

6968 Commits

Author SHA1 Message Date
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
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
Enno Rehling e6aec1dde4 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-05-17 15:47:21 +02:00
Enno Rehling b5a84f07ba release version 3.8.11 
- disable autoseed (endless loop)
 2016-05-17 15:46:14 +02:00
Enno Rehling 21ee84dc65 autoseed barfs on blank lines, catch that case 2016-05-15 10:35:23 +02:00
Enno Rehling 741804d98d Merge pull request #508 from ennorehling/develop 
fix key-upgrade function (coverity CID 102076)
 2016-05-07 15:20:42 +02:00
Enno Rehling 65a163b4d9 do not seed new factions if there isn't a minimum number of them 2016-05-05 13:51:31 +02:00
Enno Rehling 65432748fb eliminate false positive CID 26252 (itoa36 is always 4 chars or less) 2016-05-04 16:35:07 +02:00
Enno Rehling 80716d0787 fix key-upgrade function (coverity CID 102076) 
fix MSVC warning (strncpy)
 2016-05-02 19:22:57 +02:00
Enno Rehling c4d31d368e Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/util/log.c
	src/util/log.h
 2016-05-01 13:47:30 +02:00
Enno Rehling 0557aa84ac release version 3.8.9 2016-05-01 13:40:10 +02:00
Enno Rehling f24b1c1cdc fix multi-logging 2016-05-01 13:40:01 +02:00
Enno Rehling 41277ed5ee prove that logging is broken (new test segfaults) 2016-05-01 13:39:25 +02:00
Enno Rehling 1fa1693119 test multiple loggers 2016-05-01 13:36:00 +02:00
Enno Rehling 13156a47a4 Merge pull request #507 from ennorehling/hotfix/bug-2201-remove_empty_factions 
Hotfix bug 2201, crash E3 turn 351
 2016-04-03 13:23:29 +02:00
Enno Rehling b2e8c75c02 add a test that should have crashed before my fix. 2016-04-03 12:37:26 +02:00
Enno Rehling 30b3cff657 fix a crash in write_game caused by remove_empty_factions 
https://bugs.eressea.de/view.php?id=2201
 2016-04-03 12:23:51 +02:00
Enno Rehling be89aaeb83 Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
 2016-03-26 22:28:14 +01:00
Enno Rehling bc8c39f4bb fix message-crash https://bugs.eressea.de/view.php?id=2199 
release version 3.8.7
 2016-03-26 22:09:21 +01:00
Enno Rehling 108b4404d2 Merge pull request #502 from ennorehling/feature/refactor-study 
refactor study.c
 2016-03-26 14:53:26 +01:00
Enno Rehling 29b715d128 Merge pull request #503 from ennorehling/refactor-cfindhash 
Kill cfindhash and the old Alp spell
 2016-03-26 14:53:03 +01:00