summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-07-17Merge branch 'RubberBat' into 'master'Jesusaves3-1/+24
2020-07-17Rubber Bat - Correctly duplicates Legacy functionality.Quillia Aeuda3-1/+24
2020-07-16Merge branch 'ci' into 'master'gumi1-320/+9
2020-07-15use the same asan options from the travis testsgumi1-0/+1
2020-07-14simplify the ci pipeline to the bare minimumgumi1-320/+8
2020-07-14add the missing SI icons in sc_configgumi1-1/+31
2020-07-13add editorconfiggumi1-0/+9
2020-07-13update for hercules v2020.06.28gumi45-1382/+6353
2020-07-10Merge branch 'jesusalva/craft' into 'master'Jesusaves12-58/+413
2020-07-10Implements Crafting Core systemJesusaves12-58/+413
2020-07-02Fix tiny bugsJesusaves1-3/+3
2020-06-25Add a handy reference to item_db.confJesusaves1-1/+19
2020-06-18Merge branch 'content' into 'master'Micksha15-45/+1684
2020-06-18ContentMicksha15-45/+1684
2020-06-17Merge branch 'kfahr' into 'master'Jesusaves5-11/+810
2020-06-17First version of the new kfahr script.toams5-11/+810
2020-06-17Merge branch 'jesusalva/faction' into 'master'Jesusaves3-34/+30
2020-06-17This will not cause any immediate change, but it is the definition for the fa...Jesusaves3-34/+30
2020-06-17Merge branch 'jesusalva/selfmadeproblems001' into 'master'Jesusaves15-144/+210
2020-06-17Contains fixes/reordering for races, guilds and genders.Jesusaves15-144/+210
2020-06-07Fix elemental attribute table.Hocus1-12/+12
2020-06-07Fix incorrect comment in attr_fix.Jesusaves1-2/+2
2020-05-27Merge branch 'jesusalva/serena' into 'master'Jesusaves13-48/+319
2020-05-27At least, now you can reach Argaes. Poorly balanced.Jesusaves13-48/+319
2020-05-27Merge branch 'jesusalva/candor' into 'master'Jesusaves20-59/+207
2020-05-27Placeholder for the NPCs at CandorJesusaves20-59/+207
2020-05-24Merge branch 'thief' into 'master'Jesusaves56-132/+1502
2020-05-24Faction Core, Quest ID rewrite, Thieves Path.Micksha56-132/+1502
2020-05-15[ci skip] Rouge doesn't like uppercase language identifiersgumi1-1/+1
2020-05-15[ci skip] make Rouge highlight scripts as if they were Cgumi1-1/+1
2020-05-15[ci skip] make Linguist highlight scripts as if they were Cgumi1-0/+2
2020-05-12Fix some minor stylingJesusaves1-2/+2
2020-05-11Merge branch 'marriage' into 'master'gumi5-315/+1
2020-05-09remove the entire notion of marriagegumi5-315/+1
2020-05-07Merge branch 'jesusalva/treasure' into 'master'Micksha10-29/+344
2020-05-07Random, Wild Treasure Chests were sighted in Hurnscald Caves!Jesusaves10-29/+344
2020-05-07Merge branch 'manatree' into 'master'Micksha1-1/+1
2020-05-07update manatreeMicksha1-1/+1
2020-05-06Merge branch 'caves' into 'master'Micksha61-21/+350
2020-05-06make maps for cavesMicksha61-21/+350
2020-04-26Merge branch 'moubi' into 'master'Micksha1-0/+42
2020-04-27add moubiMicksha1-0/+42
2020-04-25update scripts following a hardcoded enum changegumi3-3/+3
2020-04-25add a gender change option to Edouardgumi2-3/+25
2020-04-25update debug-look for non-binary gendersgumi1-16/+13
2020-04-25add a changesex pseudo-atcommandgumi3-0/+50
2020-04-22Merge branch 'calamity-rename' into 'master'Micksha12-44/+43
2020-04-22finalize changes in boss.txt, update TF_POISON a bit (note to self: add parti...Micksha12-44/+43
2020-04-22Merge branch 'golem' into 'master'Micksha1-0/+42
2020-04-22Add Hocus' GolemMicksha1-0/+42