Age | Commit message (Collapse) | Author | Files | Lines |
|
(cherry picked from mainline commit 89a1dcb59be3e531cc0761c32d1aa70e141d4a12)
|
|
(cherry-picked from mainline)
|
|
the inbuilt GUIChan TrueType class. (Didn't use it originally because I
didn't see the difference, when there's a considerable speedup, and that
originally the import for TMW was broken code at the time, which has
been fixed since.)
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
why. :P)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Also fixed overlap between description label and the buttons and added the
SDL_ttf library to the Code::Blocks project file.
|
|
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97)
Conflicts:
src/net/beinghandler.cpp
src/net/charserverhandler.cpp
src/player.cpp
src/player.h
|
|
(cherry picked from mainline commit ecabe82d8720689905a6d035b0597d97037287c7)
Conflicts:
src/gui/browserbox.cpp
|
|
(cherry picked from mainline commit ecabe82d8720689905a6d035b0597d97037287c7)
Conflicts:
src/gui/browserbox.cpp
|
|
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97)
Conflicts:
src/net/beinghandler.cpp
src/net/charserverhandler.cpp
src/player.cpp
src/player.h
|
|
|
|
|
|
|
|
The font was interpreting the strings as UTF8, as they are in the
mainline client. But in the eAthena client they are regular text.
|
|
(cherry picked from mainline commit 8d1299338e033e1de539dae36856e365855fabc1)
Conflicts:
src/gui/gui.cpp
|
|
Mainly making sure 'const std::string &' is used everywhere instead of
'std::string const &'. The former has always been the preferred order in
this project.
(cherry picked from mainline)
|
|
TODO list of 1.9 still intact.
|
|
The window listing the smiley is ok (F11).
The window for shortcut of smiley is in progress (F12)
So far, you can use any available smiley directly (mouse interface)
and can get a reminder of the keybinding in the shortcut window.
Yet to be done (for final step 2.0):
* Transform the keybinding into the actual mapping of the shortcut seen in
F12
* Drag & Drop from F11 to F12 windows and from F12 to F12
* Code factorisation for class ShortcutContainer and derivatives Item &
Smiley (so far, most code is shared, but actually in 3 places, should
keep only specific code in leaf-class, and main code in parent)
Revision of copyright message (so far, only a cut-paste of inspiring
previous files)
* Save shortcut-smiley mapping on exit (and reload on start)
(with protection against changing smiley-list)
|
|
Noticed by QOAL
|
|
|
|
Also fixed overlap between description label and the buttons and added the
SDL_ttf library to the Code::Blocks project file.
|
|
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
class.
NOTE: This commit adds a brand new dependency (SDL_TTF). Make sure to
install it, regenerate your config files, reconfigure, and then install
before attempting to compile.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
on the screen.
(cherry picked from mainline commit 483c76d1b2433bc34f67406a10bf409fb2daafe1)
|
|
(cherry picked from mainline commit 0962fc8b567279a6e97e13e4b3f2f9f2ffe304c0)
|
|
(cherry picked from mainline commit 89a1dcb59be3e531cc0761c32d1aa70e141d4a12)
|
|
(cherry-picked from mainline)
|
|
|
|
(cherry-picked from mainline)
|
|
white for wallpapers (matches our wallpapers better), and fixed the
effect manager.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
check in the ColorDB.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
(cherry picked from eathena client repository,
commits 88af5cb15a02a26f4a5990ba3ef4df46e572bff4,
19ee623c0a1fdd333ef5b945ea887c983c829b1e,
f924885ea0db5842b080610ec63e61a4bcc2a30c)
Conflicts:
src/gui/itemshortcutwindow.cpp
src/gui/window.cpp
|
|
Still used in the eAthena client and it seems saner to me to have it.
|
|
Mainly making sure 'const std::string &' is used everywhere instead of
'std::string const &'. The former has always been the preferred order in
this project.
|
|
Scrolling is now a bit less lazy and the scroll radius is 0. In my
opinion this is a better default.
Framerate limiter is now off by default, since it makes the game appear
a bit choppy. It's basically only useful for laptops anyway, and not too
hard to find.
(cherry picked from eAthena branch,
commit c56bc78b5f5676784265dff8ed5334884e8dcc39)
Conflicts:
src/main.cpp
|
|
The default window sizes were all too small, since they were specified
in content size. On pressing "Reset Windows", the sizes would be
interpreted as such and apply alright.
The inconsistency is now removed, and the default window sizes are
always the size of the whole widget now, not just the contents.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
(cherry picked from eAthena branch,
commit 72f5288682f46af1f7c04c002172178c880e060b)
Conflicts:
src/gui/chat.cpp
src/gui/equipmentwindow.cpp
src/gui/inventorywindow.cpp
src/gui/ministatus.cpp
src/gui/setup.cpp
src/gui/skill.cpp
src/gui/trade.cpp
src/gui/window.cpp
|
|
Won't be introduced based on eAthena anyway, I think even with tmwserv
we have different plans now.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
(cherry picked from eAthena branch, commit
bab09df7a8347f39221b2a87487dcd128a686def)
Conflicts:
src/game.cpp
|
|
The ChargeDialog was removed. This class was long dead anyway.
(cherry picked from eAthena client commit
719e2b02bc6833198d6af2d3c95de96ef95f876d)
Conflicts:
src/CMakeLists.txt
src/Makefile.am
src/game.cpp
src/localplayer.cpp
src/localplayer.h
src/net/charserverhandler.cpp
tmw.cbp
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
Got rid of "void" in functions that take no arguments and removed the
newline after the return type of a method in many places.
|
|
it works fine in Linux without having to reinitialize the OpenGL state. Adapted
change by kraant from Aethyra.
(cherry picked from eAthena client)
|
|
(cherry picked from eAthena client)
|
|
Patch by Nikos, with some improvements.
Conflicts:
NEWS
src/gui/itemcontainer.cpp
src/itemshortcut.cpp
(cherry picked from eAthena client, not functional here yet)
|
|
Based on a patch by QOAL.
(cherry picked from eAthena client)
Conflicts:
src/gui/minimap.cpp
|
|
* Auto-detect number of hair styles available (#514)
Conflicts:
ChangeLog
src/being.cpp
src/being.h
src/gui/char_select.cpp
(cherry picked from eAthena client)
|
|
Don't treat anything starting with "Welcome" as a server message, for
example messages starting with a name that starts with "Welcome"
shouldn't belong in that category.
Put the nick in the right place for global announcements.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
|
|
Don't treat anything starting with "Welcome" as a server message, for
example messages starting with a name that starts with "Welcome"
shouldn't belong in that category.
Put the nick in the right place for global announcements.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
Won't be introduced based on eAthena anyway, I think even with tmwserv
we have different plans now.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|