summaryrefslogtreecommitdiff
path: root/src/engine.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer1-2/+0
Conflicts: A lot of files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer1-2/+24
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-26Merge branch 'aethyra/master'Bjørn Lindeijer1-2/+0
Conflicts: data/graphics/images/login_wallpaper.png src/being.cpp src/beingmanager.cpp src/engine.cpp src/game.cpp src/gui/buysell.cpp src/gui/buysell.h src/gui/gui.h src/gui/npc_text.cpp src/gui/npc_text.h src/gui/npcintegerdialog.cpp src/gui/npclistdialog.cpp src/gui/npclistdialog.h src/gui/npcstringdialog.cpp src/gui/sell.cpp src/gui/shop.cpp src/gui/table.cpp src/net/beinghandler.cpp src/net/npchandler.cpp src/net/playerhandler.cpp src/npc.cpp src/npc.h src/shopitem.cpp src/shopitem.h src/utils/stringutils.cpp src/utils/stringutils.h src/utils/trim.h
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-3/+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-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-09Mostly whitespace fixesBjørn Lindeijer1-1/+1
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-10/+0
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer1-1/+1
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-07Some more include cleanups.Ira Rice1-10/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-26Slight bit of code cleanup, as well as minor fixes to logic. For someIra Rice1-19/+12
reason, the windows will gladly shrink when resizeable, but not grow. This will need to get resolved some time later. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-25Fixed performance hickups caused by animations due to buggy tick timer. A ↵Philipp Sehmisch1-0/+1
tad less performant than the intended solution but at least it is constantly so.
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.
2008-12-13Added support for being effects through the eAthena levelup message, and checkBjørn Lindeijer1-0/+1
whether the being exists before referencing it. Re-enabled proper MP bar display. Improved handling of a warp to the same map. (patch by Fate) (cherry picked from eAthena client, the part about the levelup message doesn't apply, and we now seem to have a second "effect manager"...) Conflicts: ChangeLog src/being.cpp src/being.h src/engine.cpp src/engine.h src/gui/ministatus.cpp src/net/beinghandler.cpp src/net/playerhandler.cpp src/net/protocol.h
2008-12-13The "name" property of the map is now used as caption of the minimap window ↵Philipp Sehmisch1-11/+6
when it exists. (cherry picked from eAthena client, replacing 'mapname' property handling)
2008-12-08An attempt to fix the crashes related to particlesBjørn Lindeijer1-2/+7
The player character is never deleted, and hence might have particles still active when the map changes. These particles are deleted on map change, but when the player character was moved, it was trying to mark these deleted particles for deletion, writing to unallocated memory. The marking for deletion by the player character now happens before the particles are deleted. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Fixed the minimap name field so that it works for us again. Since IIra Rice1-6/+4
originally ported this from TMW's trunk, and they later changed their mind on the minimap name property, this was broken on our maps. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-0/+6
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-11-20Removed a duplicated includeBjørn Lindeijer1-1/+0
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-5/+1
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 Lindeijer1-2/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer1-2/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-10-13Minor fix for a situation thatwe shouldn't ever need to encounter, but Ira Rice1-0/+4
is nice to have anyways.
2008-10-13Changed minimap code so that it allows us to have larger minimaps, while Ira Rice1-0/+6
putting back in backwards compatibility with TMW style minimaps. While this might seem like a big deal, it also allows us to make minimaps as big as we'd like, which is a huge perk for really large maps or really small ones.
2008-10-02The "name" property of the map is now used as caption of the minimap window ↵Philipp Sehmisch1-0/+6
when it exists.
2008-09-25Merged the Tametomo branch into trunk.Ira Rice1-0/+12
2008-08-28Added support for being effects through the eAthena levelup message, and checkBjørn Lindeijer1-0/+1
whether the being exists before referencing it. Re-enabled proper MP bar display. Improved handling of a warp to the same map.
2008-07-18Import of client treeLloyd Bryant1-1/+1
2008-07-01Ported some GUI improvements from Legend of Mazeroth (GUI skinning via XML ↵Philipp Sehmisch1-0/+11
files, item descriptions on mouse-over, map names in minimap window, speech bubbles)
2008-03-23Removed unnecessary forwarding method.Bjørn Lindeijer1-5/+0
2008-03-23Merged revisions 3823,3825-3826,3829,3831-3839,3841-3842 via svnmerge from Bjørn Lindeijer1-2/+1
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r3823 | crush_tmw | 2007-12-28 19:36:58 +0100 (Fri, 28 Dec 2007) | 1 line Added the possibility to assign particle effects to monsters in the monster database. Added flame particle effect to fire goblin as a proof of concept. ........ r3826 | crush_tmw | 2007-12-30 01:02:14 +0100 (Sun, 30 Dec 2007) | 1 line Added a key for targeting the nearest player character based on patches by Trinexx. Some mapping fixes at snake dungeon map. ........ r3839 | the_enemy | 2008-01-13 17:28:50 +0100 (Sun, 13 Jan 2008) | 1 line Fixed non-default location music loading ........ r3842 | crush_tmw | 2008-01-14 11:48:13 +0100 (Mon, 14 Jan 2008) | 1 line ixed an error in Davids last commit (couldn't compile that way). ........
2008-01-13Fixed non-default location music loadingDavid Athay1-2/+1
2007-12-31Added config options to set the scroll center. Retained scroll offset during ↵Philipp Sehmisch1-0/+5
map change for smoother map transitions.
2007-10-23Merged changesets 3653, 3655-3657, 3659-3560, 3671-3672 from trunk to Bjørn Lindeijer1-0/+5
0.0. Mostly memory leak fixes by Guillaume.
2007-10-21Fixed current map not deleted on server change.Guillaume Melquiond1-0/+5
2007-08-28Made buy dialog resizable and added a WindowListener class for listening forBjørn Lindeijer1-7/+3
window resize and move events.
2007-08-27Ported patch from 0.0, in order to support missing extensions and ↵Guillaume Melquiond1-2/+6
uncompressed maps.
2007-08-27Made client search for both compressed and non-compressed map files.Bjørn Lindeijer1-2/+10
2007-06-04Merged 0.0 changes from revision 3234 to 3317 to trunk.Bjørn Lindeijer1-0/+7
2007-05-04Merged particle engine into main eAthena branch.Philipp Sehmisch1-0/+7
2007-03-24Merged 0.0 changes from revision 3177 to 3234 to trunk.Bjørn Lindeijer1-2/+2
2007-03-21Renamed Spriteset to ImageSet.Bjørn Lindeijer1-2/+2
2007-03-11Merged 0.0 changes from revision 3065 to 3177 to trunk.Bjørn Lindeijer1-11/+0
2007-02-02Made Engine class even more useless by moving emoticon loading into Being.Bjørn Lindeijer1-11/+0
2007-01-04Merged 0.0 changes from revision 2898 to 2988 to trunk.Bjørn Lindeijer1-30/+2
2006-12-14Removed the rather useless remaining draw function from the engine class andBjørn Lindeijer1-5/+0
fixed an issue with fading out damage texts (they were sometimes fully opaque at the end of fading out).
2006-12-12Cleaned up some unused stuff.Bjørn Lindeijer1-25/+2
2006-12-11Merged 0.0 changes from revision 2825 to 2898 to trunk.Bjørn Lindeijer1-144/+3
2006-12-04Introduced a new class Viewport which combines the drawing code from EngineBjørn Lindeijer1-145/+2
with the (rather misplaced) input handling from the Gui class. Also, it's a Container itself which should allow for extending it to show Guichan widgets on map coordinates.
2006-12-03Made NPC names visible. Windows are now invisible by default.Bjørn Lindeijer1-13/+13
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-28 23:04:33 +0000