Age | Commit message (Collapse) | Author | Files | Lines |
|
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!
|
|
The string utility methods are now grouped together in the stringutils.h
header. Also, a toLower method was added for convenience.
|
|
|
|
|
|
That check can probably be removed entirely, as it's inappropriate.
|
|
This allows external classes (like game.cpp) to send actions to it
without them having to know about it's internal state.
|
|
It's not that useful to make variables that are passed by value const.
In the declaration it is even completely ignored.
|
|
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>
|
|
|
|
By using indexed instead of alpha-layered images, the GUI opacity can
also be supported in software mode.
|
|
|
|
Also check value and default value when range is changed
|
|
|
|
And keep the text dialog open for the whole transaction, logging user
input and keep a full record of text from the NPC (for the current
transaction only).
|
|
Added action event id to port field of login dialog.
|
|
Comparison between signed and unsigned integer expressions.
|
|
|
|
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.
|
|
Please do remember that member variables are prefixes with 'm', so that
they are easily distinguishable.
|
|
Comparison between signed and unsigned integer expressions.
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|
|
Conflicts:
CMakeLists.txt
configure.ac
data/help/header.txt
packaging/windows/setup.nsi
po/POTFILES.in
src/being.cpp
src/being.h
src/game.cpp
src/gui/color.cpp
src/gui/color.h
src/gui/equipmentwindow.h
src/gui/popupmenu.cpp
src/gui/recorder.cpp
src/gui/setup_colors.h
src/gui/setup_keyboard.cpp
src/gui/setup_keyboard.h
src/gui/skill.cpp
src/gui/speechbubble.cpp
src/gui/speechbubble.h
src/gui/table.cpp
src/keyboardconfig.cpp
src/keyboardconfig.h
src/localplayer.cpp
src/main.cpp
src/main.h
src/map.cpp
src/resources/colordb.cpp
src/resources/colordb.h
src/resources/emotedb.cpp
src/resources/emotedb.h
src/text.cpp
src/text.h
src/tmw.rc
src/winver.h
|
|
bumps).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Also a few whitespace and spelling fixes.
|
|
Also a few whitespace and spelling fixes.
|
|
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|
|
The log is mainly used to aid the developers, hence shouldn't be
translated to the user's local language. Also introduces unnecessary
work for all translators.
|
|
|
|
Mainly removed trailing whitespace. Also small fix in header of
recorder.cpp.
|
|
|
|
Sometimes it's nice for clarity, but most of the time this is just
clutter. C++ != Java. :)
|
|
useful since buddy lists are tracked through the player relation
interface instead)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Setup_Video tab.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
all and show speech bubbles without names). Since a checkbox won't work
any more for all of these modes, it's now a slider.
Signed-off-by: Ira Rice <irarice@gmail.com>
|