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

9155 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
28e9ddbdb4 Merge branch 'master' 2018-02-25 20:27:16 +01:00
Enno Rehling
b67db4faf9 remove unused ct_fleechance (misteltoe relic) 2018-02-25 13:22:41 +01:00
Enno Rehling
24a8d4e331 Merge remote-tracking branch 'upstream/master' 2018-02-25 11:59:28 +01:00
Enno Rehling
cf46acdc6a bufunit does not write an indent, doe not need the parameter. 2018-02-24 19:46:34 +01:00
Enno Rehling
42c86d122e stop using MINMAX macros. 2018-02-24 19:41:36 +01:00
Enno Rehling
8a00cc3b96 foolpotion test is not intermittent if we disable study.random_progress 2018-02-24 18:58:50 +01:00
Enno Rehling
e83d0a053a Merge branch 'master' 2018-02-24 18:24:59 +01:00
Enno Rehling
5990a99ae8
Merge pull request #770 from ennorehling/master 
fix types for CMakeCache
 2018-02-24 18:20:10 +01:00
Enno Rehling
c432bcf22e fix types for CMakeCache 2018-02-24 18:17:47 +01:00
Enno Rehling
e61cc22c45
Merge pull request #769 from ennorehling/master 
use sqlite, get ready for release.
 2018-02-24 18:13:28 +01:00
Enno Rehling
6c2f42ab61 upgrade clibs library 2018-02-24 17:59:03 +01:00
Enno Rehling
02c6c863a3 BUG 2416: Prefer sqlite over db backend 2018-02-24 17:37:51 +01:00
Enno Rehling
e6e520959d Merge remote-tracking branch 'upstream/master' 2018-02-24 17:32:14 +01:00
Enno Rehling
1f7a25b4c5 disable an intermittent check. 2018-02-24 16:48:39 +01:00
Enno Rehling
fa1e81f6ac write a log of dead factions. 2018-02-23 21:24:15 +01:00
Enno Rehling
5a1c6d87ca Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-02-18 11:46:14 +01:00
Enno Rehling
de52d8d669 BUG 2419: add a spell alias. 2018-02-18 11:46:05 +01:00
Enno Rehling
e841177e6f fix types for CMakeCache 2018-02-18 10:37:13 +01:00
Enno Rehling
66ce80e4b8 Merge remote-tracking branch 'upstream/develop' into develop 2018-02-18 10:32:26 +01:00
Enno Rehling
7c3e0a5225 BUG 2416: Prefer sqlite over db backend 2018-02-18 10:31:57 +01:00
Enno Rehling
0465c5c29c
Merge pull request #768 from ennorehling/develop 
weekly update
 2018-02-18 10:17:55 +01:00
Enno Rehling
f9fcc01829 print more debug information when a name is missing. 2018-02-17 21:18:00 +01:00
Enno Rehling
cb537b1a93 missing translations are the worst. 2018-02-17 21:08:58 +01:00
Enno Rehling
06f3e337b6 missing plural for lifepotion 2018-02-17 20:56:40 +01:00
Enno Rehling
6c572c6287 rename potion: p14 to healing 
fix use_item message crash
 2018-02-17 20:35:00 +01:00
Enno Rehling
b602ac5f1a remove P_POWER from use_potion 2018-02-17 19:02:02 +01:00
Enno Rehling
afe1cf34f3 rough acceptance test for elixir of power (p13) 2018-02-17 18:59:43 +01:00
Enno Rehling
ef7d0c40ed remove the two helaing special cases from use_potion 2018-02-17 18:51:11 +01:00
Enno Rehling
d065cbfca7 use_item message with amount instead of usepotion without. 2018-02-17 15:30:38 +01:00
Enno Rehling
4a3ad7ac84 fix potion tests, re-enable foolpotion test 2018-02-17 15:22:44 +01:00
Enno Rehling
438ae6f905 Eliminate rules.magic.multipotion, it's too much code. 2018-02-17 15:17:05 +01:00
Enno Rehling
a2d23d01fa Test: Heiltrank heilt mehrere Einheiten. 2018-02-17 12:52:58 +01:00
Enno Rehling
96062f6f85 rename p2->lifepotion (WdL) 2018-02-17 10:45:56 +01:00
Enno Rehling
8a8bf489ae clarify use_potion responsibilities. 
move USE potion of life to items.c.
fix some use_ function return values.
 2018-02-17 10:39:23 +01:00
Enno Rehling
e697a23f9d BUG 2419: fix and speed up volcano-survival through potions. 2018-02-16 20:06:36 +01:00
Enno Rehling
ad86e69e6b refactor the resurrection code. There is more work to be done here, too much duplicaton between battle and volcano. 2018-02-15 21:05:11 +01:00
Enno Rehling
a9375200e4 use_potion has a lot of scaffolding that use_healingpotion was duplicating. 2018-02-15 20:41:40 +01:00
Enno Rehling
bf591ecec5 BUG 2415: eliminate at_potiondelay and WdL delay. 
BUG 2419: refactor ointment and healing, add tests for USE
 2018-02-15 20:25:58 +01:00
Enno Rehling
7d789d9896 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-02-14 20:03:11 +01:00
Enno Rehling
4abc603d9d triggered a missing forward declaration. 2018-02-14 20:02:50 +01:00
Enno Rehling
d15684a546 fix test_process_turn failure. 
move turn global to calendar.
promote calendar module to kernel.
 2018-02-14 20:01:36 +01:00
Enno Rehling
f4be3a1374 remove duplication setstatus -> unit_setstatus 2018-02-14 11:24:38 +01:00
Enno Rehling
b5ea102372 cppcheck: scope reductions and a false positive. 2018-02-11 16:14:00 +01:00
Enno Rehling
398a258658 cppcheck: variable scopes, etc. 2018-02-11 15:57:31 +01:00
Enno Rehling
f67a4943e4 fix some cppcheck warnings 2018-02-11 15:43:24 +01:00
Enno Rehling
ff33073bd9 unused function 2018-02-11 15:00:19 +01:00
Enno Rehling
206dbd6939 Merge branch 'master' into develop 2018-02-11 10:37:31 +01:00
Enno Rehling
2d296d5b2a Merge branch 'master' of github.com:eressea/server 2018-02-11 10:10:14 +01:00
Enno Rehling
bb9d14b5ed missing script from install target 2018-02-11 10:07:57 +01:00
Enno Rehling
e06248cf1e remove residual data for an unfinished "city" feature. 2018-02-10 21:25:13 +01:00