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

5908 Commits

Author SHA1 Message Date
Enno Rehling 9b75f369a1 Temporarily disable osx build on Travis 2015-09-04 14:44:04 +02:00
Enno Rehling 552f32ff97 bugfix https://bugs.eressea.de/view.php?id=2133 
era in the CR is wrong for E2
build in the CR should be a string (did not have quotes)
Lua < 5.2 does not have bit32 (and Windows build uses 5.1)
 2015-09-04 14:39:44 +02:00
Enno Rehling 6d592a4460 drifting ships do not take damage (forum debate), version update 2015-08-31 12:53:24 +02:00
Enno Rehling f0a9cc8233 added a lua module that marks factions as cursed 2015-08-31 12:50:58 +02:00
Enno Rehling a00fdf9316 fix hitpoints for summoned wolves 2015-08-31 12:50:47 +02:00
Enno Rehling 4dc94323d8 added a lua module that marks factions as cursed 2015-08-31 11:36:30 +02:00
Enno Rehling 94850e86cb fix hitpoints for summoned wolves 2015-08-31 11:12:45 +02:00
Enno Rehling 70aff6f567 Merge pull request #283 from ennorehling/cursed-faction 
The revenge of Igjarjuk
 2015-08-31 07:58:16 +02:00
Enno Rehling 8c860811e2 Summon Igjarjuk only at the start of a battle, not after. 2015-08-30 23:15:04 +02:00
Enno Rehling acb2aed30f add message for igjarjuk effect 2015-08-30 11:01:53 +02:00
Enno Rehling 7bb882b15b add a spell for igjarjuk (WIP) 2015-08-30 10:57:08 +02:00
Enno Rehling efca4d1979 fix last merge, signature of effskill changed 2015-08-29 15:00:59 +02:00
Enno Rehling 78cf76464a Merge pull request #281 from ennorehling/todo-cleanup 
code cleanup
 2015-08-29 14:09:36 +02:00
Enno Rehling e4026e0f6b eliminate more non-critical arguments. 2015-08-27 16:59:39 +02:00
Enno Rehling 20ab40dc2b Merge branch 'todo-cleanup' of github.com:ennorehling/eressea into todo-cleanup 
Conflicts:
	src/attributes/stealth.c
 2015-08-27 16:54:42 +02:00
Enno Rehling 564a041b0d eliminate invalid assertions, remove unnecessary arguments (plant/breed/trees) 2015-08-27 16:53:36 +02:00
Enno Rehling 66d8e3c7ba fix linux build, kill invalid assert 2015-08-27 16:23:30 +02:00
Enno Rehling de808bf146 change effskill signature to take a region, change eff_skill to work on a skill * to avoid multiple lookups. 2015-08-27 16:16:55 +02:00
Enno Rehling 6889cb0c80 remove superfluous argument from herbsearch 
use effskill, not eff_skill
 2015-08-27 14:46:08 +02:00
Enno Rehling 71dea1eca7 backfill missing tests for herbsearch (alchemy). 2015-08-27 13:19:58 +02:00
Enno Rehling eb26cc971f Testing bufunit with skills and different viewers. 2015-08-26 21:19:14 +02:00
Enno Rehling bc1c3dd712 move NEWATSROI out of item_modification 2015-08-26 19:59:11 +02:00
Enno Rehling f5f24cc7aa Merge pull request #280 from ennorehling/feature/bug-2131-familiar-skillbonus 
Bug 2131: familiar skillbonus stopped working
 2015-08-26 08:50:49 +02:00
