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

9220 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Enno Rehling
c6ba91981c fix turn processing check 2018-02-10 21:13:09 +01:00
Enno Rehling
77a8c24ead disable process test turn check (recent change). 
make all tests run from inside the tests directory
 2018-02-10 18:52:03 +01:00
Enno Rehling
17d1771d49 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-02-10 18:07:09 +01:00
Enno Rehling
c1c7da322d
Badges? We want them stinking badges! 2018-02-10 18:06:02 +01:00
Enno Rehling
eb6271bbb8 CID 182781 I broke the wage logic. 2018-02-10 17:53:59 +01:00
Enno Rehling
e300605e87 fix gcc build 2018-02-10 17:31:48 +01:00
Enno Rehling
fe29f2433a convert multiple seenspell attributes to single seenspells list. faster? maybe. 2018-02-10 16:50:05 +01:00
Enno Rehling
c3fce574fb fix reading old data files. 2018-02-10 11:26:39 +01:00
Enno Rehling
1035a98fd3 make attrib use a variant, not a custom union. 
change attrib_type methods to take a variant, not the entire attrib.
 2018-02-09 21:20:43 +01:00
Enno Rehling
cfc3171021 constrict the seenspell module a bit more, move functionality inside. 2018-02-08 19:37:47 +01:00
Enno Rehling
ec48017520 move spell reporting attributes to a separate module. 2018-02-08 18:33:58 +01:00
Enno Rehling
87081a37bc CID 182717 call fclose, always 2018-02-08 08:33:27 +01:00
Enno Rehling
4f63cf12b2 firesword, magical damage 2018-02-07 19:35:24 +01:00
Enno Rehling
5a3978566a adamantium and laen weapons are magical. 2018-02-07 18:46:31 +01:00
Enno Rehling
9ee84445eb stop using MIN and MAX macros 2018-02-07 18:39:20 +01:00
Enno Rehling
0884fb1f1b CID 182685 check for utf8 encoding errors. 2018-02-07 18:05:14 +01:00
Enno Rehling
8a74ac81e0 Merge remote-tracking branch 'upstream/develop' into develop 2018-02-07 17:59:12 +01:00
Enno Rehling
f08514eaf2
Merge pull request #767 from ennorehling/noxinclude 
remove the XInclude mess
 2018-02-07 17:58:24 +01:00
Enno Rehling
d1a393610c begin work on 3.16 release 2018-02-07 17:57:24 +01:00
Enno Rehling
89d158b126
Merge pull request #766 from eressea/develop 
preparing release 3.15
 2018-02-07 16:22:22 +01:00
Enno Rehling
907c5fc601 unused variable. 2018-02-06 21:39:52 +01:00
Enno Rehling
1ee6f5444a finish XInclude removal project. 
reduce number of XML files for E3.
 2018-02-06 21:28:55 +01:00
Enno Rehling
9d54dac0f5 merge 2018-02-06 18:49:38 +01:00
Enno Rehling
df255b886a verify xml loading, fix remaining files for e2. 2018-02-06 18:46:28 +01:00
Enno Rehling
434b7ae29e convert all of E2 to new config loading. 2018-02-05 19:35:15 +01:00
Enno Rehling
da02c1b92e Use custom URI schemes for config files. 
TODO: XML files need to be rebased, XIncludes replaced.
 2018-02-05 17:46:11 +01:00
Enno Rehling
92f82c3608 plan to eliminate xinclude use, move to single config file with includes. 2018-02-05 17:46:11 +01:00
Enno Rehling
79b54060f9 Merge remote-tracking branch 'upstream/develop' into develop 2018-02-05 17:45:06 +01:00
Enno Rehling
961c6e0130 delete unused XML files 2018-02-05 17:41:35 +01:00
Enno Rehling
6ef8d1af3c Use custom URI schemes for config files. 
TODO: XML files need to be rebased, XIncludes replaced.
 2018-02-05 03:44:26 +01:00
Enno Rehling
82be89e9ed
Merge pull request #765 from ennorehling/develop 
Mac builds, Braineater diet
 2018-02-04 20:47:27 +01:00
Enno Rehling
a316283a6d plan to eliminate xinclude use, move to single config file with includes. 2018-02-04 20:02:01 +01:00
Enno Rehling
2d7d46d3ac Merge small braineater units to reduce memory pressure. 2018-02-04 19:13:04 +01:00
Enno Rehling
a8c9576937 fix mac build 2018-02-04 14:59:01 +01:00
Enno Rehling
48bb6c65da Merge branch 'master' into develop 2018-02-04 12:09:39 +01:00