Age | Commit message (Collapse) | Author | Files | Lines |
|
well as some code style cleanups in the skill dialog.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
is viewable or not, and the player doesn't exist yet.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
We should probably look into fixing the thing he's talking about.
|
|
(cherry picked from commit 69c147510bce9aa24be5ddcb3d050a5d52e3abe7)
Conflicts:
src/gui/item_amount.cpp
|
|
(cherry picked from commit 2fd5b9e2fea5f95f54e543011e2e8fb70f0b037f)
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
We should probably look into fixing the thing he's talking about.
|
|
(cherry picked from commit 69c147510bce9aa24be5ddcb3d050a5d52e3abe7)
Conflicts:
src/gui/item_amount.cpp
|
|
(cherry picked from commit 2fd5b9e2fea5f95f54e543011e2e8fb70f0b037f)
|
|
upper levels.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
the shortcut window.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
the new shortcut windows to the reset shortcut window.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
the time (and it might be added back in the future), it requires a
bit of a change to the window code to fix (not too hard) and its own custom
click handler (again, not that hard). Done for the sake of avoiding
too much redundancy.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
placed in checks for bogus amounts of experience, and correct them).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|
|
|
|
|
|
Conflicts:
src/gui/smileycontainer.cpp
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Most strings are now translatable. Please do report any missing ones.
Strings excluded from translation are anything that gets written to the
log file or is otherwise not shown in the GUI.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
All is done, and all files are now in the tree.
(ok, copyright of new files is still opened... do as you want, if you
care)
Signed-off-by: Forge <jgrimbert@free.fr>
|
|
They were once meant for doing layout, but never used and the way
they're implemented they would be relayouting with every draw, which
isn't really nice.
|
|
Most strings are now translatable. Please do report any missing ones.
Strings excluded from translation are anything that gets written to the
log file or is otherwise not shown in the GUI.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
They were once meant for doing layout, but never used and the way
they're implemented they would be relayouting with every draw, which
isn't really nice.
|
|
Based on the layout from the mainline client done by Guillaume Melquiond
in commits aab0b1724897e186d2d4056da7f0cd34ccc12fcb and
97bbe57e21a28544646da087e2a522390bf2ce5c.
Fixes hidden Ok button on many translations.
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
(cherry picked from commit cb04d148c9aed572fe6e66313100e2cd9b66f5d5)
Conflicts:
src/gui/chat.cpp
|
|
(cherry picked from commit cb04d148c9aed572fe6e66313100e2cd9b66f5d5)
Conflicts:
src/gui/chat.cpp
|
|
|
|
(cherry picked from commit 82182aeb9eacb3a6e10e34b34b46ef63222ecd7d)
|
|
Conflicts:
src/Makefile.am
src/game.cpp
src/gui/browserbox.cpp
src/gui/gui.cpp
src/gui/textfield.cpp
src/main.cpp
(cherry picked from mainline commit 7b67e852086ad3ccd98a622f890b245ab6a0a321)
|
|
(changes by Guillaume Melquiond, merged from the mainline client)
|
|
|
|
(cherry picked from commit 82182aeb9eacb3a6e10e34b34b46ef63222ecd7d)
|
|
Conflicts:
src/Makefile.am
src/game.cpp
src/gui/browserbox.cpp
src/gui/gui.cpp
src/gui/textfield.cpp
src/main.cpp
(cherry picked from mainline commit 7b67e852086ad3ccd98a622f890b245ab6a0a321)
|
|
They were not explicitly set to black. Because the bitmap font used to
be black, these bugs didn't show up earlier. With the introduction of
true type fonts, the text can be any color anywhere.
|
|
(changes by Guillaume Melquiond, merged from the mainline client)
|
|
Also fixed login dialog layout. This is the layout handler by Guillaume
Melquiond, which he started in commit 59472ef68fdef3f7e8858a81a46e28c127119c58.
|
|
Merged from the mainline client. Originally implemented by Guillaume
Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91.
Conflicts:
INSTALL
configure.ac
src/Makefile.am
src/gui/buy.cpp
src/gui/confirm_dialog.cpp
src/gui/inventorywindow.cpp
src/gui/login.cpp
src/gui/menuwindow.cpp
src/gui/minimap.cpp
src/gui/ok_dialog.cpp
src/gui/popupmenu.cpp
src/gui/register.cpp
src/gui/sell.cpp
src/gui/setup.cpp
src/gui/setup_video.cpp
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Also fixed login dialog layout. This is the layout handler by Guillaume
Melquiond, which he started in commit 59472ef68fdef3f7e8858a81a46e28c127119c58.
|
|
Merged from the mainline client. Originally implemented by Guillaume
Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91.
|
|
fixed a few compiler warnings noticed from building in windows.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
The font was interpreting the strings as UTF8, as they are in the
mainline client. But in the eAthena client they are regular text.
|
|
on the screen.
(cherry picked from mainline commit 483c76d1b2433bc34f67406a10bf409fb2daafe1)
|
|
(cherry picked from mainline commit 0962fc8b567279a6e97e13e4b3f2f9f2ffe304c0)
|