Age | Commit message (Collapse) | Author | Files | Lines |
|
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
|
|
Conflicts:
po/POTFILES.in
src/main.cpp
src/main.h
tmw.cbp
|
|
|
|
|
|
Updates to German, Spanish, Finnish and Polish translations, imported
from Launchpad.
|
|
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.
|
|
|
|
|
|
Conflicts:
A lot of files...
|
|
Conflicts:
src/game.cpp
src/net/charserverhandler.cpp
src/net/loginhandler.cpp
src/net/protocol.h
|
|
Conflicts:
Almost everywhere.
|
|
be no more string changes before the next version release, which is why
I'm updating it now.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
remove the need for extensions.h in it.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
strings.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
complaint commit d2876ad85935c5d0b181d050bd4c19a4682123b1 (btw, if
you're concerned about that, return is also a bad choice for the chat
window in general, which overrides the GuiChan default for use widget.
Tab would also be a bad choice, as it cycles through the widgets), next,
I made the text displayed by the keyboard configuration setup dialog
translatable, and lastly, I exposed the rest of the previously
unconfigurable keys to be configurable through the keyboard setup tab.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
recorder over to the layout code (not that it helps much at the moment).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
"no-c-format".
|
|
"no-c-format".
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
recorder's dependence upon it. This class should get a bit more work
done to it to simplify it further, but right now, it preserves all of
the same functionality.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
merging, this commit adds back in a few of Ichigo's translations which
were lost.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Translation by Hong Hao.
|
|
|
|
New translations imported from Launchpad.
|
|
It's not supported by our TrueType font, unfortunately, which means TMW
would be unplayable on a Chinese locale by default. Maybe we can support
such languages more easily by using SDL_pango instead of SDL_ttf.
|
|
Most of it applies to us as well, thanks!
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Introduced a LayoutHelper class which can be used for any non-Window
container where you want to use a layout to place child widgets.
|
|
I hope you enjoy it, I used a LOT of hours on this baby!
Signed-off-by: GonzoDark <Gonzo.Dark@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Also changed all emotes to be animated sprites now, and to load from
emotes.xml. This gives us a bit more flexibility to not only add more
emotes in the future, but allowing them to be animated as well.
NOTE: This commit, unlike the previous emote commits, breaks emotes if
you don't have the xml file. This will be available on Aethyra soon, but
is not rolled into an update at the moment.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
the function names should no longer be around.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
that they don't require an autoreconf -i --force.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
more, as well as a few more code style fixes.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
removing emotions.png from the client data files (should have never
been there to begin with, IMO). TODO: Simplify the emote code so that
there is a lot less redundant code, as well as make filling out the
possible emotes more flexible.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|
|
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>
|
|
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>
|
|
The ones on Launchpad are still geared towards the mainline client.
These files have been updated for the eAthena client.
It will be interesting to see what happens to special characters, since
the client doesn't support unicode yet.
|
|
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>
|
|
The ones on Launchpad are still geared towards the mainline client.
These files have been updated for the eAthena client.
It will be interesting to see what happens to special characters, since
the client doesn't support unicode yet.
|
|
Merged from the mainline client. Originally implemented by Guillaume
Melquiond, starting with commit 1828eee6a6d91fd385ad1e69d93044516493aa91.
|