Age | Commit message (Collapse) | Author | Files | Lines |
|
Also some other small merges
|
|
|
|
I am able to compile against tmwserv with this mini fix, but I am quite
unsure what the code is supposed to look like.
|
|
|
|
|
|
Signed-off-by: Tametomo <irarice@gmail.com>
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
Gives the actual number of items to the moveItem method.
Fix compilation problem for twmserv client compilation.
|
|
|
|
|
|
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.
|
|
Replaced many gcn::Label with Label, gcn::Slider with Slider in
character creation dialog. Also cleaned up includes.
|
|
Mostly removal of branding for tmwserv related files, as was done for
the eAthena client before.
|
|
Conflicts:
A lot of 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!
|