summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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
2019-01-04Merge branch 'items' into 'master'Micksha3-0/+0
2019-01-04add improved torch, scythe and pickaxe itemMicksha3-0/+0
2019-01-04Merge branch 'sprites' into 'master'Micksha20-180/+183
2019-01-04Fix all the ported sprites and corresponding .xmlsMicksha20-180/+183
2018-12-05Add auto generated network.xml for current packet version.Andrei Karas1-72/+6112
2018-11-22Merge branch 'mobs' into 'master's20181205Micksha6-22/+120
2018-11-22Add beehive to 008-1-1 and various gems to 008-3-0 (for testing)Micksha6-22/+120
2018-11-19Merge branch 'mapfixes' into 'master'Micksha5-278/+562
2018-11-19Fix Rossy Cave, add mobs and warp to Rossy Cave and West WoodlandMicksha5-278/+562
2018-11-15Merge branch 'toams' into 'master'Micksha4-16/+28
2018-11-15MR from toams - rebaseMicksha4-16/+28
2018-11-15Merge branch 'wtf' into 'master'Micksha0-0/+0
2018-11-15Merge branch 'master' of https://gitlab.com/evol/clientdataMicksha0-0/+0
2018-11-14Merge branch 'bugfixes' into 'master'Micksha2-50/+50
2018-11-14Bugfixes in 008-1 and 008-3-0Micksha2-50/+50
2018-11-14fix map issue on 008-3-0Micksha2-74/+73
2018-11-14Merge branch 'master' of https://gitlab.com/evol/clientdataMicksha1-45/+72
2018-11-14Merge branch 'Lava' into 'master'Micksha5-124/+152
2018-11-14Add the lavaMicksha5-124/+152
2018-11-13Merge branch 'master' of https://gitlab.com/evol/clientdataMicksha3-16/+4
2018-11-12Update beer, cherry cake, wine, add new lava (still WIP) to rossy caveMicksha5-79/+81
2018-11-09Merge branch 'sprites' into 'master'Micksha3-16/+4
2018-11-09SpritesMicksha3-16/+4
2018-11-09Merge branch 'sprites' into 'master'Micksha25-775/+574
2018-11-09SpritesMicksha25-775/+574
2018-11-09Merge branch 'maps' into 'master'Micksha9-25/+2111
2018-11-09Map merge requestMicksha9-25/+2111
2018-11-06Merge branch 'Gumicommit' into 'master'Micksha137-971/+3458
2018-11-06fix collision in 008-1-1 againMicksha1-60/+60
2018-11-06try to fix 008-1-1 (why do I have to do some things several time??)Micksha1-10/+10
2018-11-06fix items.xmlMicksha1-1/+0
2018-11-06remove saedit tagMicksha1-4/+0