summaryrefslogtreecommitdiff
path: root/src/resources
AgeCommit message (Collapse)AuthorFilesLines
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer13-75/+526
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 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-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer5-6/+6
When not passing any parameters to constructors, there is no reason for using parenthesis.
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer8-214/+13
Conflicts: CMakeLists.txt configure.ac data/help/header.txt packaging/windows/setup.nsi po/POTFILES.in src/being.cpp src/being.h src/game.cpp src/gui/color.cpp src/gui/color.h src/gui/equipmentwindow.h src/gui/popupmenu.cpp src/gui/recorder.cpp src/gui/setup_colors.h src/gui/setup_keyboard.cpp src/gui/setup_keyboard.h src/gui/skill.cpp src/gui/speechbubble.cpp src/gui/speechbubble.h src/gui/table.cpp src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/main.cpp src/main.h src/map.cpp src/resources/colordb.cpp src/resources/colordb.h src/resources/emotedb.cpp src/resources/emotedb.h src/text.cpp src/text.h src/tmw.rc src/winver.h
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-11Removed 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-10Use string::empty() instead of comparing to ""Bjørn Lindeijer1-2/+2
2009-02-10Fixed copyright headers for emote and color DBsBjørn Lindeijer4-28/+28
2009-02-10Don't make log statements translatableBjørn Lindeijer5-28/+31
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-10Merge branch 'aethyra/master'Bjørn Lindeijer2-13/+1
Conflicts: docs/FAQ.txt packaging/windows/make-translations.vbs src/Makefile.am src/gui/colour.cpp src/gui/colour.h src/gui/popupmenu.cpp src/gui/setup_colours.h src/main.cpp src/main.h src/resources/resourcemanager.cpp src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h
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-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer19-62/+55
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer7-12/+12
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer41-185/+580
Conflicts: Almost everywhere.
2009-02-09Mostly whitespace and formatting changesBjørn Lindeijer2-2/+5
(merged from eAthena client)
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-25Removed the TMW branding from header guardsBjørn Lindeijer19-39/+39
2009-01-24Code reformattingBjørn Lindeijer1-5/+8
2009-01-24Code reformattingBjørn Lindeijer1-19/+13
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-23Merge branch 'master' of git@gitorious.org:tmw/eathenaPhilipp Sehmisch40-160/+162
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 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-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-20Added current map filename to debug window.Philipp Sehmisch1-0/+2
(cherry picked from mainline commit 2a7c63f6070606e6623a9730aa1ca9d52c942055)
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-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
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>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-02-27 11:27:35 +0000