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

8235 Commits

Author SHA1 Message Date
Enno Rehling 604b574d0f fix potion-use? need more testing 2017-02-27 11:39:55 +01:00
Enno Rehling 715c8569ba hacked the item-use function, 
XML needs cleaning up, funpointer needs to die
 2017-02-27 09:48:28 +01:00
Enno Rehling 44c3838d79 WIP: itype->use elimination. 2017-02-27 04:22:28 +01:00
Enno Rehling 8b69b6d003 test peasantblood effects 2017-02-27 04:00:45 +01:00
Enno Rehling 132ac0a38a Merge remote-tracking branch 'upstream/develop' into develop 2017-02-26 20:23:25 +01:00
Enno Rehling 8246874907 Merge remote-tracking branch 'upstream/master' 2017-02-26 20:23:07 +01:00
Enno Rehling b8d9fae4e4 begin version 3.12 2017-02-26 20:16:22 +01:00
Enno Rehling b8ffc20d87 remove item_useonother callbacks (use is fine). 
add a test for foolpotion.
 2017-02-26 19:54:58 +01:00
Enno Rehling 3c60f863a5 remove the special_resources trie. 
memory leak, bad performance.
 2017-02-26 18:17:58 +01:00
Enno Rehling 56eb1b753c fix header missing a struct 2017-02-26 15:52:58 +01:00
Enno Rehling e34e71f0f4 Merge branch 'convert' into develop 2017-02-26 15:33:57 +01:00
Enno Rehling 71e5d101a8 converter compiles fine, does nothing 2017-02-26 15:33:32 +01:00
Enno Rehling f406c47657 use converter frm noxml branch 2017-02-26 15:30:58 +01:00
Enno Rehling 67252e2924 add conversion program 2017-02-26 15:03:47 +01:00
Enno Rehling 6e27adb892 remove pointless <resourcelimit/> wrapper from XML. 2017-02-26 14:00:20 +01:00
Enno Rehling d4b973fea4 remove resource_limit struct indirection. 2017-02-26 13:55:19 +01:00
Enno Rehling c3b0b9e8b3 fix missing limit-flags. 2017-02-26 13:47:22 +01:00
Enno Rehling 0738090f28 no more funpointers in resource_limit. 
change how resource limits in lua are called.
 2017-02-26 13:19:47 +01:00
Enno Rehling f4180638af also silence the git pull command and valgrind 2017-02-26 13:15:34 +01:00
Enno Rehling 7a1cebb259 silence the preview-build 2017-02-26 13:10:23 +01:00
Enno Rehling 114d088bb5 allow testers.txt to contain comments 2017-02-26 13:08:50 +01:00
Enno Rehling 2137c51509 Merge pull request #663 from ennorehling/develop 
ongoing refactoring towards the noxml branch
 2017-02-25 21:46:06 +01:00
Enno Rehling 84c6a4b7b5 remove last vestiges of the rm_* material names 2017-02-25 21:25:55 +01:00
Enno Rehling d039ca2b2e fix display of sapling and mallornsapling. 
remove mateiral from XML where it's not needed.
 2017-02-25 21:07:13 +01:00
Enno Rehling 6031dff685 resource_limit.value is always zero, never initialized. kill it. 2017-02-25 19:50:32 +01:00
Enno Rehling 3a985108a6 change all magic resistance to use fractions. 2017-02-24 20:47:47 +01:00
Enno Rehling e557140ad1 more fractions functionality. 2017-02-24 20:47:31 +01:00
Enno Rehling e0229be500 also implement subtraction. 2017-02-24 17:56:39 +01:00
Enno Rehling 234eb62226 short and sweet math with fractions. 
goinf to use this for magres.
 2017-02-24 17:51:35 +01:00
Enno Rehling 158e0646e1 implement fractions 2017-02-24 15:48:49 +01:00
Enno Rehling 25d3aacffa remove artrewards, they predate my backups 2017-02-24 14:38:08 +01:00
Enno Rehling 2d4b61afa9 the artacademy was E2-only 2017-02-24 14:32:18 +01:00
Enno Rehling 794dae11cf remove artsculpture and genericbuilding. 
deal with buildings having an unknown type.
 2017-02-24 14:29:14 +01:00
Enno Rehling bd59271b71 Samen-Definition normalisiert (mit XML/Lua). 
Tests repariert.
MACHE Samen gibt es in E3 nicht.
 2017-02-23 22:30:19 +01:00
Enno Rehling 6ce487e485 MACHE Samen geht in E3 nicht. limited ist unnoetig 2017-02-23 22:19:48 +01:00
Enno Rehling f06d86007c seed normalization (broken) 2017-02-23 22:08:16 +01:00
Enno Rehling 5e2903258c kill old <guard/> element from XML 2017-02-23 14:45:19 +01:00
Enno Rehling 9cbd5b88e6 rm_tree is not actually a thing 2017-02-23 08:07:47 +01:00
Enno Rehling be42137833 fix rmt_find for trees 2017-02-23 08:02:24 +01:00
Enno Rehling f4dc88c3be strip rawmaterial_type to just the funpointers 2017-02-23 07:53:28 +01:00
Enno Rehling 1498f2e1d7 refactor rawmaterial_type. 
still have to decide if we need it at all.
 2017-02-22 21:10:22 +01:00
Enno Rehling ce2ea95880 begin refactoring limited resources. 2017-02-22 20:28:34 +01:00
Enno Rehling 67831ad708 we like test_setup. 2017-02-22 20:16:51 +01:00
Enno Rehling 82e4d75429 unused function 2017-02-22 19:43:17 +01:00
Enno Rehling 807fe607e7 Merge branch 'develop' of https://github.com/ennorehling/eressea.git 2017-02-22 19:38:56 +01:00
Enno Rehling 3274065004 reduce complexity of building_protection. 2017-02-22 19:38:46 +01:00
Enno Rehling deb39f6b8f test building_effsize does what it does 2017-02-22 14:27:13 +01:00
Enno Rehling a8506442e1 Merge pull request #662 from ennorehling/develop 
refactoring race XML
 2017-02-20 22:14:49 +01:00
Enno Rehling bfb5a9b692 set age_unit and name_unit funpointers in rc_create. 
no more <function/> in XML races.
rename juju-zombie => juju.
 2017-02-20 22:07:36 +01:00
Enno Rehling 7e4b0ac717 fix XML file 2017-02-20 21:21:05 +01:00