Age | Commit message (Collapse) | Author | Files | Lines |
|
I turned the CharacterEntries into a vector.
As for now, it's basically working but I discovered bugs about
slots handling mainly for Manaserv that were already present
before that patch.
Hence, there are three remaining issues:
- Under ManaServ, the character's slots numbers aren't handled
when loading the characters but used when sending selection
or deletion attempts.
For instance, if you delete the character at slot 1, you won't
be able to select or delete characters at slots 2 and 3,
since the server believes that the characters are now in slots 1 and 2,
even thought the client still displays them at the former slots.
- Also under manaserv, you won't be able to create a character at slot 1
and 3, the server will automatically add the new one to the next slot,
which is not corresponding to where you clicked to the 'Create' button.
I propose to make Manaserv send again the character slots numbers
and store them in database since we used them in creation,
selection, and deletion attempts. It would make more sense IMHO.
- The last remaining issue found is that when switching between different
servers, the loginData don't get cleaned up, make the characterSelect dialog
look crazy when the number of slots is different between two servers.
If this one is accepted, my next patch will make the logindata be cleaned up
between each login attempts (as for the slot number, and maybe other sensible
data) and the next ones will readd character slot handling server
and client side.
Reviewed-by: Jaxad0127.
|
|
This permit not to be stuck at character deletion
when something goes wrong.
Trivial fix.
|
|
Resolves: Mana-Mantis #265.
Trivial fix.
|
|
Instead of using events to invoke netcode,
invoke netcode directly and have it send events
Reviewed-by: Freeyorp
|
|
|
|
Reviewed-by: Freeyorp
|
|
Resolves: Mana-Mantis #250.
Reviewed-by: Freeyorp, thorbjorn.
|
|
Reviewed-by: Jared Adams
|
|
Reviewed-by: CodyMartin.
|
|
Conflicts:
src/being.cpp
src/client.cpp
src/commandhandler.cpp
src/gui/setup_video.cpp
src/gui/socialwindow.cpp
src/gui/viewport.cpp
src/gui/widgets/browserbox.cpp
src/gui/widgets/itemcontainer.cpp
src/imageparticle.cpp
src/localplayer.cpp
src/localplayer.h
src/map.cpp
src/net/tmwa/beinghandler.cpp
src/particle.cpp
src/particle.h
src/player.cpp
src/player.h
|
|
They are initialized else where in the code
Reviewed-by: Jared Adams
|
|
Also tested to be compatible with tA.
Now the Status window is much more nicer when using Manaserv.
HP, max hp, ... are now working fine along with corrections made
in the attributes.xml file (in next commit.)
Reviewed-by: Thorbjorn.
|
|
It is used only by tmwa handlers.
Trivial fix.
|
|
Reviewed-by: Bertram
|
|
Following Rotonen's advise to "make anything and everything you
can think of recolorable", a theme can now define colors for
PARTY_CHAT_TAB and PARTY_SOCIAL_TAB. This was badly needed, because
the requirements for a color of a chat tab and of a player name
are quite different.
TODO: When guild support gets enabled, then have a look at the
colors for guilds.
Reviewed-by: 4144
|
|
With the preprocessor definition MANASERV_SUPPORT the manaserv
support is avaible as before.
* Removing server type from server dialog GUI.
* Ignoring Manaserv entries in serverlist.xml.
* In order not to lose Manaserv CustomServers from the config.xml,
they get stored in mManaservServers.
* The entries in mManaservServers are saved in config.xml again. But
they are now behind the TMWA-Athena servers.
* For custom server the GUI sets 6901 as default value for port.
* If the server type is unknown, then we use TMW-Athena. This is
relevant, if the client is started with command line options for server.
Reviewed-by: Bertram
|
|
As an upcoming feature the TMW-Athena server sends IP addresses or
IP hashes to game masters. The current client freezes if it receives
such a packet, therefor the game masters need to use a new client before
the server can use it. Normal players are not affected, because they
do not get this packet.
Showing the IP is optional and can be enable with the chat command
"/showip 1". The IP is then shown behind the players name.
Reviewed-by: Bertram
|
|
Removed due to unresolved social issues.
In master it had been already removed by Kage in
commit 89f192b9039f9c000515f0a12f4bb9fb55c4691c.
|
|
Reviewed-by: Jaxad0127
|
|
The implamentation is poor, and this is something that
would be better handled by the addon engine later down
the road.
Reviewed-By: Freeyorp < Freeyorp101@hotmail.com >
|
|
Reviewed-by: Thorbjorn
|
|
Conflicts:
src/actorspritemanager.h
src/beingmanager.cpp
src/game.cpp
src/gui/beingpopup.cpp
src/gui/chat.cpp
src/gui/chat.h
src/gui/inventorywindow.h
src/gui/itempopup.cpp
src/gui/socialwindow.cpp
src/gui/statuswindow.cpp
src/gui/widgets/chattab.cpp
src/gui/widgets/chattab.h
src/net/tmwa/inventoryhandler.cpp
src/net/tmwa/partyhandler.cpp
src/party.cpp
src/sound.cpp
src/utils/stringutils.cpp
src/utils/stringutils.h
|
|
Reviewed-by: Thorbjorn.
Resolves: Mana-Mantis #229.
|
|
Trivial fix.
|
|
This log message shows up in mana.log: "Unhandled packet: 7c".
Later, the client will have to actually take care of it, though.
Reviewed-by: Bertram, jaxad0127.
|
|
Reviewed-by: Bertram
|
|
Reviewed-by: Jaxad0127
|
|
The SlotsBar is updated, if InventoryWindow::slotsChanged() is called.
This did not happen when an item disappeared from the inventory, because
of using it. Then the item quantity was just set to 0, but the SlotBar
was not notified.
Reviewed-by: Jaxad0127
|
|
Reviewed-by: Thorbjorn
|
|
Reviewed-by: Thorbjorn
|
|
to fit manaserv latest changes.
Reviwed-by: Freeyorp, Thorbjorn.
|
|
How to reproduce the bug: Switch the login to an account with
fewer characters. Then those character slots are not empty, but
show characters from the previous account.
Reviewed-by: thorbjorn
|
|
If server and port was given on the command line, then the server type
was unknown. The command line options do work now, but only if standard
ports 6901 and 9601 are used.
This resolves http://bugs.manasource.org/view.php?id=177
TODO: Query the server about itself and choose the server type based on that.
Reviewed-by: Jaxad0127
|
|
Bug description: If a player has equipable items only, then the equipment
backend gets not initialized. As a consequence the equipment window
remains empty. This is particularly a problem for new characters.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Adding error message when trying to create a party with to long name.
Removing non-existing files from C::B project.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
This resolves http://bugs.manasource.org/view.php?id=171
Reviewed-by: Bertram.
|
|
This resolves http://bugs.manasource.org/view.php?id=171
Reviewed-by: Bertram.
|
|
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Segmentation fault happens if a player leaves
your party while he is out of sight.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Most of Net::InventoryHandler is now done through events. The
ActorSpriteManager was also replaced by events. A few odds and
ends were taken care of too.
Reviewed-by: Bertram
|
|
Conflicts:
mana.cbp
mana.files
src/CMakeLists.txt
src/Makefile.am
src/utils/xml.cpp
|
|
Reviewed-by: Freeyorp
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
EventManager has been merged into Event, with some new convinience methods
added.
Reviewed-by: Chuck Miller
|
|
Reviewed-by: Chuck Miller
|
|
Reviewed-by: Chuck Miller
|
|
Reviewed-by: Chuck Miller
|
|
The previous check broke compilation against ENet 1.2.2, which does
define the version macros but does not have the API changes.
|
|
The Being and Player Chat events now have the precomuted permissions
for SPEECH_LOG and SPEECH_FLOAT. The Being class now acts on those
events to show speech (if SPEECH_FLOAT is present). ChatWindow now
checks for the SPEECH_LOG permission.
Reviewed-by: Freeyorp
|