summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2019-10-21Merge branch 'master' into jesusalva/newpermjesusalva/newpermJesusaves20-38/+157
2019-10-21Allow storagelist/cartlist/itemlist to GMsJesusaves1-4/+3
2019-10-20remove useless zeny calculationsgumi13-18/+18
2019-10-16Merge branch 'jesusalva/performance' into 'master'Micksha3-5/+5
2019-10-16These changes are either to make gameplay more similar to TMWA (disabling som...Jesusaves3-5/+5
2019-10-16Merge branch 'jesusalva/wilditems' into 'master'Micksha2-14/+25
2019-10-16[Adventurer Soul] (7420) - Dropped when you die in PVP.Jesusaves2-14/+25
2019-10-16Merge branch 'tengu' into 'master'Micksha1-0/+43
2019-10-16Tengu (mob 1120)Micksha1-0/+43
2019-10-16Merge branch 'firedummy' into 'master'Micksha2-1/+66
2019-10-16Firedummy, SpiderqueenMicksha2-1/+66
2019-10-14Change default charcommand symbol from $ to # (to resemble magic system)Jesusaves2-4/+3
2019-10-14THIS IS A TYPOJesusaves1-1/+1
2019-10-14@jail is better to find out who is a GMJesusaves1-1/+1
2019-10-14Equivoc - send_gm sends the player Group ID in send.cJesusaves1-2/+7
2019-10-14TypoJesusaves1-1/+1
2019-10-14Reset skillsJesusaves1-0/+2
2019-10-14Temporary hide GM levels (on groups.xml at least)Jesusaves7-11/+117
2019-10-14New base permissionsJesusaves2-157/+223
2019-10-10Merge branch 'Kyttyshouse' into 'master'Micksha9-12/+22
2019-10-10Kytty's HouseMicksha9-12/+22
2019-10-10Merge branch 'legion' into 'master'Micksha5-15/+167
2019-10-10Change Slime-Littleslime to LittleSlimeMicksha5-15/+167
2019-10-10Merge branch 'merchanthouse' into 'master'Micksha8-12/+22
2019-10-10MerchanthouseMicksha8-12/+22
2019-10-09Remove a TODO from Old WomanJesusaves1-2/+2
2019-10-08Merge branch 'seeds/maggotslimepotion' into 'master'Jesusaves2-12/+31
2019-10-08Maggot Slime PotionJesusaves2-12/+31
2019-10-01Merge branch 'omatt/serverdata-Training_room' into 'master'Jesusaves12-211/+634
2019-10-01instance for training room, training npc, new quest idtoams12-211/+634
2019-10-01Merge branch 'jesusalva/4144' into 'master'WildX2-0/+92
2019-10-014144 botJesusaves2-0/+92
2019-09-20Merge branch 'jesusalva/arrowshop' into 'master'WildX2-1/+5
2019-09-20I think weapon shop is a better place for this.Jesusaves2-1/+5
2019-09-19Update translationsJesusaves22-3237/+17319
2019-09-09Merge branch 'jesusalva/katja' into 'master'Jesusaves2-17/+17
2019-09-09"Atril" is a PDF Viewer. Fix a typo, it should be “Artis” instead.Jesusaves2-17/+17
2019-09-09Merge branch 'tutorial_improvements' into 'master'Jesusaves1-365/+240
2019-09-09make the code from the tutorial book similar to the other bookstoams1-365/+240
2019-09-09Merge branch 'jesusalva/freeyorplogs' into 'master'Jesusaves1-1/+1
2019-09-09Disable chat log by Freeyorp's request.Jesusaves1-1/+1
2019-08-21Update packet version in .gitlab-ci.ymlAndrei Karas1-1/+1
2019-08-19Update from herculesAndrei Karas8-45/+100
2019-06-26Update from herculess20190819Andrei Karas5-1/+28
2019-05-15Fix the broken code using @4144's advise.s20190626Jesusaves1-2/+3
2019-05-14Disable wrong code in lloyd.txtAndrei Karas1-2/+2
2019-05-14Fix refine db warningsAndrei Karas1-0/+55
2019-05-13Update from herculesAndrei Karas72-183/+357
2019-05-11Merge branch 'jesusalva/feather' into 'master's20190513Jesusaves3-7/+34
2019-05-11Improvements to Calamity Dungeon and Master Skill Book.Jesusaves3-7/+34