Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
In an attempt to make the GUI code a little more structured, basic
widgets are now put in gui/widgets. Many includes were also cleaned up.
|
|
|
|
|
|
Defaults to:
[ for previous tab
] for next tab
|
|
Now that messages can be sent without requiring a pointer to the
Network instance, a lot of cleanup was possible.
|
|
|
|
|
|
|
|
Fixed a faulty == statement that should have been an assignment and a
mismatched 'else' block.
|
|
ChatTabs now manage their own adding/removal from the chat window, which
lost most of it's chat related messages. Whisper handling is stil done
by the ChatWindow, but it no longer manages any other tabs. ChannelTab
handling is now the sole responsability of the Channels they are
attached to. The general tab is handled by Game.
|
|
|
|
This fixes TMWServ compilation form the previous commit.
|
|
TMWServ compilation is likely not functional after this, I didn't check.
THe next commit will address that.
|
|
Conflicts:
A lot of files.
|
|
Conflicts:
Many files.
|
|
Also fix several instances where the same net handler was being used for
both servers, and a few other related oddities.
|
|
Also drop Aethyra's custom magic code
|
|
|
|
|
|
This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.
In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.
Conflicts:
Everywhere!
|
|
position of the recorder, as well as fixed resetting the help window,
and exposing the buy/sell window to being resettable, as well as
remembering its previous position. All windows should now be covered by
the reset button on the setup pane.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|
|
|
|
|
|
that position. This makes it so that when resolutions are changed, the
default locations stay relative to the window's position, and not the
800x600 screen resolution.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
This patch makes item links work in any chatLog() message, not only chatSend()
as before. I enabled it for the "You picked <nr> <item>" message by explicitly
adding [] around the item name in the string.
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|
|
|
|
This patch makes item links work in any chatLog() message, not only chatSend()
as before. I enabled it for the "You picked <nr> <item>" message by explicitly
adding [] around the item name in the string.
|
|
|
|
The string utility methods are now grouped together in the stringutils.h
header. Also, a toLower method was added for convenience.
|
|
The string utility methods are now grouped together in the stringutils.h
header. Also, a toLower method was added for convenience.
|
|
Conflicts:
src/gui/npc_text.cpp
src/gui/npc_text.h
src/gui/npcintegerdialog.cpp
src/gui/npclistdialog.cpp
src/gui/npcstringdialog.cpp
src/net/npchandler.cpp
src/npc.cpp
|
|
the recipient nickname is parsed out.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
disallowing empty whispers and whispers to yourself, since both of those
cases cause the server to report back stating that the player wasn't
found (even if they are there, like yourself).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
line's string was empty after trimming, the client would crash when
trying to get a substring.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
The window name is used in the configuration file, in contrast to the
window title.
|
|
When not passing any parameters to constructors, there is no reason for
using parenthesis.
|
|
|
|
Also a few whitespace and spelling fixes.
|
|
Also a few whitespace and spelling fixes.
|
|
|
|
|
|
|
|
|