Age | Commit message (Collapse) | Author | Files | Lines |
|
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
|
|
|
|
|
|
Also added the update copyright tool from the Wormux Team.
( And not forgetting credit's due. :P )
|
|
Also remove some extra new lines and fix eAthena's PartyTab define guards.
|
|
Moved remaining widgets into widgets folder, standardized include order, moved TextRenderer out.
|
|
|
|
Also some related chenges elsewhere
|
|
|
|
Trying to use the same kind of capitalization and interpunctuation
for various parts of the gui, melding a few split strings, updating
POTFILES.in and adding translators' notes.
|
|
taller grab point.
|
|
Better than cancelling the trade. Fixed Mantis 800.
|
|
|
|
Just a few notes that would help us translators immensly:
* Please do not split one sentence into several strings
* Please try to refrain from inserting extra spaces into the strings
|
|
|
|
|
|
We don't use underscores in the filenames generally, and let's be
consistent on that matter.
|
|
|
|
Remove forgotten debug information on the GUI
|
|
Handler & GUI modification, to make the three steps systems working.
Protocol changes for the same reason
Player.cpp changes because it uses the cancel method which signature has changed
|
|
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
|
|
|
|
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 namespace both Player- and TradeHandlers
|
|
Also started temparary implementation of the Net::getXHandler() methods
and started using them.
|
|
On eAthena you can only trade up to 10 items at a time. For now I don't
care whether tmwserv would handle more, we'll unify that later. It's not
so nice anyway to hardcode the number of rows and columns in my opinion.
|
|
Party, skill, and trade handlers made for eAthena.
|
|
There's still an offset problem that I can't figure out.
|
|
No need to complicate the item containers and inventory classes with a
silly offset used by the eAthena server.
Also fixed the logToStandardOut option by reading it from the config
after the configuration has been initialized.
|
|
Now that messages can be sent without requiring a pointer to the
Network instance, a lot of cleanup was possible.
|
|
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
|
|
ChatTabs now manage their own adding/removal from the chat window, which
lost most of it's chat related messages. Whisper handling is stil done
by the ChatWindow, but it no longer manages any other tabs. ChannelTab
handling is now the sole responsability of the Channels they are
attached to. The general tab is handled by Game.
|
|
Mostly unsigned/signed mismatches and an unused variable.
|
|
|
|
Conflicts:
A lot of files.
|
|
Conflicts:
Many files.
|
|
Also fix several instances where the same net handler was being used for
both servers, and a few other related oddities.
|
|
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!
|
|
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>
|
|
|
|
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 string utility methods are now grouped together in the stringutils.h
header. Also, a toLower method was added for convenience.
|