Age | Commit message (Collapse) | Author | Files | Lines |
|
(Trivial)
|
|
The beinghandler didn't tell to the being::setSprite() function
if the equipment was a weapon or not.
Resolves: Manasource-Mantis #157.
Reviewed-by: Jaxad0127.
|
|
|
|
Also fixed a few compile warnings.
|
|
The old behaviour was to load the weapon-type value and do many
unnecessary checks and transformation on it:
The weapon-type was transformed using hard-coded values into
an integer enum value.
The exact same thing was done on the opposite side in the animation
files before comparing the two.
As both data were string values, I simplified all of it by using
the value taken in items.xml to call the corresponding action.
This now also permit to set up new attack animation in items.xml
and in the playerset.xml without having the need
to modify the client code.
Last but not least, the weapon-type value was used by both the skills
and the actions and avoided the possibility to set up a definite action
for a weapon-type.
Note: The weapon-type parameter will become deprecated for the server
in favor of a 'skill' parameter to reflect more it's actual use.
This patch is the first step to fix Manasource issue: #157.
|
|
Please note that I didn't turned all the getValue() call into new ones,
simply because I have to have config object initiated which is not
forcefully the case the branding file.
Resolves: Manasource Mantis #170.
|
|
To avoid misunderstanding between the actual attackType
and this one.
(Trivial fix.)
|
|
Reviewed-by: Chuck Miller
|
|
Use batch commands and not selecting already selected texture.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
|
|
|
|
Fixes a bunch of crash courses for me.
Reviewed-by: Freeyorp
|
|
The syntax IF ((condition) OR (condition)) is not accepted by cmake
prior to 2.6.4.
The syntax IF (NOT (condition OR condition)) is also not accepted.
The patch should address this without affecting newer versions.
A newline character was also automatically added to the end of the file.
|
|
|
|
|
|
|
|
|
|
|
|
Reviewed-by: Bertram
|
|
|
|
|
|
Reviewed-by: Bertram
|
|
Reviewed-by: Bertram.
|
|
Reviewed-by: Bertram
|
|
Reviewed-by: Bertram.
|
|
Reviewed-by: Bertram
|
|
Conflicts:
src/gui/itempopup.cpp
src/item.cpp
src/monster.cpp
src/net/manaserv/playerhandler.cpp
src/net/tmwa/partyhandler.cpp
src/npc.cpp
src/player.cpp
src/resources/itemdb.cpp
src/resources/monsterdb.cpp
src/resources/monsterinfo.cpp
src/resources/npcdb.cpp
src/resources/spritedef.cpp
|
|
Reviewed-by: Jared Adams
|
|
You'll have to include it anyways 99% of the time
|
|
There is still a good way to go, but this should get us
started
Reviewed-by: Jared Adams
|
|
Reviewed-by: Chuck Miller
|
|
Reviewed-by: Jared Adams
|
|
Also move the virtual destructors of the Net handler base classes to
the top of their method lists.
Reviewed-by: Chuck Miller
|
|
Also cleanup PlayerInfo a bit.
Reviewed-by: Chuck Miller
|
|
Reviewed-by: Jared Adams
|
|
|
|
Reviewed-by: trapdoor
|
|
Handling moved from LocalPlayer to PlayerInfo class
Event system used to update windows
Reviewed-by: Jared Adams
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Please don't, it causes warnings with my settings, which makes my build
fail. ;)
|
|
|
|
data/paths.xml configuration file.
Also added default gui theme path in branding and default wallpaper path
and file searched respectively in the branding and paths.xml files.
Hard-coded values are still used as fallbacks.
Resolves: Manasource Mantis #148.
Reviewed-by: jaxad0127.
|
|
Signed-off-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
|
|
|
|
files.
Restored functional recharge bars in specials window.
Individual specials are only shown after the server informed the client about their status.
Made level label, use button and progress bars optional. Their use is controlled through specials.xml.
The special window button is again shown even when the player has no specials. This problem needs to be solved differently now for architecture reasons.
Reviewed-by: Jaxad0127
|
|
This change allows extending tilesets without causing issues.
Reviewed-by: Freeyorp
|
|
Fix receiving whisper message if option
whisper in tabs disabled.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Adds ActorSpriteListener to manage ActorSprite destruction as
recommended by Jaxad0127. This likewise includes the changes made by
Bertram.
Reviewed-by: Jaxad0127, Bertram.
Resolves: Manasource Mantis #160
|
|
Reviewed-by: Bertram
|
|
|