summaryrefslogtreecommitdiff
path: root/src/resources
AgeCommit message (Collapse)AuthorFilesLines
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
2008-11-02Since TMW de-hardcoded their hair colors, I have since removed the hard ↵Ira Rice1-27/+17
coded fail colors from the color db.
2008-11-02This correctly fixes the attack problem. Apparently, I didn't realize a bit ↵Ira Rice1-2/+2
ago that the item type was being used to determine which attack animation to use, since a comment lied about it not being used.
2008-10-27De-hardcoded the number of hair styles.Ira Rice1-1/+1
2008-10-23Cleaned up ColorDB code so that it loads with all other databases, as Ira Rice1-1/+2
well as fixed color cycling.
2008-10-19Fixed a small error that I didn't notice before with de-hardcoding the Ira Rice2-2/+2
colors. Thanks goes to paks for noticing this.
2008-10-15De-hardcoded colors in trunk. Now, all colors are loaded from Ira Rice2-0/+171
colors.xml.
2008-10-13Added mob particle attack effects to mobs. Inspired by the TMW patch in Ira Rice2-0/+14
their trunk client.
2008-10-12Added in a new tileset, as well as some new artwork, changed the update Ira Rice1-4/+4
handler to store updates in a subfolder based on port (so that if one server domain hosts multiple update folders, that it doesn't have to redownload an update should an update have the same name as the other server, as well as a different checksum), and made the inventory window display the units of measurement (for all of those people that wanted to know exactly what those units were supposed to be).
2008-10-12This commit contains three things: one, after looking over how TMW was Ira Rice1-7/+7
handling the effects through the level up system, I determined that it wasn't bad, so I pulled it from TMW's SVN. Two, I edited the web page css so that it better matches the forum. And three, I patched text wrapping so that it'll fix up its display size based on all previous lines, except for the last line. That fix will come later, but for now, it'll be seen as a special case. While you'd like to think that just resending the string and starting the function over again would fix it, you'd be wrong. So it won't be patched until I think of a better way to handle that case.
2008-10-10Did a little bit of code cleanup (mostly from TMW changes) as well as Ira Rice1-3/+2
properly implemented line wrapping. Now, there are no more visual artifacts for speech boxes, and it always chooses the most optimal box size (which required that npc_text use it also. Do any other gui classes use the textbox class?).
2008-10-07Fixed some compiler warnings. This probably also fixed the logging of severalBjørn Lindeijer1-3/+2
error messages.
2008-10-07Fixed a compile error that I accidently caused (sorry).Ira Rice1-2/+2
2008-10-06Changed map reader code to allow for pixel offsets, based on TMW's trunk Ira Rice1-3/+9
client change.
2008-10-04Added support for object groups that have an offsetBjørn Lindeijer1-4/+13
2008-10-01Fixed female sprites not showing all equipment.Ira Rice1-1/+1
2008-09-25Merged the Tametomo branch into trunk.Ira Rice10-163/+203
2008-08-29Committed complex (multi-sprite) monster patch - from TMW Mantis, by Jaxad0127Lloyd Bryant3-8/+7
2008-08-29#406 by jaxad0127v0.0.26David Athay3-8/+7
2008-08-29Added fix from TMW to prevent crash if a map layer has too many tilesLloyd Bryant1-1/+7
2008-08-28Fixed crash when map layer has too many tiles.Bjørn Lindeijer1-1/+7
2008-08-07Rebranding TME to AethyraKraant1-1/+1
2008-07-27Changed files to tmeDouglas Boffey1-3/+3
2008-07-19removed unnecessary (weight) check in itemdb loaderLloyd Bryant1-3/+3
2008-07-18Import of client treeLloyd Bryant34-34/+34
2008-07-01Merged revisions 4044-4067 via svnmerge from Bjørn Lindeijer6-112/+176
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r4044 | b_lindeijer | 2008-04-07 11:02:38 +0200 (Mon, 07 Apr 2008) | 2 lines Added support for basing one sprite definition on another by including it. ........ r4057 | b_lindeijer | 2008-04-08 20:43:44 +0200 (Tue, 08 Apr 2008) | 4 lines Implemented support for an arbitrary number of map layers. The only layer requirement for map layers are now that the fringe layer is called "Fringe" and that the collision layer is called "Collision". ........ r4067 | b_lindeijer | 2008-04-11 00:03:57 +0200 (Fri, 11 Apr 2008) | 3 lines Fixed some compiler warnings and don't try to load particle effects when no file is set. ........
2008-06-12Merged revisions 3738 via svnmerge from Bjørn Lindeijer4-49/+11
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3738 | b_lindeijer | 2007-11-16 00:44:01 +0100 (Fri, 16 Nov 2007) | 3 lines Moved item icon from ItemInfo class to the Item class, so that it can be loaded on demand. Results in faster startup time and reduced memory usage. ........
2008-06-05Added command line argument to specify the update host (-H). Also, to avoidBjørn Lindeijer3-5/+6
problems when files with the same name are served by different update hosts, the updates are now stored in an update host specific directory. Based on a patch by Sanga.
2008-05-21Merged revisions 4013,4027,4043,4174,4250,4254 via svnmerge from Philipp Sehmisch7-79/+223
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r4013 | crush_tmw | 2008-04-01 01:18:19 +0200 (Di, 01 Apr 2008) | 1 line Implemented NPC XML database which maps NPC IDs to one or more animation files and thus enables animated NPCs. ........ r4027 | crush_tmw | 2008-04-02 01:34:14 +0200 (Mi, 02 Apr 2008) | 1 line misspelled filename ........ r4043 | b_lindeijer | 2008-04-07 10:37:23 +0200 (Mo, 07 Apr 2008) | 3 lines Added XML::Document class which simplifies parsing an XML document and automatically cleans it up again. ........ r4174 | b_lindeijer | 2008-04-23 14:57:45 +0200 (Mi, 23 Apr 2008) | 2 lines Fixed svn:keywords properties and added header to guild.h. ........ r4250 | crush_tmw | 2008-05-19 18:18:38 +0200 (Mo, 19 Mai 2008) | 1 line Added the possibility to add particle effects to NPCs in npcs.xml. ........ r4254 | crush_tmw | 2008-05-20 15:58:26 +0200 (Di, 20 Mai 2008) | 1 line fixed some filename confusion messup in the last commit. ........ NOTE: This was my first commit using svnmerge. Please check if I did everything correctly.
2008-04-29When compiling with GCC, use the printf format attribute for the log method soBjørn Lindeijer1-1/+1
that the compiler checks the type of its parameters.
2008-04-14Fixed multi-channel image dyeing (patch by fate)Philipp Sehmisch1-3/+4
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-08-04 06:22:42 +0000