summaryrefslogtreecommitdiff
path: root/src/resources
AgeCommit message (Collapse)AuthorFilesLines
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer2-8/+3
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-13Fixed a break in building for non-mac users which was caused by usingIra Rice2-2/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-13Added in mac build support, contributed to us by allenmoatallen> fromIra Rice2-1/+8
Legends of Mazzeroth. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-11Don't make log statements translatableBjørn Lindeijer5-31/+34
The log is mainly used to aid the developers, hence shouldn't be translated to the user's local language. Also introduces unnecessary work for all translators.
2009-02-10Use string::empty() instead of comparing to ""Bjørn Lindeijer1-2/+2
2009-02-10Removed many pointless comparisons with NULLBjørn Lindeijer1-1/+1
Sometimes it's nice for clarity, but most of the time this is just clutter. C++ != Java. :)
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice44-300/+130
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Removed a getImage() function I added. Considered renaming it toIra Rice1-12/+0
getBaseImage() instead, but after looking at it a bit more, I can't particularly see anything that this can be used for yet. Was originally added when I was toying around with an idea for how to get image transparency to work under SDL, but which ended coming up busted. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Mostly whitespace fixesBjørn Lindeijer7-13/+14
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Changed AETHYRA_DATADIR to PKG_DATADIR.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-07Some more include cleanups.Ira Rice17-23/+11
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-03Disable alpha values affecting two widgets which would otherwise takeIra Rice1-1/+13
alpha values under SDL. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-30Some style cleanups to the image class. TODO: Find a way to fix theIra Rice1-21/+22
subimage class so that when OpenGL isn't enabled, GUI opacities can still be applied. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-28Added coloring of item names by type. TODO: Allow this to beIra Rice2-9/+7
customizable through the color interface so that if someone is colorblind to a certain color and it doesn't show up well, they can change it (or even people who just don't like the default color). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-28Removed manual trimmings in exchange for using trim.h instead.Ira Rice1-8/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Modified item popups to show the weight of the item as well. TODO:Ira Rice1-3/+3
modify itemdb to pull the item weight information from the server instead of the client, so as to always have the server and client in sync. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Removed the TMW branding from header guardsBjørn Lindeijer21-43/+43
2009-01-24Code reformattingBjørn Lindeijer1-5/+8
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer40-160/+160
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-20Added the ability to parse multiple item links, as well as removingIra Rice1-0/+8
extra spaces before or after the [] tags. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Made link searching case insensitive.Ira Rice1-1/+8
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-20Added linking to item's just using [Item Name] in chatDavid Athay3-0/+42
2009-01-19Fixed a directory creation error reported by our Windows users (whyIra Rice1-2/+2
doesn't PhysFS handle this properly?!?) when there's already an update directory. Also fixed the recorder class so that it's fixed on Windows as well. Signed-off-by: Ira Rice <irarice@gmail.com>
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-17Added a few XML files for "translation". Idea obtained from IchigoBlack,Ira Rice2-2/+2
where these "translation" strings can be used to tell the client to use a separate XML file than the English one, so that item descriptions, monster names, etc. which are obtained from updates can be translated as well. Ex. instead of pointing to items.xml for Spanish, tell the client to translate that string to items.es.xml, or for monsters.xml, tell it to point to monsters.zh.xml for Chinese. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-16Candidate release for 0.0.27.1 (Windows needs to get colors fixed, andIra Rice2-7/+0
then this build might be official) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Added emote database, which is loosely based off of the NPC database.Ira Rice3-1/+211
Also changed all emotes to be animated sprites now, and to load from emotes.xml. This gives us a bit more flexibility to not only add more emotes in the future, but allowing them to be animated as well. NOTE: This commit, unlike the previous emote commits, breaks emotes if you don't have the xml file. This will be available on Aethyra soon, but is not rolled into an update at the moment. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Style cleanups throughout most of the code. Splitting function type fromIra Rice25-170/+105
the function names should no longer be around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-06Added support for animated tiles.Philipp Sehmisch1-23/+65
2009-01-06Added support for internationalizationIra Rice1-2/+3
Merged from the mainline client. Originally implemented by Guillaume Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91. Conflicts: INSTALL configure.ac src/Makefile.am src/gui/buy.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/login.cpp src/gui/menuwindow.cpp src/gui/minimap.cpp src/gui/ok_dialog.cpp src/gui/popupmenu.cpp src/gui/register.cpp src/gui/sell.cpp src/gui/setup.cpp src/gui/setup_video.cpp Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch3-7/+9
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2008-12-27Remove ../ from tileset files.Ira Rice1-1/+3
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-20Enabled video mode switching, as well as got rid of an old, unneededIra Rice1-2/+0
check in the ColorDB. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-08Code reformattingBjørn Lindeijer6-102/+59
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-)
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice3-40/+44
Conflicts: AUTHORS CMakeLists.txt ChangeLog INSTALL README aethyra.cbp configure.ac data/help/changes.txt data/help/commands.txt data/help/header.txt data/help/support.txt src/Makefile.am src/aethyra.rc src/being.cpp src/being.h src/equipment.cpp src/equipment.h src/floor_item.h src/game.cpp src/gui/buddywindow.cpp src/gui/char_select.cpp src/gui/char_server.cpp src/gui/chat.cpp src/gui/chat.h src/gui/equipmentwindow.cpp src/gui/equipmentwindow.h src/gui/gui.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/itemcontainer.h src/gui/minimap.cpp src/gui/ministatus.cpp src/gui/newskill.cpp src/gui/npc_text.cpp src/gui/npclistdialog.h src/gui/ok_dialog.cpp src/gui/setup_video.cpp src/gui/skill.cpp src/gui/skill.h src/gui/status.h src/gui/table_model.h src/gui/updatewindow.cpp src/gui/viewport.cpp src/inventory.cpp src/inventory.h src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/localplayer.h src/logindata.h src/main.cpp src/map.cpp src/monster.cpp src/monster.h src/net/beinghandler.cpp src/net/beinghandler.h src/net/buysellhandler.cpp src/net/equipmenthandler.cpp src/net/loginhandler.cpp src/net/loginhandler.h src/net/network.h src/net/npchandler.cpp src/net/playerhandler.cpp src/net/protocol.h src/net/tradehandler.cpp src/npc.cpp src/npc.h src/particleemitter.cpp src/particleemitterprop.h src/player.cpp src/player.h src/player_relations.cpp src/resources/imageset.cpp src/resources/imageset.h src/resources/itemdb.cpp src/resources/mapreader.cpp src/resources/monsterinfo.h src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h src/tileset.h src/utils/fastsqrt.h src/utils/strprintf.cpp src/winver.h tools/tmxcopy/Makefile tools/tmxcopy/base64.cpp tools/tmxcopy/base64.h tools/tmxcopy/tostring.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-06Removed unnecessary weight check in itemdb loaderLloyd Bryant1-3/+3
(cherry picked from Aethyra commit e3fef730b69e4edc328e6105ea48b9774631563d)
2008-12-03Changed tileset code so that it removes all ... paths. This assumes thatIra Rice1-5/+4
the tileset to be loaded will not be in a different root directory than the tsx file. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-03Check doc before deleting, and make sure it's deleted when both xmlIra Rice1-2/+11
files fail, if the pointer is pointing to something. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-02Added the ability to use external tilesets in the client.Ira Rice1-3/+12
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-02Didn't clean up after myself in the last commit.Ira Rice1-0/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-02Changed colordb to only use one XML::Document pointer, instead ofIra Rice1-4/+4
instantiating two XML::Document variables. Probably was a bit tired the day I made that fix, so I missed the obvious solution. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-11-30Delete resources after removing from the orphan list, to avoid double frees ↵Fate1-1/+1
during recursion
2008-11-25Miscellaneous TMW change commits. Missed these changes before because of Ira Rice1-1/+1
a confusion on git.
2008-11-23Delete resources after removing from the orphan list, to avoid double frees ↵Fate1-1/+1
during recursion
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice41-128/+35
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer40-80/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-11-12Applied a fix that fixes TMW loading.Ira Rice1-6/+9
2008-11-02Fixed a potential crash.Ira Rice1-0/+5