| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
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.
|
|
|
|
|
|
|
|
|
|
|
|
useful since buddy lists are tracked through the player relation
interface instead)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
|
|
Conflicts:
A lot of files...
|
|
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
|
|
Conflicts:
Almost everywhere.
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
work.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
of the item link shown. This should help make it easier for people to
represent the square brackets with item links, and prevent people from
forging item links when they never see the internal representation of an
item link. Should also reduce confusion from people who haven't upgraded
their clients as well, as they wonder what all the junk is around the
item name.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
commit. Also, while the overall performance improved a little, it
doesn't appear to be as drastic as the last commit was suggesting.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
include anything not needed by that specific widget or window. This
appears to have cleaned up system performance a bit on my current setup,
where it went from idling on 45% in game with opengl down to 30% now.
Also moved iptostring to the tostring header, as importing all of
network.h is a little overkill to use that function, and it goes along
with the basic functions that are in that header file anyways. TODO:
find out a way to get rid of warnings when a class doesn't use this
function.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
back to the chat class, where they really belong. Since the party class
parses its own suboptions, I left the suboptions within that class.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
