Age | Commit message (Collapse) | Author | Files | Lines |
|
Uses a state variable in PlayerInfo instead. Moves isTalking from Being
to PlayerInfo. Also some small cleanups.
Reviewed-by: Chuck Miller
|
|
Reviewed-By: Jared Adams
|
|
|
|
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.
|
|
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 cleanup PlayerInfo a bit.
Reviewed-by: Chuck Miller
|
|
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>
|
|
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.
|
|
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
|
|
Fix receiving whisper message if option
whisper in tabs disabled.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Reviewed-by: Bertram
|
|
|
|
Made the sell dialog give the idem id, instead of an
internal inventory id when a item is a duplicate.
Reviewed-by: Freeyorp, Strikermdd
Resolves: Manasource-Mantis #101
|
|
Conflicts:
data/graphics/CMakeLists.txt
data/graphics/Makefile.am
src/client.cpp
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Also fix a small compilation error sometimes reported.
Reviewed-by: Chuck Miller
|
|
There is no reason why error.xml shouldn't be in this repository, as it is used
when no sprite data is present and is a very small file anyways. Servers can
still replace these if they want to. error.png is only used in sprites, so
should be in the new sprites folder too.
Reviewed-by: 4144
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
No need for two different classes to manage ActorSprites.
Reviewed-by: Chuck Miller
|
|
Rename mWalkTime to mActionTime in Being and have Being manage death.
Reviewed-by: 4144
|
|
Reviewed-by: Thorbjørn Lindeijer
|
|
Reviewed-by: Thorbjørn Lindeijer
|
|
Reviewed-by: Thorbjørn Lindeijer
|
|
Reviewed-by: Thorbjørn Lindeijer
|
|
Problem reported by Sokon.
Reviewed-by: Ignoring server entry with unknown type:
|
|
Reviewed-by: Thorbjørn Lindeijer
|
|
Reviewed-by: Jaxad0127.
|
|
Reviewed-by: Bertram
|
|
Reviewed-by: Bertram
Resolve: Manasource Mantis #143
|
|
|
|
|
|
|
|
Conflicts:
src/beingmanager.cpp
src/beingmanager.h
src/client.cpp
src/localplayer.cpp
|
|
Instead of having these three subclasses with minor differences, this
commit merges them back into Being. In the future, we can make Beings
that are talkable to some, attackable by others, etc. This also puts
back support for monster equipment.
Also changes remaining references to Being::Type and the constants to
refer to ActorSprite::Type.
Reviewed-by: Freeyorp
|
|
Now draw image only in chat item popup.
Reviewed-by: Bertram
|
|
This commit adds a sprite hierarchy (Sprite->ImageSprite,AnimatedSprite,CompundSprite;
CompoundSprite,Actor->ActorSprite;ActorSprite->Being,FloorItem) to collect common
functionailty into new base classes which will make other Mantis tickets easier to do.
Also allows monsters to use particle effects.
Reviewed-by: Bertram
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
|
|
Reviewed-by: Thorbjørn Lindeijer
|
|
Small code style changes.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Add option in players setup page.
Add command line option.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
The invite and leave buttons are now only enabled when there are tabs. Also,
the code to handle them will do nothing if no tab is selected (backup
logic).
Reviewed-by: Chuck Miller
|