summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2019-02-12Graveyard Legacy tilesetsMicksha17-86/+403
2019-01-26Update dictionary translationss20190211Andrei Karas5-138/+143
2019-01-22Merge branch 'artis' into 'master's20190123Micksha3-93/+93
2019-01-22fix artis over tiles for rowboat hideoutMicksha3-93/+93
2019-01-19Merge branch 'badwarp' into 'master'Micksha1-3/+3
2019-01-19BadwarpMicksha1-3/+3
2019-01-06Merge branch 'miningcampbasement' into 'master'Micksha2-85/+144
2019-01-05update the map, add a w/e door tileMicksha2-21/+24
2019-01-05Add the Mining Camp basement, made by SorenMicksha1-78/+134
2019-01-05Merge branch 'mouboofarm' into 'master'Micksha3-229/+480
2019-01-06update mouboo farmMicksha1-4/+4
2019-01-04save the map on tiled-on-linuxMicksha1-684/+684
2019-01-04add tilesets to indoor atlasMicksha1-0/+2
2019-01-04Add the mouboo farm interior, made by SorenMicksha1-614/+684
2019-01-04fix collisions as per Tommis request, due to rowboat offsetMicksha1-30/+30
2019-01-04updating ArtisMicksha1-1/+1
2019-01-04remove the collisions from water, prepare spawn area for rowboatMicksha1-141/+320
2019-01-04Merge branch 'vat' into 'master'Micksha1-0/+0
2019-01-04add vat for mouboo farm, n/s and w/eMicksha1-0/+0