Age | Commit message (Collapse) | Author | Files | Lines |
|
And a Swedish translation of the desktop file.
|
|
|
|
Instead of shutting down, the client will now draw a gray background.
This allows the player to still contact a GM in order to be helped out
of the situation.
It also helps me warp out of the non-existing map I accidentally warped
myself onto. ;)
|
|
|
|
|
|
setting since this is only saved on manually setting visibility. go back to saving visibility and use sticky bit to decide if minimap should be turned off or not.
|
|
|
|
|
|
|
|
|
|
equivalent Palette color type.
Signed-off-by: Tametomo <irarice@gmail.com>
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
|
|
Also cleaned up some debug log statements, fixed initialization order,
removed an unused member variable and added some documentation.
|
|
Now the minimap can adapt every image ratio, not only 0.5 (even images
with differents width and height)
|
|
|
|
Mainly avoid all the convertions from integer to float and then to
string and also back from string to float and then to integer.
|
|
|
|
The Minimap window uses this so you can froce it to always be open. The
Minimap toggle button can be used to show or hide it temporarily, as
warping will reset it's visibility based on the sticky state and weather
the 'new' map has a minimap.
|
|
The draw() method of a widget isn't called when a widget is not visible.
|
|
Also made mPx and mPy private and synchronize with mPos on
setPosition(). The side effects of setting destination and clearing the
path have been removed from setPosition(). Only the tmwserv
PlayerHandler seemed to rely on that feature.
Mantis-issue: 672
|
|
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!
|
|
as removed a redundant call for sizing in the minimap class.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
This was needed in the Minimap class, but not migrated out to the Window
class until now.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Conflicts:
src/being.cpp
src/being.h
src/floor_item.cpp
src/floor_item.h
src/flooritemmanager.cpp
src/gui/inventorywindow.cpp
src/gui/inventorywindow.h
src/gui/itemcontainer.cpp
src/gui/popupmenu.cpp
src/net/beinghandler.cpp
src/npc.cpp
|
|
as some other optimizations that I could see that cut down on some
unneeded redraws, which in turn improved frame rates slightly.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
The window name is used in the configuration file, in contrast to the
window title.
|
|
Mainly removed trailing whitespace. Also small fix in header of
recorder.cpp.
|
|
useful since buddy lists are tracked through the player relation
interface instead)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Mainly removed trailing whitespace. Also small fix in header of
recorder.cpp.
|
|
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
|
|
Conflicts:
A lot of files...
|
|
Removed tab characters and trailing spaces and added spaces between
"if(", "for(", "while(" and "switch(".
|
|
spots that could also be fixed up as well, but require other methods to
fix them (the filled color rectangles on the progress bars, as well as
the text on them as well, as an example).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
when the client was last exited.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
even when there's already a saved window configuration.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
enough to contain the map's name. Also fixed an unnoticed logic flip
that was done unintentionally. This class now manages to work
perfectly when the config file has no previous dimensional influences,
but still won't resize properly without removing the ability to resize
or getting rid of those stored configs. TODO: Find out why loading
window configuration for the default minimum width or height overrides
the Minimap's supplied dimensions it wants.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
reason, the windows will gladly shrink when resizeable, but not grow.
This will need to get resolved some time later.
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.
|
|
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>
|
|
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>
|
|
fixed a few compiler warnings noticed from building in windows.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Still used in the eAthena client and it seems saner to me to have it.
|
|
Based on a patch by QOAL.
(cherry picked from eAthena client)
Conflicts:
src/gui/minimap.cpp
|
|
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|