summaryrefslogtreecommitdiff
path: root/src/utils
AgeCommit message (Collapse)AuthorFilesLines
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer9-36/+36
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-15Style cleanups throughout most of the code. Splitting function type fromIra Rice2-12/+6
the function names should no longer be around. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-06Added support for internationalizationIra Rice1-0/+44
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>
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-24/+24
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-05Fixed MutexLocker to not work on a copyBjørn Lindeijer1-5/+8
The Mutex class wasn't meant to be copied around. Silly last minute refactorings leading to untested code...
2008-12-05Fix race condition with a std::string accessBjørn Lindeijer1-0/+94
The downloading thread was writing to a std::string while the main thread was trying to draw it, for example. Now access to the label caption is guarded with a mutex. Should fix crashes while downloading updates.
2008-12-05Fixed MutexLocker to not work on a copyBjørn Lindeijer1-5/+8
The Mutex class wasn't meant to be copied around. Silly last minute refactorings leading to untested code...
2008-12-05Fix race condition with a std::string accessBjørn Lindeijer1-0/+94
The downloading thread was writing to a std::string while the main thread was trying to draw it, for example. Now access to the label caption is guarded with a mutex. Should fix crashes while downloading updates.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice10-21/+5
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 Lindeijer10-42/+24
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-11-08Ported a TMW compile error fix reported by Martin Michlmayr.Ira Rice1-4/+1
2008-11-08Fixed compile error with GCC 4.4 reported by Martin Michlmayr.Bjørn Lindeijer1-5/+1
2008-10-26Added Crush's recent Particle engine modifications from TMW.Ira Rice1-50/+0
2008-10-26Implemented particle emitters with properties which change over time ↵Philipp Sehmisch1-50/+0
according to wave functions.
2008-09-25Merged the Tametomo branch into trunk.Ira Rice1-0/+8
2008-07-18Import of client treeLloyd Bryant9-9/+9
2008-05-21Merged revisions 4013,4027,4043,4174,4250,4254 via svnmerge from Philipp Sehmisch2-0/+73
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-02-18Fixed image name.Eugenio Favalli1-1/+1
2007-11-21Merged revisions 3705-3711,3714,3718,3721-3722,3729-3731,3735,3742 via ↵Bjørn Lindeijer2-0/+90
svnmerge from https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk (dynamic recoloring of sprites and related changes) ........ r3705 | gmelquio | 2007-11-03 10:58:25 +0100 (Sat, 03 Nov 2007) | 1 line Fixed double load of hair graphics. ........ r3706 | gmelquio | 2007-11-03 22:04:51 +0100 (Sat, 03 Nov 2007) | 1 line Added automatic recoloring of images. Inspired by fungos' ideas (PR #41). ........ r3707 | gmelquio | 2007-11-03 22:08:21 +0100 (Sat, 03 Nov 2007) | 1 line Experimented recoloring on scorpions. ........ r3708 | gmelquio | 2007-11-04 12:52:44 +0100 (Sun, 04 Nov 2007) | 1 line Tightened palette handling. ........ r3709 | gmelquio | 2007-11-04 12:54:31 +0100 (Sun, 04 Nov 2007) | 1 line Experimented with scorpions again. ........ r3710 | gmelquio | 2007-11-04 16:40:37 +0100 (Sun, 04 Nov 2007) | 1 line Applied recoloring to hair styles. ........ r3711 | gmelquio | 2007-11-04 17:50:37 +0100 (Sun, 04 Nov 2007) | 1 line Converted slimes to recoloring. ........ r3742 | gmelquio | 2007-11-16 14:16:00 +0100 (Fri, 16 Nov 2007) | 1 line Sped up recoloring of transparent pixels. ........
2007-11-19Merged revisions 3739,3743-3744,3746-3747 via svnmerge from Bjørn Lindeijer1-113/+0
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk ........ r3739 | umperio | 2007-11-16 11:49:58 +0100 (Fri, 16 Nov 2007) | 1 line Removed useless win32 implementation of gettimeofday. ........ r3743 | umperio | 2007-11-16 15:14:00 +0100 (Fri, 16 Nov 2007) | 1 line Fixed minor issues. ........ r3747 | b_lindeijer | 2007-11-18 23:05:16 +0100 (Sun, 18 Nov 2007) | 2 lines Fixed small mapping error, collision layer not changed. ........
2007-10-18Merged removal of dependency on Guichan OpenGL from trunk to 0.0 branch, Bjørn Lindeijer1-0/+2
including optimization of OpenGL memory usage on modern OpenGL drivers. Patches by Guillaume Melquiond.
2007-09-27Merged another bunch of changes from trunk to 0.0 to reduce the difference.Bjørn Lindeijer1-1/+1
2007-09-20Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style Bjørn Lindeijer1-48/+48
to native for some files that were still missing this property. This is a feeble attempt to reduce the amount of conflicts for future merges.
2007-08-24Added trimming of name for new character creation and of chat messagesBjørn Lindeijer1-1/+6
appearing above players. Also improved resize mouse cursor indication, removing duplicated code and fixing indicator above resize grip.
2007-08-22Added trimming of chat messages.Bjørn Lindeijer3-0/+51
2007-08-21mantis id=118 - Added Item Shortcut Bar.Joshua Langley1-1/+1
2007-06-03Fixed warning about strict-aliasing rules and don't die on warnings by default.Bjørn Lindeijer1-6/+7
2007-05-04Merged particle engine into main eAthena branch.Philipp Sehmisch5-113/+217
2007-04-23Merged Björn Steinbrinks improvements at the xml parsing from trunk version.Philipp Sehmisch1-0/+6
2006-12-14Removed the rather useless remaining draw function from the engine class andBjørn Lindeijer1-3/+5
fixed an issue with fading out damage texts (they were sometimes fully opaque at the end of fading out).
2006-12-12Moved base64 module into utils directory.Bjørn Lindeijer2-0/+186
2006-11-27Added implementation of gettimeofday() for windows machines.Philipp Sehmisch1-0/+111
2006-11-15Added missing Id keyword property to recently added files.Bjørn Lindeijer2-2/+2
2006-11-15Separated getProperty method to an XML utility namespace.Bjørn Lindeijer2-0/+100
2006-03-19Unreverted latest change by Doener due to my lack of proper communication ↵Eugenio Favalli1-0/+37
abilities.
2006-03-19Reverted changeset r2269 (toString) as requested by ElvenProgrammer.Björn Steinbrink1-37/+0
2006-03-18Fixed indentation.Björn Steinbrink1-5/+5
2006-03-18Added a toString conversion function.Björn Steinbrink1-0/+37
2006-03-09Added guards.Björn Steinbrink1-0/+5
2006-03-08Added a 'dtor' helper functor to delete objects in arrays and containers ↵Björn Steinbrink1-0/+44
using STL algorithms.