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

9384 Commits

Author SHA1 Message Date
Enno Rehling 1ef57ef4f0 merge conflicts, race masking. 2018-04-29 13:50:56 +02:00
Enno Rehling 837ab325f9 XML simplificatio: unified system for masking races on modifiers. 2018-04-29 13:46:17 +02:00
Enno Rehling ac786e034c extract rc_mask, add it to exparse code. 2018-04-29 13:16:07 +02:00
Enno Rehling 3cb1d1a071 simplify race masking for weapon modifiers. 2018-04-29 13:13:10 +02:00
Enno Rehling dc891a94b4 armor and weapon are harder to read than other items. 
modifier handling for weapons seems ok, except races.
 2018-04-29 10:32:10 +02:00
Enno Rehling e86f3e7589 read callback fucntions for resources and weapons. 2018-04-28 21:46:01 +02:00
Enno Rehling 46f5fa0211 item does not have funtions. 
resourcelimit is gone.
 2018-04-28 21:27:34 +02:00
Enno Rehling 4812fa1c41 unnecessary xpath searches. 
1. item does not have functions.
2. resourcelimit is gone.
 2018-04-28 21:25:26 +02:00
Enno Rehling 9dbfaea708 parse construction requirements for items. 2018-04-28 21:12:28 +02:00
Enno Rehling 9d3385de97 still cannot read potions, requirements, functions. 2018-04-28 18:49:13 +02:00
Enno Rehling e4a2b6cb35 loading armor with expat. 2018-04-28 18:47:17 +02:00
Enno Rehling 16cebed013 implement weapons loading with expat. 2018-04-28 18:40:14 +02:00
Enno Rehling ce50b888c9 finish loading luxury items. 2018-04-28 18:10:04 +02:00
Enno Rehling ff4bae4da1 delete unused static functions. 2018-04-28 17:52:48 +02:00
Enno Rehling 03cff6d595 extract rc_mask, add it to exparse code. 2018-04-28 16:14:32 +02:00
Enno Rehling edadf2cbab exparse: parse (most of) the resource data. 2018-04-28 15:58:14 +02:00
Enno Rehling 08663b6eb5 fix last commit. refactoring with the MSVC IDE is prone to errors. 2018-04-28 15:57:51 +02:00
Enno Rehling 0b22b50013 the presspass is cursed, attribute needs to be on item, not resource. 2018-04-28 11:38:11 +02:00
Enno Rehling c3b25328d3 don't exist with a leak, fix MSVC compilation. 2018-04-24 21:16:56 +01:00
Enno Rehling b28cbd606d minimal expat parsing code 2018-04-24 22:04:23 +02:00
Enno Rehling 6207211ba9 add skeleton for expat suport 2018-04-24 21:50:49 +02:00
Enno Rehling b868a54f0b use sbstring for make_movement_order. 2018-04-22 18:12:55 +01:00
Enno Rehling 2f7637f953 add a unit test for make_movement_order, too. 2018-04-22 18:08:56 +01:00
Enno Rehling 0171c74e19 refactor monster movement planning, test at_hate. 2018-04-22 18:04:09 +01:00
Enno Rehling fc4b7ba73d refactor: extract cycle_route and test it (with PAUSE). 2018-04-22 11:02:05 +01:00
Enno Rehling 915706d6f8 BUG: at_hate stores a unit, never an int. 
https://bugs.eressea.de/view.php?id=2432
 2018-04-21 23:18:35 +01:00
Enno Rehling a2ded29c8a Merge branch 'develop' of github.com:eressea/server into develop 2018-03-25 15:00:11 +02:00
Enno Rehling 47d08d82cd
Merge pull request #777 from ennorehling/develop 
BUG 2427 and signal handling
 2018-03-23 17:11:15 +01:00
Enno Rehling ef96ec9de0 additional testing 2018-03-17 12:55:26 +01:00
Enno Rehling 3bca8d969a Merge branch 'master' into develop 2018-03-16 21:58:52 +01:00
Enno Rehling 121bf343ea fix get_command for K_STUDY (still bug 2427). 2018-03-16 21:49:24 +01:00
Enno Rehling db5d9e069e failing test for bug 2427: create_order(K_STUDY, ...) 2018-03-16 19:52:54 +01:00
Enno Rehling fa1056a696 fix sigaction code for macos 2018-03-16 16:21:33 +01:00
Enno Rehling ac8ae18588 allow a per-game seed in eressea.ini 2018-03-11 19:10:08 +01:00
Enno Rehling 9ba255e269 allow a maxnmr setting in eressea.ini to override the nmr.timeout rule. 2018-03-11 19:07:05 +01:00
Enno Rehling ed46a24f58 re-enable backtraces on linux. 2018-03-11 16:52:07 +01:00
Enno Rehling 9243f30c0e Merge branch 'develop' of github.com:eressea/server into develop 2018-03-11 15:00:11 +01:00
Enno Rehling d1ab941eac
Merge pull request #775 from ennorehling/develop 
ongoign changes and bug fixes for 3.16
 2018-03-11 14:54:23 +01:00
Enno Rehling da984b5880 BUG 2425: lighthouses can see units. 2018-03-11 14:40:38 +01:00
Enno Rehling 6d98a5dc4f BUG 2424 remove invlaid assertion 2018-03-11 11:39:57 +01:00
Enno Rehling 346f56ebdb merge conflict description namespace vs. xinclude removal and new potion names. 2018-03-11 09:19:16 +01:00
Enno Rehling bf21f24f98 BUG 2426: E3 hat kein RC_TEMPLATE, split potion names and descriptions 2018-03-11 09:02:02 +01:00
Enno Rehling 67a2f0bacd detect missing lua library 2018-03-10 18:32:31 +01:00
Enno Rehling b0840f83ef detect missing lua library 2018-03-10 18:27:11 +01:00
Enno Rehling 54ee7c04dc seenspell conversion bugfix 2018-03-10 17:46:48 +01:00
Enno Rehling ef3b72ceb7 BUG 2423: only apply other skill modifiers if race-modifier doesn't drop skill below 1. 2018-03-04 20:30:34 +01:00
Enno Rehling 7e33b2a94d BUG 2379: Test war kaputt (newterrain), getesteter Code auch. 2018-03-04 20:15:42 +01:00
Enno Rehling db253ea6a1 newterrain was unfit for unit testing. 
bad test: insects cannot trade in deserts without castle.
 2018-03-04 20:03:13 +01:00
Enno Rehling f997ff7e59 build problems. this looks like a merge conflict. 2018-03-04 18:21:00 +01:00
Enno Rehling fca684cf81 preview game 4 again 2018-03-04 11:49:02 +01:00