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

9468 Commits

Author SHA1 Message Date
Enno Rehling 94769a66f8 teach vs canteach mixup 2018-05-10 20:18:56 +02:00
Enno Rehling ad0491cecb Merge branch 'develop' 2018-05-10 20:03:16 +02:00
Enno Rehling 53ced88176 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-05-10 20:02:59 +02:00
Enno Rehling b0012eeae0 familiars do not need the default value in XML (bad XML). 2018-05-10 20:02:53 +02:00
Enno Rehling 2a213d9302 try to analyze intermittent bug on travis 2018-05-10 18:03:47 +02:00
Enno Rehling 48a4de0768 parse race/attack data 2018-05-10 07:01:46 +02:00
Enno Rehling fc052034ac Merge branch 'exparse' of https://github.com/ennorehling/eressea.git 2018-05-09 22:23:40 +02:00
Enno Rehling 907348adfc merge race xml changes (teach, migrants, floating point) 2018-05-09 22:21:50 +02:00
Enno Rehling c05a65b881 expat parses (most of) races. 
fix canteach flag in XML.
 2018-05-09 22:16:30 +02:00
Enno Rehling 8c7b890f3e set the default unarmed modifiers for races. 2018-05-09 20:56:38 +02:00
Enno Rehling 9e6ae0edc1 make str_strdup more forgiving 2018-05-09 07:14:56 +02:00
Enno Rehling f2e6825dab Merge branch 'develop' 2018-05-08 23:22:31 +02:00
Enno Rehling 3f9b3219fe BUG 2348: bad XML 2018-05-08 23:22:05 +02:00
Enno Rehling c9b9bac2ac Merge branch 'develop' 2018-05-08 23:11:14 +02:00
Enno Rehling ae3c0b099f spells do not have a function element in XML 2018-05-08 23:10:51 +02:00
Enno Rehling b197bb395d parse spell components. 2018-05-08 23:06:33 +02:00
Enno Rehling 371335ab95 spell flag merge conflicts 2018-05-08 21:45:21 +02:00
Enno Rehling ccf09770e3 rename global target flag, invert logic 2018-05-08 21:43:13 +02:00
Enno Rehling d45c32f1ac Merge branch 'develop' 2018-05-08 21:32:45 +02:00
Enno Rehling 4bcaaa5f79 remove debug code 2018-05-07 20:24:59 +02:00
Enno Rehling 6746401330 BUG 2437: fetch_astral should have no aura cost when given bad units. 2018-05-07 20:22:02 +02:00
Enno Rehling 68de367a98 print an error instead of asserting. 2018-05-06 19:27:22 +02:00
Enno Rehling cfe21e7e1d re-enable tests, allow more spell arguments. 
a list of ships, units, etc can be long!
 2018-05-06 19:07:20 +02:00
Enno Rehling d0d366485e Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2018-05-06 19:02:55 +02:00
Enno Rehling 14f59e4bfe functional tests for pull_astral spell. 2018-05-06 19:02:47 +02:00
Enno Rehling 4d3718bab9 find out why t<=0 assert happens sometimes 2018-05-06 18:05:35 +02:00
Enno Rehling 5af775ba87 prevent out-of-bounds read. 2018-05-06 16:35:23 +02:00
Enno Rehling 088747ea81 code style 2018-05-06 15:50:44 +02:00
Enno Rehling cd2624de8a stop reallocation spell parameters. 
fix involuntary tree growth in test, message check.
 2018-05-06 15:49:34 +02:00
Enno Rehling adbf1098b9 we fail tests when not reading spell components. 2018-05-06 14:02:44 +02:00
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