summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-06-09Merge remote-tracking branch 'origin/master' into waricJessica Tölke27-385/+1904
Conflicts: items.xml
2013-06-09Add Wicked Mushroom graphic made by Cassy based on the old mushroom.Jessica Tölke3-1/+65
2013-06-09Change description of Rose Hats so they don't refer to magic anymore.Jessica Tölke1-6/+6
Since they can be traded for different colors at Blossom, they aren't necessarily magical anymore.
2013-06-09Add different colors of the Rose Hat.Jessica Tölke1-1/+51
2013-06-09Make the rose hat sprite/icon dyeable. Add dyestring to restore the rosehat ↵Vincent Petithory4-3/+3
item to its initial colors.
2013-06-09Add bluepar sprite made by meway based on the pinkie.Jessica Tölke3-0/+69
TODO: add this also to license file.
2013-06-09Temporary definitions of evil woodland monsters.Jessica Tölke1-0/+14
2013-06-09Change item id's of summon flowers and rose hat, since 891 is already taken.Jessica Tölke1-6/+6
2013-06-09Adding rose hat created by Nami, skipy and Alige.Jessica Tölke4-0/+134
2013-06-09Adding summon flowers. Icon created by Korcha, edited by v0id.Jessica Tölke2-0/+30
Thanks to v0id for helping with the dye strings.
2013-06-09011-1:tux9th1-7/+7
* Renamed SubFringe to Ground2. * Moved x1 tiles from Fringe to Ground2. * Added grass tile to 55,112 on Ground and moved cliff tile to Ground2 - reported by enchilado. * removed collision at shore to fit global standards.
2013-06-09Remove attributes.xml again, since charcreation.xml is now supported by the ↵Jessica Tölke2-17/+0
mana client too.
2013-06-09Add comments to attributes.xml and charcreation.xml making clear which is ↵Jessica Tölke2-0/+3
used by which client.
2013-06-09Added attributes.xmlThorbjørn Lindeijer1-0/+13
Used for telling the client about the minimum and maximum amount of points each attribute can have as well as the amount of points that need to be distributed. The listed attributes are only used to validate the correctness of the character starting points. We could make the client use them, but that would be at the cost of internationalization. See http://bugs.manasource.org/view.php?id=501
2013-06-07021-1/2:tux9th2-33/+33
021-1: * Moved all x1 tiles from Fringe to Ground2. * Renamed Ground1 to Ground. * Fixed Houses which were in Ground2 and belonged to Ground. * Fixed collision at the small pond at 105,140. * Added Plant at 123,23 and fixed collision around it. * Moved tiles at 107,48 into the correct layer. * Fixed warps into the new forge, renamed the warps to the old forge. * Edited all warps to have a "To <South Tulimshar>" instead of "to". * Added collision tiles to where Hetchel sits. 021-2: Cleaned up the mess in the new forge: * Cleaned up numerous layers, removing tiles which were overwritten by other tiles, moving them into the correct layer, replacing tiles with their newer x2 version. * Fixed collision at: - Chairs - Shelves * Fixed warps out to 021-2. * Edited all warps to have a "To <South Tulimshar>" instead of "to".
2013-06-06015-1:tux9th2-4/+9
* moved x1 tiles from Fringe to Ground2. * ran tools/minimap-render.py 015-1
2013-06-05034-2:tux9th1-30/+20
* fixed 20 tile borderzone. * moved 76,20 from Over to Ground3. * removed all tiles from Ground2 which were already in Ground. * exported tilesets. map is now using <tileset>.tsx. * moved 24, 23 / 24 from Ground2 to Ground. * edited Authors; tux9th is not an author of this map.
2013-06-05010-1: added collision at 24,99.tux9th1-1/+1
2013-06-05008-1: Collision fixestux9th1-1/+1
removed Collision: * 35,36 * 137 / 138 ,84 * 75 / 76, 100 * 47, 84
2013-06-04013-1: fixed bug reported by BigCrunchtux9th1-3/+3
moved and removed tiles which were overwritten by tiles in upper layers.
2013-06-03Merge pull request #15 from bjorn/mastero11c1-9/+9
Some license.txt updates
2013-06-01Added V0id for weapon-bansheebow.png and arrowh-banshee.pngThorbjørn Lindeijer1-4/+4
2013-06-01Added me as author of cave and collision tilesetsThorbjørn Lindeijer1-5/+5
Also attributed cave.png to Modanung and Georg since as far as I remember they also did parts of that tileset (like the water and the carpet). I only drew the walls and arches.
2013-05-28Remove Alige as artist from some files which he didn't contribute to in the ↵Jessica Tölke1-5/+5
version used by tmw.
2013-05-28Add silk-sheet.png to license file, and add author to towel icons.Jessica Tölke1-2/+3
2013-05-27add: npc-weaver.png (ChefChelios) (GPLv2), (CC BY-SA 3.0)bh281-0/+1
2013-05-27Merge remote-tracking branch 'upstream/master' into Hetchel_1bh2879-874/+2544
2013-05-26Merge pull request #14 from cody/mastero11c2-26/+26
Converting maps back to gzip compression
2013-05-26Converting maps back to gzip compressionStefan Dombrowski2-26/+26
Older clients can't read zlib.
2013-05-26map fix for warpwushin1-1/+1
2013-05-26forgot an file a needing to add me as authorwushin1-1/+1
2013-05-26adding author to fileswushin1-0/+1
2013-05-26fixed night stand and government buildingwushin1-3/+10
2013-05-26Merge branch 'master' of https://github.com/themanaworld/tmwa-client-data ↵wushin8-334/+1700
into paving-the-way
2013-05-25excess overswushin1-2/+2
2013-05-25overs on the docks instead of fringe.wushin1-2/+2
2013-05-25minor quick fixwushin1-2/+4
2013-05-25Warp fixes and missed some overlay.wushin3-11/+12
2013-05-25Fix tabs from the mergeBen Longbons1-8/+8
2013-05-25Merge remote-tracking branch 'cody/master'Ben Longbons1-134/+150
Conflicts: items.xml
2013-05-25paved roads in Tulimshar with sand coveringswushin11-51/+178
2013-05-25add sell protection attribute for quest items.Andrei Karas1-314/+627
2013-05-25Some fixes to items.xmlStefan Dombrowski1-135/+150
* Making 129 weights the same as on the server * Fixing some hp, defense and effects * The Grey Hint is now named Gray Hint * Removing "luk", because that has no meaning * Commenting items out, like on the server
2013-05-22Merge pull request #12 from atheros/paths-in-settings-xmljtoelke1-0/+1
paths.xml content is now read from settings.xml in Mana client
2013-05-22paths.xml content is now read from settings.xml in Mana clientPrzemysław Grzywacz1-0/+1
2013-05-21License file: Add authors to dress graphics.Jessica Tölke1-5/+5
2013-05-20License file: add more authors.Jessica Tölke1-11/+11
2013-05-18License file: fix more misspelled / non-existing filesVincent Petithory1-76/+76
2013-05-17Fix some misspelled or non-existing filenames in license file.Jessica Tölke1-33/+28
Found them using "grep graphics/ license.txt | while read name etc; do test -f "$name" || echo no such file: $name; done" There are still some missing to be fixed.
2013-05-17Add authors to mouboo, mush hat and shroom hat.Jessica Tölke1-3/+3