| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
|
|
Guild will no longer show for eAthena builds and party will only show if
you are in a party.
|
|
And make a few others like that, and remove them too.
|
|
|
|
This also fixes some minor bugs and centralizes some logic.
|
|
|
|
|
|
We don't use underscores in the filenames generally, and let's be
consistent on that matter.
|
|
|
|
TextBoxes in ScrollAreas, but never needed to scroll (and disabled both
the horizontal and vertical scrollbars, which makes using a scrollarea
kind of pointless to begin with).
Signed-off-by: Ira Rice <irarice@gmail.com>
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
It's a natural better fit. The SkinLoader was changed into a singleton,
since it's used by both Window and Popup classes.
|
|
|
|
Generally, it's good to tack on this tag onto nearly everything, but for
popup options, it looks a tad tacky.
Signed-off-by: Tametomo <irarice@gmail.com>
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
Signed-off-by: Tametomo <irarice@gmail.com>
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
|
|
|
|
|
|
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.
|
|
|
|
be fixed.
|
|
Also expand aAthena's AdminHandler
|
|
|
|
Also cleanup some related #ifdefs in LocalPlayer.
|
|
|
|
Now the instance doesn't need to be passed into the MessageOut class
anymore. Expect a lot of cleanup in the next commit.
|
|
Resizing of the inventory window may come back later. Also did some more
code cleanups, moving defines to enums, getting rid of eAthena-specific
offset handling (to be done in the network layer), etc.
Mantis-issue: 666
|
|
Conflicts:
src/beingmanager.cpp
src/gui/confirm_dialog.cpp
src/gui/inventorywindow.cpp
src/gui/inventorywindow.h
src/gui/label.cpp
src/gui/label.h
src/gui/popup.cpp
src/gui/popup.h
src/gui/scrollarea.cpp
src/gui/skin.cpp
src/gui/skin.h
src/gui/speechbubble.cpp
src/gui/window.cpp
src/gui/window.h
src/localplayer.h
src/main.cpp
src/net/ea/playerhandler.cpp
src/resources/ambientoverlay.h
src/resources/dye.cpp
src/resources/imagewriter.cpp
src/resources/itemdb.cpp
src/shopitem.cpp
|
|
There is also a new rule that trivial constructors and destructors
should no longer be trivially "documented", since this just takes up
space with no gain.
|
|
Mostly putting & and * in the right place and making some getters const.
|
|
Conflicts:
A lot of files.
|
|
start with collision or fringe, instead of being required to be the
same case throughout the beginning of the layer name.
Also made a default name for popup menus so that their skins can also be
changed by users.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
modified the skin loading method to take a default value, in case the
value in the configuration file fails to load for one reason or another.
While this doesn't directly expose skinning on a per window basis to the
user at the moment, it does allow people to change what skins get loaded
with which windows now without needing to modify the code.
TODO: Determine a decent approach to allowing the user to change their
window skins in game, as well as moving all widget skin loading to the
skin class (for instance, the button skins, progressbar skins, etc.) so
that different skin configurations can use different widget skins.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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!
|
|
Window class, but stripped down to the bare essential functionality to
just draw and position them. This means no resizing, no close buttons,
no ability to move them, etc. This should help reduce the overhead in
drawing speech bubbles, as well as other popup type dialogs, but is also
not a drop in replacement for the Window class as well.
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
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Using unsigned rarely makes sense, especially when the server doesn't
use it either. Other uses of unsigned should be reviewed.
In all other cases, int is the fastest integer type on any architecture.
Using 8 or 16 bits can basically only be a memory optimization.
|
|
When not passing any parameters to constructors, there is no reason for
using parenthesis.
|
|
Sometimes it's nice for clarity, but most of the time this is just
clutter. C++ != Java. :)
|
|
useful since buddy lists are tracked through the player relation
interface instead)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Sometimes it's nice for clarity, but most of the time this is just
clutter. C++ != Java. :)
|
|
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(".
|
|
Conflicts:
Almost everywhere.
|
|
(merged from eAthena client)
|
|
of the item link shown. This should help make it easier for people to
represent the square brackets with item links, and prevent people from
forging item links when they never see the internal representation of an
item link. Should also reduce confusion from people who haven't upgraded
their clients as well, as they wonder what all the junk is around the
item name.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
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>
|
|
item popups, this is no longer useful, as well as it never doing
anything to begin with.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
