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

9438 commits

This branch
This branch
All branches
Author SHA1 Message Date
Enno Rehling
a44085de7a spell flags, rearranged 2018-05-06 13:59:00 +02:00
Enno Rehling
17ea7a224a spell ranks cannot be negative 2018-05-06 09:02:27 +02:00
Enno Rehling
cd2435dbb0 spell xml does not define an index attribute 2018-05-06 09:00:11 +02:00
Enno Rehling
17356ad0a9
Merge pull request #778 from ennorehling/develop 
all the latest fixes
 2018-05-05 20:31:24 +02:00
Enno Rehling
dc3918f4a6 read spellbook (expat) 2018-05-05 07:48:38 +02:00
Enno Rehling
0e3170a0cb merge 2018-05-05 07:39:25 +02:00
Enno Rehling
d568e79490 spellbooks contain spellref, not spell *. 
for order-independent load from XML.
 2018-05-05 07:38:11 +02:00
Enno Rehling
3e2aa5b1a8 start ingesting spellbooks. 2018-05-05 06:05:50 +02:00
Enno Rehling
dca99ec79d negative, sir! 2018-05-04 18:53:35 +02:00
Enno Rehling
53f8b39e6e gcc and clang complain about unused function. 2018-05-04 18:50:44 +02:00
Enno Rehling
ad0f83dcca some xmlreader code still required that resources get loaded first. 2018-05-04 18:48:14 +02:00
Enno Rehling
85509cdf65 fix some bugs in reading weapons. 2018-05-04 18:41:59 +02:00
Enno Rehling
4e2171ace9 fix finding resources if xml is not processed in predetermined order. 2018-05-04 17:58:26 +02:00
Enno Rehling
82ba0e62d4 fix reading weapon damage. 2018-05-04 17:57:10 +02:00
Enno Rehling
704148e4bd more object types I haven't handled yet. 2018-05-03 23:04:32 +02:00
Enno Rehling
75aff73e9a Merge branch 'develop' 2018-05-03 23:01:42 +02:00
Enno Rehling
b31a1f798c BUG 2346: extract a test for ship tactics bonus. 2018-05-03 23:00:28 +02:00
Enno Rehling
34c6222b8f BUG 2436: Fix the E3 tactics bonus for ships. 2018-05-03 22:44:01 +02:00
Enno Rehling
5bcd8369af ignore sqlite setting errno 2018-05-03 22:40:54 +02:00
Enno Rehling
069047d0ac uninitialized variable crash, seenspells. 2018-05-03 22:32:11 +02:00
Enno Rehling
cb27895b81 parsing ships, done! 2018-05-03 22:27:28 +02:00
Enno Rehling
20b82fee51 old spellbooks no longer used anywhere 2018-05-02 21:55:17 +02:00
Enno Rehling
6d9ecd1879 finish loading buildings with expat. 2018-05-02 21:37:57 +02:00
Enno Rehling
50839068e5 Merge branch 'exparse' of https://github.com/ennorehling/eressea.git 2018-05-01 20:58:34 +02:00
Enno Rehling
59f74d0a98 parse building stages, too. 2018-05-01 20:58:30 +02:00
Enno Rehling
7128e1fb5c extract modifier parsing so it can be used for buildings. 2018-05-01 20:05:46 +02:00
Enno Rehling
d2eccd56b9 defaults 2018-05-01 19:39:41 +02:00
Enno Rehling
962b8082b7 fix test for lifepotion (tree growth was fuxxing it up) 2018-05-01 19:05:04 +02:00
Enno Rehling
e5d3d77c06 begin parsing buildings. 2018-05-01 18:52:48 +02:00
Enno Rehling
3db9d5d878 merge from develop. luxuty price conflict resolved. 2018-05-01 17:23:46 +02:00
Enno Rehling
b5b9611a16 eliminate construction.improvement, 
create building_type.stages instead.
 2018-05-01 15:40:11 +02:00
Enno Rehling
8a21b42b65 start extracting building-only construction stuff. 2018-05-01 11:22:47 +02:00
Enno Rehling
0b097371a1 items: less xpath, more child iteration. 2018-05-01 11:20:13 +02:00
Enno Rehling
dddbf5287a refactor construction list. 2018-05-01 10:53:12 +02:00
Enno Rehling
bddf4bff39 unnecessary xpath wrangling 2018-05-01 10:47:17 +02:00
Enno Rehling
c7ae070fa7 nobody needs the construct_t enum. 2018-05-01 07:02:55 +02:00
Enno Rehling
969c28692f Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-04-30 23:24:02 +02:00
Enno Rehling
b44e4e747d ships and items never have multi-stage builds. 
we are going to make sure of this soon.
 2018-04-30 23:23:48 +02:00
Enno Rehling
e0cae602dd add a test for building items. 2018-04-30 23:18:39 +02:00
Enno Rehling
e0e873044d fix stone golems (assert). 
remove improvement logic from build().
 2018-04-30 23:11:13 +02:00
Enno Rehling
22734a4ae4 refactor building stages into build_stages(). 
TODO: remove them from build().
 2018-04-30 22:52:38 +02:00
Enno Rehling
6b38fdf4e6 fix build 2018-04-30 20:25:58 +02:00
Enno Rehling
a8f6f1a40c there is no require element for weapons. oops. 2018-04-29 20:23:41 +02:00
Enno Rehling
2579bf71b5 fix test_troll_quarrying_bonus 2018-04-29 19:33:39 +02:00
Enno Rehling
12416e8b0d fix reading skill modifiers. 2018-04-29 18:44:17 +02:00
Enno Rehling
177e0159c4 init construction defaults. 2018-04-29 18:23:23 +02:00
Enno Rehling
ec9038a5ea fix copy/paste errors, remove armor element handlers. 2018-04-29 17:27:12 +02:00
Enno Rehling
10884c825e fix compile, invalid use of rc_mask. 2018-04-29 16:11:35 +02:00
Enno Rehling
f6735049d8 add a few tests for fighters equipping the right weapons and armor. 2018-04-29 15:25:46 +02:00
Enno Rehling
c01e9b24ad unit tests for racial weapon permissions. 2018-04-29 15:09:07 +02:00