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

8402 Commits

Author SHA1 Message Date
Enno Rehling c276b5a43c generate error, not crash. 
todo: fix items
 2017-02-28 14:22:59 +01:00
Enno Rehling 5a01eae522 make item_use function crash if new and old rules do not agree 
add a 'test' function to E3 that exercises all those items
 2017-02-28 14:22:59 +01:00
Enno Rehling 9871d6f23f remove unused files 2017-02-28 04:03:36 +01:00
Enno Rehling 75ce6fd23a regaura=1 is default 2017-02-28 03:49:47 +01:00
Enno Rehling 69e28034b4 Kill unused "magicboost" function. 
I have no idea why this exists.
 2017-02-27 21:00:15 +01:00
Enno Rehling 49d8a03eca remote the item_type.use funpointer. 2017-02-27 20:41:05 +01:00
Enno Rehling 9e239c88f4 testing insect warmth potion 2017-02-27 20:26:48 +01:00
Enno Rehling 462d0118e3 better testing for some items. 2017-02-27 20:16:50 +01:00
Enno Rehling 9d09574d5e enable process_orders to be done in steps. 
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
 2017-02-27 19:35:14 +01:00
Enno Rehling 1b93c14806 Test E2 items in E2 only. 
Remove eye of demon (broken item).
 2017-02-27 18:50:48 +01:00
Enno Rehling 1a0992e37b remove remainders of the arena. 
Auge des Drachens haben noch einige Spieler, darf nicht gelöscht werden.
move item tests to tests/items.lua
 2017-02-27 18:21:41 +01:00
Enno Rehling 108501e398 tests for more items 2017-02-27 15:14:52 +01:00
Enno Rehling 3d4860c033 remove more of the artrewards 2017-02-27 14:19:25 +01:00
Enno Rehling db0cbf34c7 test for aurapotion 2017-02-27 14:17:38 +01:00
Enno Rehling 5ffe60193b move items with tests to items.c 2017-02-27 14:10:12 +01:00
Enno Rehling 60c2f1e807 test the birthday amulet 2017-02-27 14:01:41 +01:00
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