summaryrefslogtreecommitdiff
path: root/src/resources/mapreader.cpp
AgeCommit message (Collapse)AuthorFilesLines
2012-02-03Clear tile flags from the gid before further processingThorbjørn Lindeijer1-5/+16
Better to show non-rotated/flipped tiles than no tile at all. This also fixes interpretation of collision tiles that happen to be flipped. Also interpret the gid as an unsigned number, since that's how they are written in the TMX file since the introduction of these flags. Reviewed-by: Yohann Ferreira
2012-01-26Updated copyrights to 2012Thorbjørn Lindeijer1-1/+1
2011-06-17Removed dehardcoded values from the Map and MapLayer classes.Yohann Ferreira1-1/+1
2011-02-21Merge branch '0.5'Thorbjørn Lindeijer1-2/+4
Translation file updates ignored. Conflicts: src/client.cpp src/commandhandler.cpp src/gui/popupmenu.cpp src/localplayer.cpp
2011-02-20Add support for CSV map dataJared Adams1-1/+34
Reviewed-by: Freeyorp
2011-02-19Minor code formatting and fixed a comment.Yohann Ferreira1-2/+4
Trivial fix.
2011-02-10Add support for CSV map dataJared Adams1-1/+34
Reviewed-by: Freeyorp
2011-02-10Merge branch '0.5'Stefan Dombrowski1-2/+2
2011-02-10Add support for zlib map layer compression.Andrei Karas1-2/+2
Reviewed-by: Bertram
2010-12-05Add support for tiles with spacingStefan Dombrowski1-1/+4
Now the map from the Mana server's example data is shown properly. Reviewed-by: Jaxad0127
2010-08-15Merge branch '1.0'Chuck Miller1-140/+2
Conflicts: mana.cbp mana.files src/CMakeLists.txt src/Makefile.am src/utils/xml.cpp
2010-08-13Simplify handling of compressed filesJared Adams1-140/+2
ResourceManager will now check for ".gz" and act appropriately (unless told not to). Compression handling functions are now in new utils/zlib files, along with a function to load a file from drive, uncompressing it if it ends in ".gz". Reviewed-by: Freeyorp
2010-07-28Centralized configuration default values using the VariableData system.Yohann Ferreira1-5/+3
Please note that I didn't turned all the getValue() call into new ones, simply because I have to have config object initiated which is not forcefully the case the branding file. Resolves: Manasource Mantis #170.
2010-07-11Made the different hard-coded paths and files be now taken from theYohann Ferreira1-1/+4
data/paths.xml configuration file. Also added default gui theme path in branding and default wallpaper path and file searched respectively in the branding and paths.xml files. Hard-coded values are still used as fallbacks. Resolves: Manasource Mantis #148. Reviewed-by: jaxad0127.
2010-05-06Make the logic for collision tiles more strictThorbjørn Lindeijer1-1/+1
Only recognize the collision tile as colliding, since having everything except the empty non-collision tile collide is confusing. Should also be changed on the server and in the tmwAthena exporter of Tiled. Reviewed-by: Dennis Friis
2010-04-08Fix handling of "../" and fix a bug in TSX handlingJared Adams1-7/+36
2010-03-07Added config option for disabling particle effects on map warps.Philipp Sehmisch1-2/+7
Reviewed-by: Jared Adams
2010-03-04Implemented markers for warp portals defined in map files in form of ↵Philipp Sehmisch1-3/+12
particle effects. Reviewed-by: Jared Adams <jaxad0127@gmail.com>
2010-02-22Modify copyright headersFreeyorp1-1/+2
2010-02-20License header update for The Mana ClientThorbjørn Lindeijer1-4/+3
2010-02-09Don't translate the logThorbjørn Lindeijer1-11/+11
It's not meant for the user, translating it only burdens both us and our translators unnecessarily.
2010-02-09Got successfully rid of tile width/height fallback values as asked by Jaxad.Bertram1-9/+18
But I added some logs when speed and other actions where refused due to game/map uninitialized. This could help.
2010-02-09Separated fallback defaults for tile width and height.Bertram1-3/+0
2010-02-07Updated Copyright year to 2010!Bertram1-1/+1
Also added the update copyright tool from the Wormux Team. ( And not forgetting credit's due. :P )
2010-01-12Standardize header orderJared Adams1-3/+4
Also remove some extra new lines and fix eAthena's PartyTab define guards.
2010-01-10Change code styleAndrei Karas1-23/+44
2010-01-06Fixes so mapreader ignores the case of object typesChuck Miller1-4/+3
This will decrease warnings in the log file by a good bit
2009-12-25Added support for map background images which work exactly like overlays, ↵Philipp Sehmisch1-1/+1
just that they are drawn before the tiles instead of afterwards. Renamed overlays to foregrounds (but kept backward compatibility intact)
2009-03-30Add a logging statement before trying to load mapsJared Adams1-0/+1
There is a rare segfault between this and the next logging statement, I think it's a bad map name. This will help test that.
2009-03-27Merge branch 'aethyra/master'Bjørn Lindeijer1-3/+4
Conflicts: src/beingmanager.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/label.cpp src/gui/label.h src/gui/popup.cpp src/gui/popup.h src/gui/scrollarea.cpp src/gui/skin.cpp src/gui/skin.h src/gui/speechbubble.cpp src/gui/window.cpp src/gui/window.h src/localplayer.h src/main.cpp src/net/ea/playerhandler.cpp src/resources/ambientoverlay.h src/resources/dye.cpp src/resources/imagewriter.cpp src/resources/itemdb.cpp src/shopitem.cpp
2009-03-27Fixed include structure in resource/ directoryBjørn Lindeijer1-13/+13
There is also a new rule that trivial constructors and destructors should no longer be trivially "documented", since this just takes up space with no gain.
2009-03-25Relaxed collision and fringe naming slightly so that they just need toIra Rice1-3/+4
start with collision or fringe, instead of being required to be the same case throughout the beginning of the layer name. Also made a default name for popup menus so that their skins can also be changed by users. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-1/+2
This merge involved major changes on both sides, and as such took several weeks. Lots of things are expected to be broken now, however, we now have a single code base to improve and extend, which can be compiled to support either eAthena or tmwserv. In the coming months, the plan is to work towards a client that supports both eAthena and tmwserv, without needing to be recompiled. Conflicts: Everywhere!
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer1-1/+1
When not passing any parameters to constructors, there is no reason for using parenthesis.
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-2/+3
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-0/+1
Conflicts: A lot of files...
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer1-17/+20
Conflicts: Almost everywhere.
2009-02-07Some more include cleanups.Ira Rice1-0/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-23Fixed very minor and rarel occuring mem leak in map reader.Philipp Sehmisch1-0/+2
2009-01-23Merge branch 'master' of git@gitorious.org:tmw/eathenaPhilipp Sehmisch1-4/+6
2009-01-23Fixed very minor and rarel occuring mem leak in map reader.Philipp Sehmisch1-0/+2
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-20Added current map filename to debug window.Philipp Sehmisch1-0/+2
(cherry picked from mainline commit 2a7c63f6070606e6623a9730aa1ca9d52c942055)
2009-01-18Added current map filename to debug window.Philipp Sehmisch1-0/+2
2009-01-18Fixed mapreader crash caused by unknown tile properties (That's why I said ↵Philipp Sehmisch1-2/+6
that I would like some praxis-oriented testing of the animation system before the release).
2009-01-18Fixed mapreader crash caused by unknown tile properties (That's why I said ↵Philipp Sehmisch1-2/+6
that I would like some praxis-oriented testing of the animation system before the release).
2009-01-18Added current map filename to debug window.Philipp Sehmisch1-0/+2