| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
modernize-loop-convert
modernize-deprecated-headers
|
|
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
|
|
Instead, support for dynamically adjusting layout was added to the
Container class.
Various other places were also adapted to use the new layout support in
Container.
Reviewed-by: Erik Schilling
|
|
There wasn't a whole lot gained by sharing a common base class, and it makes
extending the manaserv Message{In,Out} classes with a debugging mode
unnecessarily complicated.
Reviewed-by: Yohann Ferreira
|
|
|
|
This will ease the reading of the next patch about hair handling
at character creation time in tAthena.
As requested by bjorn.
Reviewed-by: bjorn
|
|
Reviewed-by: Crush.
|
|
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.
|
|
In preparation for resolution of mana-issue: #211.
Trivial.
|
|
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
|
|
* In charselectdialog the requestFocus is now called later, because
before it had no effect, since it was called before the characters
were present. Having no char with focus has the side effect that
the escape key gets ignored.
* Removing the code for variable width of CharacterDisplay, because
with recent changes it is executed before the characters are present,
therefore it had no effect.
|
|
Handling moved from LocalPlayer to PlayerInfo class
Event system used to update windows
Reviewed-by: Jared Adams
|
|
Reviewed-by: Bertram
|
|
Much code was moved from main() to the new Client::exec(). This new
event loop now integrates with the Game class, so that the tick counter
and framerate limiter apply universally.
The Client class is also responsible for some things that used to be
global variables.
Mantis-issue: ...
|
|
|
|
|
|
Ownership of the charInfo global variable wasn't well defined. It was
being locked, unlocked and generally modified from a lot of places, and
somewhere in this mess it ended up crashing when switching servers.
Now the CharHandler instances, for eAthena and manaserv respectively,
own this list of characters. A new class, Net::Character wraps up the
slot index in combination with the player dummy. The list is passed on
to the CharSelectDialog each time it changes.
Both related and unrelated cleanups were made as well.
Reviewed-by: Jared Adams
|
|
Also added the update copyright tool from the Wormux Team.
( And not forgetting credit's due. :P )
|
|
|
|
Was missing return statement.
|
|
The --help options tells:
-D --default : Choose default character server and character
The client now choose the defaulted last character entry when --default is set.
The --character option still has precedence.
Also added a return value to the CharSelectDialog->chooseSelected() function while on it,
in case of someone willing to add errors handling at this stage.
|
|
Moved remaining widgets into widgets folder, standardized include order, moved TextRenderer out.
|
|
|
|
are enabled or not in a static member of class Particle instead of an instanced member of Being.
|
|
Enter and Escape now move forward and backwards for all dialogs except ServerSelectDialog (Escape quits) and CharSelectDialog (Enter doesn't do anything special).
|
|
|
|
|
|
|
|
|
|
|
|
It was only updating on click events, due to using ActionListener
instead of SelectionListener.
|
|
|
|
Fixes a few more bugs
|
|
Better to ask when needed that rely on static booleans to be set from
somewhere. Also tried to fix the layouting a bit, but it's still not
perfect.
|
|
It was only selecting it when found, instead of also logging in with the
character.
|
|
|
|
|
|
member function ‘static void CharSelectDialog::setNetworkOptions(bool, bool)’ to have static linkage
|
|
|
|
Also do some cleanup and refactoring of related code.
|
|
Trying to use the same kind of capitalization and interpunctuation
for various parts of the gui, melding a few split strings, updating
POTFILES.in and adding translators' notes.
|
|
Also some other small merges
|
|
|
|
on forum
|
|
|
|
(cherry picked from commit d76a9210b07cdcf97ae4f94af429b5fa3e72b239)
|
|
(cherry picked from commit 050103b8d2e3eb23e7aea188a1a269feb7c181ab)
|
|
Just a few notes that would help us translators immensly:
* Please do not split one sentence into several strings
* Please try to refrain from inserting extra spaces into the strings
(cherry picked from commit 9712489ef67f95d6a5fa1fc3102bb7c4ee6a1f59)
|
|
their function, this is a much better place to put them.
Signed-off-by: Tametomo <irarice@gmail.com>
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
|
