Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
default locale.
Spotted by Ali-G.
Reviewed-by: Ablu.
|
|
To make room for the interface tab
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
Added an 'Interface' tab for the items that seemed to fit better
there than in 'Video'.
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
|
|
|
|
Also added the update copyright tool from the Wormux Team.
( And not forgetting credit's due. :P )
|
|
|
|
Mantis-issue: 697
|
|
Video and player setup pages now look a bit better when translated or
when the font size is increased.
|
|
We really should considering adding a new tab, the video window is getting pretty full
|
|
The popup is meant to be temporary, showing the emote instantly when you
click on it. It adapts nicely to show any number of emotes.
I still need to add a better way of assigning emote shortcuts, since
currently you can only change which emote is assigned to which shortcut
by actually using it.
|
|
Also add support for the new TMWServ NPC packets
|
|
|
|
All instances of version strings should now use the same text. The
version label was moved from main.cpp to Desktop. A new version label
was added to SetupDialog to make it easier to get the version if you are
already in game.
|
|
Keeps things together in the right place and allowed writing a bit more
generic code in the Setup class.
|
|
In an attempt to make the GUI code a little more structured, basic
widgets are now put in gui/widgets. Many includes were also cleaned up.
|
|
Conflicts:
A lot of files.
|
|
Conflicts:
Many files.
|
|
This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.
In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.
Conflicts:
Everywhere!
|
|
|
|
position of the recorder, as well as fixed resetting the help window,
and exposing the buy/sell window to being resettable, as well as
remembering its previous position. All windows should now be covered by
the reset button on the setup pane.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
These windows required an external declaration to reset.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
dialog.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Rare crash is in KeyboardConfig, where the active keys array is accessed
before it's initialized. Also remove some debug prints that made it into
a previous commit.
|
|
|
|
|
|
|
|
|
|
|
|
When not passing any parameters to constructors, there is no reason for
using parenthesis.
|
|
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
|
|
|
|
useful since buddy lists are tracked through the player relation
interface instead)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
all and show speech bubbles without names). Since a checkbox won't work
any more for all of these modes, it's now a slider.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|
|
(merged from eAthena client)
|
|
include anything not needed by that specific widget or window. This
appears to have cleaned up system performance a bit on my current setup,
where it went from idling on 45% in game with opengl down to 30% now.
Also moved iptostring to the tostring header, as importing all of
network.h is a little overkill to use that function, and it goes along
with the basic functions that are in that header file anyways. TODO:
find out a way to get rid of warnings when a class doesn't use this
function.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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.
|
|
Changes mostly done by David Athay.
Currently these widgets are only used in the setup window, where they
replace the previously used TabbedContainer.
|
|
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>
|
|
the new shortcut windows to the reset shortcut window.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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 overlap between description label and the buttons and added the
SDL_ttf library to the Code::Blocks project file.
|
|
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
|
|
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>
|