summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2019-10-10MerchanthouseMicksha3-1/+565
2019-10-08Merge branch 'seeds/maggotslime' into 'master'Jesusaves3-0/+9
2019-10-08Maggot Slime PotionJesusaves3-0/+9
2019-09-20Merge branch 'jesusalva/katja' into 'master'WildX1-1/+1
2019-09-20Fix a typo on quests.xml - The Lazy BrotherJesusaves1-1/+1
2019-09-19Pull client-data translations from Transifex (but pot file not updated).Jesusaves18-4215/+20176
2019-09-09Use debian unstable image in manaplus ci testsAndrei Karas1-0/+1
2019-04-27Merge branch 'spots' into 'master's20190819s20190626s20190513Jesusaves9-0/+50
2019-04-27add 3 spotlight variationsMicksha9-0/+50
2019-04-24The new “races” are getting inJesusaves1-1/+1
2019-04-24Merge branch 'skin' into 'master'Micksha18-0/+120
2019-04-24Skin colorsMicksha18-0/+120
2019-04-13Merge branch 'hideout' into 'master's20190422Micksha4-18/+1418
2019-04-13HideoutMicksha4-18/+1418
2019-04-13Merge branch 'jesusalva/inns' into 'master'Micksha20-59/+79
2019-04-13CURRENT_INN was entirely removed from sources - it is not possible to guess.Jesusaves20-59/+79
2019-04-13Merge branch 'bandit' into 'master'Micksha22-8/+163
2019-04-13Bandit MRMicksha22-8/+163
2019-04-12Merge branch 'dummy' into 'master'Micksha2-3/+11
2019-04-12Update dummy mob - add destroying over time, try to make death more clearMicksha2-3/+11
2019-04-11Merge branch 'spiderqueen' into 'master'Micksha4-0/+186
2019-04-11SpiderqueenMicksha4-0/+186
2019-04-11Merge branch 'trainingroom' into 'master'Micksha1-105/+26
2019-04-11fix training room (remove fence layer, remove glitch tile in fringe)Micksha1-105/+26
2019-04-11Merge branch 'simon' into 'master'Jesusaves3-1/+6
2019-04-11Add Simon, Wyaras ApprenticeMicksha3-1/+6
2019-04-10Merge branch 'jesusalva/clientmake' into 'master'Jesusaves129-4/+103
2019-04-10Regenerate all minimaps + update license + autogenerate weapons.xmlJesusaves129-4/+103
2019-04-09Merge branch 'jesusalva/melinda' into 'master'Micksha1-11/+11
2019-04-09Prevent players from getting in the small area where the bartender is.Jesusaves1-11/+11
2019-04-08Add known special effects into effects.xmlAndrei Karas1-3/+35
2019-04-08Merge branch 'jesusalva/artis' into 'master's20190408Jesusaves1-15/+15
2019-04-08Minor tile change in ArtisJesusaves1-15/+15
2019-04-08Merge branch 'jesusalva/pipelines' into 'master'Jesusaves3-11/+11
2019-04-08Allow repository to have any name, without causing pipelines to fail.Jesusaves3-11/+11
2019-04-04Merge branch 'spritefix' into 'master'Micksha28-1141/+1004
2019-04-04SpritefixMicksha28-1141/+1004
2019-04-03Merge branch 'races' into 'master'Micksha1-4/+4
2019-04-03RacesMicksha1-4/+4
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-17 18:07:24 +0000