Age | Commit message (Collapse) | Author | Files | Lines |
|
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>
|
|
Changes mostly done by David Athay.
Currently these widgets are only used in the setup window, where they
replace the previously used TabbedContainer.
|
|
the function names should no longer be around.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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>
|
|
the emote shortcut window (which I meant to test before committing.
Don't remove this line, as text drawing behavior is rather crazy
without it).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
code so that only one term is used everywhere (to simplify
maintainability), as well as corrected several variable names and
comments where there was copy/pasted code, but it wasn't corrected. Also
moved emote shortcuts back to where they were originally, to reduce
player confusion when the next build comes around.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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>
|
|
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>
|
|
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>
|
|
the setup button was created )
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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>
|
|
The copyright issue is left opened, all other items on the TODO list
have been done.
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.
|
|
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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
|
|
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)
|
|
(changes by Guillaume Melquiond, merged from the mainline client)
|
|
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.
|