Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
|
|
This dates back to the old days of TMW, but the usage instructions of
GPLv2 don't mention this being necessary. Since it doesn't add anything,
avoid the branding in these sections.
|
|
|
|
|
|
use the layout engine.
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from Aethyra commit fa007dafa2c499425e7112095cbda9c2ff5ea20c)
Conflicts:
src/gui/debugwindow.cpp
|
|
(cherry picked from mainline commit 2a7c63f6070606e6623a9730aa1ca9d52c942055)
|
|
|
|
|
|
|
|
Also don't set "The Mana World" to start with.
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from Aethyra commit d2b804c1a817ccdd85b4b1220bf929e9d370d774)
Conflicts:
src/game.cpp
src/gui/inttextfield.cpp
src/gui/item_amount.cpp
src/gui/textfield.h
|
|
In order to stay consistent with the video setup page.
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from Aethyra commit adfa6fa21b1ef5c8169538ca5c4896bf86e59d6a)
Conflicts:
src/gui/setup_audio.cpp
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from commit e3f05299f81cd2e567531df6729de0f34970a9e9)
Conflicts:
src/gui/setup_joystick.cpp
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from commit 18c00fedebda79d4ebfbe15401c3e5bc8869fda2)
Conflicts:
src/gui/setup_players.cpp
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
(cherry picked from commit 8f28b18a31fc8415fbf6aedc5106b8b8525f4caf)
Conflicts:
src/gui/setup_keyboard.cpp
src/gui/setup_video.cpp
|
|
Introduced a LayoutHelper class which can be used for any non-Window
container where you want to use a layout to place child widgets.
|
|
|
|
that I would like some praxis-oriented testing of the animation system before the release).
|
|
The dialog looks nicer now and the layout problems when the dialog is
translated have been fixed.
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
|
|
|
|
|
|
Changes mostly done by David Athay.
Currently these widgets are only used in the setup window, where they
replace the previously used TabbedContainer.
|
|
|
|
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)
|
|
|
|
|
|
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.
|
|
(cherry picked from commit cb04d148c9aed572fe6e66313100e2cd9b66f5d5)
Conflicts:
src/gui/chat.cpp
|
|
As on 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.
|
|
Put object files in subdirectories. Moved compilation flags to configure
script. Added library header checks.
(cherry picked from mainline commit 0bebbc320d50178a7ece573319cd6687a950dafa)
|
|
(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
|
|
|
|
|