summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2020-02-28Beanie Copter by @WildX requestJesusaves3-0/+558
2020-02-17Merge branch 'caves' into 'master'Micksha16-792/+1567
2020-02-17CavesMicksha16-792/+1567
2020-02-03Merge branch 'swamp' into 'master'Micksha13-721/+4018
2020-02-03SwampMicksha13-721/+4018
2020-02-03Merge branch 'arrivalargaes' into 'master'Micksha7-1/+27
2020-02-03Arrivalin ArgaesMicksha7-1/+27
2020-02-01Merge branch 'fire' into 'master'Micksha10-471/+489
2020-02-01FireMicksha10-471/+489
2020-01-26Merge branch 'fix-dummy2-sprite' into 'master'toams1-0/+7
2020-01-26Merge branch 'fix-dummy2-sprite' of gitlab.com:toams/clientdata into fix-dumm...toams0-0/+0
2020-01-26add dummy2 to monsters.xmltoams1-0/+7
2020-01-25add dummy2 to monsters.xmltoams1-0/+7
2020-01-18Update contributor listJesusaves1-1/+2
2020-01-18Merge branch 'mergeitems' into 'master'Jesusaves61-22/+505
2020-01-18Add compensation items when merging Legacy to rEvolt. Part 1 only.Micksha61-22/+505
2020-01-13Name some maps on Artis Legion Building (it makes my life easier).Jesusaves7-63/+63
2020-01-06Merge branch 'jesusalva/wallpaper' into 'master'Micksha1-0/+0
2020-01-06Replace background wallpaperJesusaves1-0/+0
2019-10-16Merge branch 'items' into 'master'Micksha12-117/+193
2019-10-16Items for Galimatia questMicksha12-117/+193
2019-10-16Merge branch 'jesusalva/207' into 'master'Micksha4-0/+18
2019-10-16Jesusalva/207Micksha4-0/+18
2019-10-16Merge branch 'tengu' into 'master'Micksha6-0/+242
2019-10-16Tengu (mob 1120), FiredummyMicksha6-0/+242
2019-10-10Merge branch 'micksha/kytty01' into 'master'Micksha6-7/+491
2019-10-10Micksha/kytty01Micksha6-7/+491
2019-10-10Merge branch 'legion' into 'master'Micksha12-8/+107
2019-10-10LegionMicksha12-8/+107
2019-10-10Merge branch 'merchanthouse' into 'master'Micksha3-1/+565