Age | Commit message (Collapse) | Author | Files | Lines |
|
Reviewed-by: Bertram
|
|
Reviewed-by: Jared Adams
|
|
Reviewed-by: Jared Adams
|
|
This moves inventory/storage type into the Inventory class, having
size default to a call to the netcode to get the sive for the given
type.
Reviewed-by: Chuck Miller
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
|
|
Reviewed-by: Chuck Miller
|
|
|
|
Themes can now control the colors they use. Colors in the Viewport (being
names, particles, etc) can still be changed by the user. Also make
ProgressBars more easily colored. DyePalette was made more flexible in the
process.
Also fixes comparing strings of different lengths insensitively.
Reviewed-by: Thorbjørn Lindeijer
|
|
Also make storage under eAthena more flexible.
Reviewed-by: Dennis Friis
|
|
|
|
|
|
Also added the update copyright tool from the Wormux Team.
( And not forgetting credit's due. :P )
|
|
Autostore is a feature that allow you a fast store-retreive by pressing
emote key and clicking on the object you want to move. All the stack will be
moved that way.
|
|
Moved remaining widgets into widgets folder, standardized include order, moved TextRenderer out.
|
|
|
|
|
|
|
|
Conflicts:
src/gui/widgets/chattab.cpp
|
|
|
|
- Moved the outfit button onto the Inventory window
- Fixed 'unequip first' saving bug
Patch by QOAL
|
|
And make a few others like that, and remove them too.
|
|
Signed-off-by: Tametomo <irarice@gmail.com>
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
Increased their pixel y coordinate by half a tile, to make them draw
between the fringe and the beings.
|
|
Also fixed the progress bar during connecting to reset again when full,
by disabling the smooth updating there.
The ProgressBar now uses gcn::Color instead of three separate color
attributes.
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
This is instead of taking a fixed number of rows and columns. The
inventory and trade window are now resizable again.
Other smaller changes:
* Don't use bold font for the labels in the item container
* Changed "(Eq)" back to "Eq."
* Removed the ugly grid lines
|
|
Also removed some unnecessary delete statements, since the Popup class
already deletes its children and the ScrollArea already deletes its
content.
|
|
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.
|
|
Also cleanup some related #ifdefs in LocalPlayer.
|
|
Was broken due to tmwserv having only 50 as opposed to 100 places in the
inventory at the moment.
|
|
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
|
|
done in certain statements, rearranging arguements to make them look
cleaner, or overall making the code slightly more flexible)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
dfcc6397848d4597b386b688f689352de6c19ae2
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
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!
|
|
their guis are similarly laid out.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
the palette colors. While technically, this can be accomplished through
other means, it's rather clumsy overall, and is prone to introducing in
programmer errors.
This commit finally catches every case where text is used, and applies
the text color from the color dialog to each of them appropriately.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
that position. This makes it so that when resolutions are changed, the
default locations stay relative to the window's position, and not the
800x600 screen resolution.
Signed-off-by: Ira Rice <irarice@gmail.com>
|