summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-08-25Merge remote-tracking branch 'origin/master' into waricJessica Tölke174-3439/+80390
Conflicts: monsters.xml
2013-08-25Add demonic mouboo graphics, xml and particle effectJessica Tölke6-1/+209
Graphics and particle effect created by Cassy XML created by straelyn
2013-08-22017-4: Fixestux9th1-45/+45
* Adding collision to both of the beds. * Renamed Cliffs Layer to Ground2. * Moving all x1 tiles from Fringe to Ground2.
2013-08-22Adding nightstand with plant to x2 tileset.tux9th2-1/+1
Tux9th edited the file therefore adding him to the licence file.
2013-08-18007-1: Add tile at 87,56.tux9th1-1/+1
https://github.com/themanaworld/tmwa-client-data/issues/22
2013-08-17Merge pull request #20 from wushin/warps-pixels-to-tilestux9th110-1437/+1415
All warps moved from old to new style
2013-08-17Merge pull request #19 from Ablu/mine_entry_cactus_fixtux9th1-4/+4
002:-1 Fixed cactus top
2013-07-28All warps moved from old to new stylewushin110-1437/+1415
Old style dest_x = <xtile_in_pixels> New style dest_tile_x = <xtile>
2013-07-28Fixed cactus topErik Schilling1-4/+4
The cactus was on fringe, but the cliff on over. Moved the cactus to an over layer to prevent the top from getting hidden under the cliff. Also fixed small duplicate tile issue at the cliff next to the mine entrance.
2013-07-22Merge pull request #18 from cody/mastero11c1-1/+1
Fixing tileset width
2013-07-22Fixing tileset widthStefan Dombrowski1-1/+1
2013-07-21Unflip/rotate some tiles (unsupported)Ben Longbons2-104/+104
2013-07-21Convert maps to CSV againBen Longbons110-1845/+78127
2013-07-19Also offset Kadiya's target cursorBen Longbons1-1/+1
2013-07-18Use nameOffsetX to center KadiyaBen Longbons1-2/+2
2013-07-13027-1:tux9th1-6/+11
* move all x1 tiles from Fringe to Ground2/3. * fixed the issue with the track at 69,100 reported by straelyn. * cleaned up the layers. * collision fix at: - 96,93 - 26,62 to 30,62 - 50,76
2013-07-08Fix mapping error on 009-3.Jared Adams1-1/+1
http://forums.themanaworld.org/viewtopic.php?p=136069#p136069
2013-07-08Fix spelling error.Jessica Tölke1-1/+1
2013-07-08Update license file:Jessica Tölke1-15/+15
- add Wombat, Lien and FotherJ as author to some graphics - put CC BY-SA 3.0 to graphics done by Wombat
2013-07-08Add snow docks graphic to license file.Jessica Tölke1-0/+1
2013-07-08Update minimap of 031-1 due to the addition of snow docks by Wombat.Jessica Tölke1-0/+0
2013-07-08031-1:tux9th1-6/+6
* moved all x1 tiles from Fringe to Ground2/3 * fixed collision at 99,124 by inserting a stone * fixed some minor overlapping issues
2013-07-08layer and collision tile fixes for 031-1.tmx snowdocksWombat1-4/+9
2013-07-04snow docks in nivalis, minor related fixesWombat2-5/+10
2013-07-04snow docks changesWombat1-0/+0
2013-07-02Merge pull request #17 from wushin/masterjtoelke1-1/+1
Fixed Collision Tiles on 043-1
2013-06-30Fixed tiles Collision on 043-1 near 89,110 (Stand and boxes)wushin1-1/+1
2013-06-30Update license file for Nami's graphics, since he agreed to dual licensing.Jessica Tölke1-15/+15
2013-06-30Merge pull request #16 from wushin/masterjtoelke2-3/+3
Cave Release fixes
2013-06-29tile fixeswushin2-3/+3
collision on palm trees on 002-1 Over tiles by west entrance on 021-3
2013-06-29fix syntax error in maps.xml.Andrei Karas1-1/+1
2013-06-28018-3: fixed tileset issue.tux9th1-2/+1
2013-06-28Update minimaps of maps related to recent changesVincent Petithory24-0/+0
2013-06-25Tulimshar Sewers Warp fixwushin2-30/+9
2013-06-21Merge remote-tracking branch 'wushin/tonori-cave-release'Jessica Tölke57-480/+1167
Conflicts: license.txt: graphics/tiles/Woodland_ground.png was changed in master added also enchilado here, since that edit was forgotten npcs.xml: id conflict with trapper and supply chest, moved supply chest down to 378
2013-06-21 and all the liscene file changes for all the art in previous commitswushin1-73/+86
2013-06-21adding new NPC supply chest to replace the treasure chest in the mines.wushin3-0/+13
2013-06-21adding new mobs angry fire gobline, angry sea slime, angry green slimewushin1-0/+20
2013-06-21adding new particle effects for new mobs angry fire goblin, angry green ↵wushin5-0/+70
slime, angry sea slime
2013-06-21Map edits for new caves.wushin26-407/+938
Map edits to set all layers the same. added 021-3 sewers added 002-2 Malvox house added 002-3 mining camp added 043-1 new area for slime quest added 043-3 new dungeon for slime quest moved old 002-3,002-4 down one level added sewer entrances to 021-2
2013-06-21New cave tilesets: cave2_bilevel.png, cave2_bilevel_water_lava.png, ↵wushin21-0/+40
cave2.png, cave2_sewer_mine.png, cave2_sewer_mine_x2.png, cave2_sewer_mine_x3.png, cave2_sewer_mine_x4.png, cave2_sewers.png, cave2_transistions.png, cave2_x2.png, cave2_x3.png Edited Desert2 to add the sewer entrance
2013-06-17Add dye string to vicious squirrel, making it darker than the usual squirrel.Jessica Tölke1-1/+1
2013-06-17Squirrel made recolorable by wombat.Jessica Tölke3-2/+2
2013-06-17Updating license.txt.tux9th1-1/+1
2013-06-17trapper daily quest: add trapper NPC, ID 377bh281-0/+9
2013-06-17011-1, 018-1, 018-3:tux9th5-13/+14
011-1: * Fixed part of Oscar's House in 011-1. * updated minimap. 018-1: * moved all x1 tiles from Fringe to Ground2. * Fixed overlap to 011-1 regarding changes on 011-1. * repaired the roof of the Woodland Mining Camp Indoors. * added a "To" to the name of the warps to 018-2. * removed some dirt tiles at 35,0. * updated minimap. * removed collision at: 47,62 46/47 ,64 50, 66/67 129,96 54,79 54-59,80 018-3: * moved all x1 tiles from Fringe to Ground2. * overwrote tiles 90,100 - 96,108 - 103,108 - 110,49 with floor tiles on Ground.
2013-06-17055-1 & 055-3:tux9th2-10/+10
055-1: * Moved warp 100,82 to 100,83. * because warp on 055-3 was moved, warp on 055-1 to 055-3 had to be edited. 055-3: * Fixed warp offset at 98,114. * Added south cave exit tiles to Over. * moved warp from 50,42 to 50,43.
2013-06-17Added water cave tile and two lilypads to Woodland_ground tilesetWombat1-0/+0
2013-06-14025-3 & 057-1:tux9th2-5/+5
* Added collision at 057-1 108,39. * moved tile from Over to Ground2 at 057-1 65,49. * Added black tile to over at 025-3 157,83. bugs reported by straelyn
2013-06-09Merge remote-tracking branch 'origin/master' into waricJessica Tölke27-385/+1904
Conflicts: items.xml