Enno Rehling c5f4d213ce test familiar/mage connection and ageing of same. 2015-08-26 08:42:45 +02:00
Enno Rehling b27f0787a8 test familiar skill bonus 2015-08-26 08:36:25 +02:00
Enno Rehling 4dee1744a2 write some tests around effskill and skillmod. 2015-08-26 08:22:51 +02:00
Enno Rehling 5fc1587879 age_unit accidentally returned AT_AGE_REMOVE (caused by a recent change to curse_age) 2015-08-25 22:50:58 +02:00
Enno Rehling 9586d970e8 fix bad castorder creation for combat spell (some unions are the WORST) 2015-08-22 18:51:10 +02:00
Enno Rehling dd667aa752 cursed factions get to fight a wolfhowl if they attack (WIP) 2015-08-22 17:56:36 +02:00
Enno Rehling 4c32fe19ee eliminate some dead code that was still marked with TODO. 2015-08-21 10:54:09 +02:00
Enno Rehling 89bc83c4ab Merge branch 'master' into develop 
Conflicts:
	src/bind_region.c
	src/buildno.h
	src/kernel/item.c
 2015-08-20 16:58:07 +02:00
Enno Rehling d69bf18e23 suspect some submodule shenanigans 2015-08-20 16:26:32 +02:00
Enno Rehling 853290413f fix segfault, disable intermittent test 2015-08-20 16:18:15 +02:00
Enno Rehling f12454870f fix segfault, disable intermittent test 2015-08-20 16:17:19 +02:00
Enno Rehling dfb0bcaccf Merge branch 'master' into develop 
Conflicts:
	src/buildno.h
	src/kernel/save.c
	src/laws.c
 2015-08-20 15:49:36 +02:00
Enno Rehling 1641e6ef89 remove spellbook repair code, we are done 2015-08-20 15:09:38 +02:00
Enno Rehling ecd023f7ac Merge pull request #279 from ennorehling/hotfix/3-5-5-spellevels-bug-2129 
version 3.5.5: fixing the spellbook desaster
 2015-08-20 13:10:01 +02:00
Enno Rehling 469701a6ff fix linux build 2015-08-20 12:56:33 +02:00
Enno Rehling 8716e5fdc5 repair spellbooks that broke in E3 and E4 (temporary measure, remember to remove this code). 2015-08-20 12:13:09 +02:00
Enno Rehling ff38d8bf4c I don't think it's good to call update_spells before the turn. 
one should only have the spells that are in the previous week's report.
a few comments wouldn't hurt.
 2015-08-20 12:12:17 +02:00
Enno Rehling e6eb53c864 save the faction.max_spelllevel in the data file, do not recalculate it each time. 
when recalculating it, include spellbook to determine max-level (dead mages may have pushed the level up).
 2015-08-19 19:43:47 +02:00
Enno Rehling e5ffd50b4f Merge pull request #278 from ennorehling/feature/bug-2128-travelthru-split 
Bug 2128: Durchreisemeldugnen im NR sind zu lang
 2015-08-19 16:16:10 +02:00
Enno Rehling fc308940b5 fix linux build 2015-08-19 14:50:24 +02:00
Enno Rehling a9ecd1f55e replace all at_travelunit code with travelthru_map calls. 
welcome to callback hell.
this should stop the buffer for travelthru from running over.
tests for this should be hell, and I still owe writing them.
 2015-08-19 14:37:51 +02:00
Enno Rehling ebe365fd6e move travelthru logic to a separate module. todo: split off the report writing from the collection of units. 2015-08-18 18:57:04 +02:00
Enno Rehling 1f4c8d5858 fix linux build, missing include 2015-08-18 17:28:07 +02:00
Enno Rehling 5bc4f7f144 add some simple tests for writing travelthru information to the report, fix test that sets errno as a side effect (thanks, Microsoft!) 2015-08-18 17:08:02 +02:00
Enno Rehling a91e4c6e71 Merge pull request #277 from ennorehling/feature/bug-2128-travelthru-length 
refactoring: wrptr takes an int, not a size_t
 2015-08-18 10:26:56 +02:00
Enno Rehling c8cbeea660 STRLCPY macro redefinition and fixes for gcc. work for monkeys. 2015-08-17 22:48:21 +02:00
Enno Rehling 681697fd47 gcc still more picky than clang. 2015-08-17 20:32:02 +02:00