| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
|
|
Mainly avoid all the convertions from integer to float and then to
string and also back from string to float and then to integer.
|
|
Don't force an FPS limit when people don't want it. Just default to
limit on 60 fps instead, but do allow it to be disabled.
This reverts part of commit 4b7755fcae0de15951c508ec034158007c8b6cf3.
|
|
|
|
|
|
All instances of version strings should now use the same text. The
version label was moved from main.cpp to Desktop. A new version label
was added to SetupDialog to make it easier to get the version if you are
already in game.
|
|
Abstracts it away and out of main.cpp and register.cpp.
|
|
|
|
A container that deletes all its children on destruction doesn't have to
be so complicated. Also renamed it to simply Container, since I think it
should simply be default behavior.
WindowContainer and Popup classes now inherit from this Container.
|
|
Cleans up main.cpp a little.
|
|
Unused variable, compiler suggested braces to disambiguate an else
statement and another comparision between signed and unsigned integers.
|
|
|
|
|
|
Also some cleanup in main.cpp
|
|
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 make Net::LogoutHandler
|
|
|
|
Also cleanup character creation, which isn't functional at the moment.
|
|
|
|
Also add ping to MapHandler and fill in eAthena's MapHandler's connect
method.
|
|
Map, chat, and admin have been finished (to the degree they handle all
existing cases).
|
|
|
|
|
|
It doesn't make much sense to combine the update host with the server
port. Either use the update host (and path) or the server and its port.
To me it makes more sense that if different servers share the same
update host, this data should be shared by the client.
Ultimately we should store the updates by their hash, so that we can
stick everything in the same place and avoid storing any duplicates.
|
|
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.
|
|
|
|
Command line parameters were being overridden by old configuration
settings.
|
|
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
|
|
Also dynamically calculated the size of the array, so that you don't
have to count the messages manually. :P
|
|
dfcc6397848d4597b386b688f689352de6c19ae2
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
Mostly putting & and * in the right place and making some getters const.
|
|
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!
|
|
|
|
framerates in OpenGL even on older hardware, this should be done to
conserve on CPU usage, rather than stressing it with more frames than
the monitor can render.
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>
|
|
The internal storage for colors was in the file color.h/color.cpp. It
mainly managed the colors in the chat.
The Color class was extended to be more generic now and it stores
gcn::Color objects instead of integers now. A lot of new colortypes are
now available, though not many of them are used for now, that will come
in the next patches.
The Color class was renamed to Palette and color.{h,cpp} to
palette.{h,cpp} to better describe its purpose.
The color config gui now lists the new colors, even changes them, but the
result is not displayed properly for now.
|
|
The internal storage for colors was in the file color.h/color.cpp. It
mainly managed the colors in the chat.
The Color class was extended to be more generic now and it stores
gcn::Color objects instead of integers now. A lot of new colortypes are
now available, though not many of them are used for now, that will come
in the next patches.
The Color class was renamed to Palette and color.{h,cpp} to
palette.{h,cpp} to better describe its purpose.
The color config gui now lists the new colors, even changes them, but the
result is not displayed properly for now.
|
|
from TMW broke this, as it deleted the Being::load() method, which also
loaded the hair styles). Also removed some unused variables in the being
class.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|
