summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2019-03-29Merge branch 'skills2' into 'master'Micksha6-11/+27
2019-03-29non-magic passive skillsMicksha6-11/+27
2019-03-29Merge branch 'calamity' into 'master'Micksha8-14/+886
2019-03-29Jesusalva' Calamity DungeonMicksha8-14/+886
2019-03-29Merge branch 'caves' into 'master'Micksha3-383/+383
2019-03-29update the cave tileset a bit, update the corresponding mapsMicksha3-383/+383
2019-03-29Merge branch 'flag' into 'master'Micksha6-6/+147
2019-03-29FlagMicksha6-6/+147
2019-03-05Merge branch 'cookbook' into 'master's20190311Micksha3-0/+8
2019-03-05add the cookbookMicksha3-0/+8
2019-03-05Merge branch 'sewer' into 'master'Micksha2-133/+222
2019-03-05update mobs in sewersMicksha2-133/+222
2019-03-03Merge branch 'Yannika' into 'master'Micksha2-1/+22
2019-03-03add Yannika (for walking sprite) and dialogs (for Jesusalva)Micksha2-1/+22
2019-02-28Merge branch 'sewerupdate' into 'master'Micksha1-190/+190
2019-02-28update 001-3-0 for better matching mundane questMicksha1-190/+190
2019-02-28Merge branch 'darktileset' into 'master'Micksha18-84/+718
2019-02-28DarktilesetMicksha18-84/+718
2019-02-13Merge branch 'galmatia' into 'master'Micksha20-30/+730
2019-02-13Add content for the Galimatia questMicksha20-30/+730
2019-02-13Merge branch 'sorenmap' into 'master'Micksha3-451/+847
2019-02-13add indoor maps 008-2-17 008-2-18 008-2-19 with fixes, by SorenMicksha3-451/+847
2019-02-12Merge branch 'gy' into 'master'Micksha17-86/+403
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-21 20:19:36 +0000