summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2020-07-25Ops! I *somehow* forgot licenses %%ns20200729Jesusaves1-0/+7
2020-07-25`make client` - Regenerate minimaps and weapons.xmlJesusaves58-4/+7
2020-07-19Merge branch 'followup-252' into 'master'Micksha18-57999/+20
2020-07-19Follow up to serverdata!252Jesusaves18-57999/+20
2020-07-17Merge branch 'RubberBat' into 'master'Jesusaves4-1/+6
2020-07-17Rubber Bat - Correctly duplicates Legacy functionality.Quillia Aeuda4-1/+6
2020-07-13update SI_PHYSICAL_SHIELDgumi1-1/+1
2020-07-01Merge branch 'typo_fix-sqirrel' into 'master'Micksha1-1/+1
2020-07-01Typo: Changed sqirrel to squirrel in monsters.xmlLedmitz1-1/+1
2020-06-18Merge branch 'content' into 'master'Micksha217-92/+2925
2020-06-18ContentMicksha217-92/+2925
2020-06-17Merge branch 'jesusalva/selfmadeproblems001' into 'master'Jesusaves2-41/+45
2020-06-17Contains fixes/reordering for races, guilds and genders.Jesusaves2-41/+45
2020-06-17Merge branch 'jesusalva/factions' into 'master'Jesusaves1-12/+13
2020-06-17Reserved for future useJesusaves1-12/+13
2020-06-15Merge branch 'tulimmap' into 'master'Micksha14-1016/+4032
2020-06-15final, small fixes, left less bugs to call it okay'ish, and enough bugs to ca...Micksha14-1016/+4032
2020-05-24Merge branch 'thief' into 'master'Jesusaves58-181/+920
2020-05-24Add content for the starting point of Thief quest chain:Micksha58-181/+920
2020-05-07Merge branch 'treasure' into 'master'Micksha8-2/+55
2020-05-07Treasure!Micksha8-2/+55
2020-05-07Merge branch 'manatree' into 'master'Micksha3-7/+7
2020-05-07update manatree spriteMicksha3-7/+7
2020-05-06Merge branch 'caves' into 'master'Micksha29-526/+9330
2020-05-06CavesMicksha29-526/+9330
2020-04-26Merge branch 'moubi' into 'master'Micksha10-7/+104
2020-04-26add moubi to 008-1 and 008-1-1Micksha10-7/+104
2020-04-23Resize maps to adhere to minimum 60 tiles widthJesusaves17-6654/+7094
2020-04-22Merge branch 'calamity-rename' into 'master'Micksha3-2/+12
2020-04-22add poison skill, fix warpMicksha3-2/+12
2020-04-22Merge branch 'golem' into 'master'Micksha4-0/+202
2020-04-22add Hocus' GolemMicksha4-0/+202
2020-04-22Merge branch 'Kfahr' into 'master'Micksha10-41/+237
2020-04-22KfahrMicksha10-41/+237
2020-04-19Merge branch 'jesusalva/python' into 'master'Jesusaves6-2/+25
2020-04-19It's love - Cupid's Magic.Jesusaves6-2/+25
2020-04-19Merge branch 'jesusalva/doomsday' into 'master'Jesusaves3-1/+9
2020-04-19Clothes Pack, item obtained from Doomsday event epilogue.Jesusaves3-1/+9
2020-04-17Merge branch 'lava' into 'master'Micksha2-98/+170
2020-04-17update lava to pretend I do care about critics ;)Micksha2-98/+170
2020-04-09Merge branch 'jesusalva/swampling' into 'master'Micksha4-0/+140
2020-04-09Micksha and Hocus' SwamplingsJesusaves4-0/+140
2020-04-09Merge branch 'rumly111skills' into 'master'Micksha26-26/+721
2020-04-09Add content from !2Micksha26-26/+721
2020-04-09Merge branch 'candor' into 'master'Micksha17-4/+6359
2020-04-09CandorMicksha17-4/+6359
2020-04-05Merge branch 'jail' into 'master'Micksha5-1/+1046
2020-04-05@Jesusalva please check if this works for you. 25/75 inside cell, 49/75 insid...Micksha5-1/+1046
2020-04-05Disable annoying warp on Training Room. (Part of Serena's Quest)Jesusaves1-1/+2
2020-02-28Merge branch 'jesusalva/copter' into 'master'Micksha3-0/+558