summaryrefslogtreecommitdiff
path: root/src/player.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer1-0/+24
Conflicts: src/being.cpp src/being.h src/floor_item.cpp src/floor_item.h src/flooritemmanager.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/popupmenu.cpp src/net/beinghandler.cpp src/npc.cpp
2009-03-02Cut down on constant streaming of attacks. Attacks from players now onlyIra Rice1-1/+1
occur on each swing action. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-02Added particle attacks back on to the players. However, instead of beingIra Rice1-0/+24
constant, particle attacks are now weapon specific, so that different weapons can have different attacks. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-18Merge commit 'aethyra/master'Bjørn Lindeijer1-24/+21
Conflicts: src/net/npchandler.cpp
2009-02-17Fixed an error reported by m0t1k4 which caused a segmentation fault onIra Rice1-24/+21
closing when displaying your own name is turned on. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-10Use string::empty() instead of comparing to ""Bjørn Lindeijer1-3/+4
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-10Use string::empty() instead of comparing to ""Bjørn Lindeijer1-3/+4
2009-02-07Some more include cleanups.Ira Rice1-5/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-27Restore punching animation after weapon removalJared Adams1-0/+5
2009-01-24Tweaks to the speech bubbles so that being status (GM, mob, npc,Ira Rice1-2/+7
regular player) is displayed in the speech bubbles now. No need to view your own name to be able to see whether you're showing as a GM now. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-24Use standard GUI font also for speech and namesBjørn Lindeijer1-6/+2
The speech bitmap font can't handle unicode, so it has now been replaced by the standard GUI font, drawn with a shadow for chat and with a full outline for names.
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.
2009-01-09Added the ability to see your own name in game.Ira Rice1-11/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch1-14/+6
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice1-0/+1
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-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-6/+4
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-02Fixed a hair color problem that Soft reported that I apparently broke when I ↵Ira Rice1-0/+1
de-hardcoded the hair colors.
2008-11-01* Use hair.xml to determine hair colours (#514)Fate1-17/+5
* Auto-detect number of hair styles available (#514)
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/+0
well as fixed color cycling.
2008-10-19Fixed a small error that I didn't notice before with de-hardcoding the Ira Rice1-0/+1
colors. Thanks goes to paks for noticing this.
2008-10-15De-hardcoded colors in trunk. Now, all colors are loaded from Ira Rice1-22/+1
colors.xml.
2008-09-25Merged the Tametomo branch into trunk.Ira Rice1-0/+12
2008-09-07Added 6 colors for each of the hair styles. Since 10 is an odd number Ira Rice1-2/+8
for the number of colors for a packet, I added 6 more fun colors. I'd add in two more hair styles as well, but since I don't know if it's safe, I'm going to play it safe for now and not include them.
2008-08-28Accepted Patch by Scraggy that moves text in such a way that no text overlapsBjørn Lindeijer1-29/+36
2008-08-13Added support for different colored fonts for different being typesLloyd Bryant1-3/+10
2008-07-18Import of client treeLloyd Bryant1-30/+37
2008-05-14Added ability to define friends, players you want to ignore or disregard andBjørn Lindeijer1-4/+27
configure whether trading is allowed. Based on new popup code, configuration improvements to store hierarchical data and a table model.
2007-12-23Particle images are now reference-counted properly. Avoided attempts to load ↵Philipp Sehmisch1-2/+9
"data/graphics/" when a monster or equipment piece has no sprite. Error placeholder is now used when attempting to load a sprite definition file that doesn't exist.
2007-12-10Simplified player subsprite handling by treating equipment, hairstyle and ↵Philipp Sehmisch1-35/+14
base sprites alike. Implementing female hairstyles is now a purely content-sided task.
2007-11-21Merged revisions 3705-3711,3714,3718,3721-3722,3729-3731,3735,3742 via ↵Bjørn Lindeijer1-39/+30
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-20Merged revisions 3629-3630 via svnmerge from Bjørn Lindeijer1-50/+41
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk (but kept looks in Being class, since eAthena works that way) ........ r3629 | gmelquio | 2007-10-18 21:00:38 +0200 (Thu, 18 Oct 2007) | 1 line Removed player looks from generic beings. Prevented client termination on missing sprites. Merged weapon-type and attack-type fields for items. ........ r3630 | gmelquio | 2007-10-18 21:30:57 +0200 (Thu, 18 Oct 2007) | 1 line Fixed changelog message. ........
2007-10-01Added support for different hairstyles for male and female characters. ↵Philipp Sehmisch1-4/+18
Female hairstyles are copies of the male ones until the real female hairstyles are finished.
2007-09-20Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style Bjørn Lindeijer1-1/+1
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-30Merged equipment database with items database and got rid of the unused itemBjørn Lindeijer1-7/+8
art attribute. Removed the now unnecessary multiplication of weapon IDs with 10000. Added a fallback item icon and used it for unknown items or when an item image fails to load.
2007-07-11Weapon sprites are now (almost) threated like other equipment sprites ↵Philipp Sehmisch1-37/+7
through the equipment sprite database. (use -u to ignore updates)
2006-12-16Fixed connection dialog visibility and fixed issues with walking one tile tooBjørn Lindeijer1-0/+2
many and changing direction towards an obstacle.
2006-12-03Made NPC names visible. Windows are now invisible by default.Bjørn Lindeijer1-3/+0
2006-12-01Monster sound effect patchPhilipp Sehmisch1-18/+4
2006-11-30Some optimizations to setSex, setWeapon and handling of player update messages.Bjørn Lindeijer1-13/+18
2006-11-26Made Being::mDirection protected, forcing the use of setDirection. DefaultedBjørn Lindeijer1-12/+14
variant argument to 0 since this is the most common situation. Some SpriteDef refactoring, splitting up the loading into several methods, in preparation of adding support for including other sprites.
2006-11-26Equipment database namespace and support for gender specific equipment spritesPhilipp Sehmisch1-5/+30
2006-11-19Separated sprite definition from playback.Bjørn Lindeijer1-16/+0
2006-11-04added scythe as a permanent weapon. Philipp Sehmisch1-1/+30
When you want to test it: either spawn an item with the id 623 or uncomment the lines 439-441 in being.cpp to use the sharp knive as scythe.
2006-10-29Fixed excessive unnecessary reloading of sprites. Also updated NEWS file.Bjørn Lindeijer1-6/+10
2006-08-26Applied patch by Bahamut81 which implements resetting of Animation, Action andBjørn Lindeijer1-1/+15
AnimatedSprite. This fixes the animation synchronization issues.
2006-08-13Merged Guichan 0.5.0 support from guichan-0.5.0 branch, plus several updatesBjørn Lindeijer1-2/+2
from the 0.1.0 branch.
2006-08-05Some cleanups, mostly lowering indentation levels.Björn Steinbrink1-14/+6