Age | Commit message (Collapse) | Author | Files | Lines |
|
It was a list of pointers to Stat instances that had long been popped
off the stack and deleted.
|
|
negative items, since these aren't inventory items.
Signed-off-by: Tametomo <irarice@gmail.com>
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
The popup is meant to be temporary, showing the emote instantly when you
click on it. It adapts nicely to show any number of emotes.
I still need to add a better way of assigning emote shortcuts, since
currently you can only change which emote is assigned to which shortcut
by actually using it.
|
|
Warnings were about initialization order and signed variables compared
to unsigned variables. Please pay attention to these things.
Also made some getters const and turned some std::string parameters into
const std::string &.
|
|
|
|
|
|
|
|
Nothing in particular worth mentioning.
|
|
error when it fails.
|
|
|
|
|
|
|
|
|
|
Shouldn't affect performance.
|
|
Cleans up main.cpp a little.
|
|
Mainly to conform better with coding conventions.
|
|
Plus some random cleanups.
|
|
Unused variable, compiler suggested braces to disambiguate an else
statement and another comparision between signed and unsigned integers.
|
|
|
|
There is a rare segfault between this and the next logging statement, I
think it's a bad map name. This will help test that.
|
|
|
|
|
|
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
|
|
1715d0afe44a282a356ca88e47c92ec556f094dd
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
This class would store the buddy list in a file on the client, which is
really not that useful.
It was removed before in d268447e18c6e3edd80658f8f8d4317740c33af9, but
apprently had come back with the merge with mainline.
|
|
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 removal of branding for tmwserv related files, as was done for
the eAthena client before.
|
|
Mostly putting & and * in the right place and making some getters const.
|
|
Conflicts:
.mailmap
|
|
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>
|
|
|
|
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!
|
|
the open source project Wormux. To improve SDL performance, the number
of layers that are pushed out to the hardware or software buffers should
be reduced, which is where this function comes into play, as it combines
two surfaces together so that the number of blit operations is reduced.
This function is currently not used, but will be used once a good way to
link each of the target systems is determined so that it only initiates
when SDL is enabled, as well as making sure that each hook that uses
this function is benefiting from it sufficiently. At the moment, it's
suspected that the particle engine will likely be the most likely to
benefit from this function, followed by tile drawing, then sprite drawing.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Having two classes called Palette makes the program crash,
when compiled without optimisation.
|
|
Cherry-picking changes from Bjørn's 1b3cb122be1a418ce82b66fb9ce1ecf3aa5813fb
Mainly making sure 'const std::string &' is used everywhere instead of
'std::string const &'. The former has always been the preferred order in
this project.
|
|
|
|
|
|
ItemDB. This helps reduce the junk logging for the player and hair
sprites.
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
|
|
constant, particle attacks are now weapon specific, so that different
weapons can have different attacks.
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.
|
|
The string utility methods are now grouped together in the stringutils.h
header. Also, a toLower method was added for convenience.
|
|
When not passing any parameters to constructors, there is no reason for
using parenthesis.
|
|
Conflicts:
CMakeLists.txt
configure.ac
data/help/header.txt
packaging/windows/setup.nsi
po/POTFILES.in
src/being.cpp
src/being.h
src/game.cpp
src/gui/color.cpp
src/gui/color.h
src/gui/equipmentwindow.h
src/gui/popupmenu.cpp
src/gui/recorder.cpp
src/gui/setup_colors.h
src/gui/setup_keyboard.cpp
src/gui/setup_keyboard.h
src/gui/skill.cpp
src/gui/speechbubble.cpp
src/gui/speechbubble.h
src/gui/table.cpp
src/keyboardconfig.cpp
src/keyboardconfig.h
src/localplayer.cpp
src/main.cpp
src/main.h
src/map.cpp
src/resources/colordb.cpp
src/resources/colordb.h
src/resources/emotedb.cpp
src/resources/emotedb.h
src/text.cpp
src/text.h
src/tmw.rc
src/winver.h
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Legends of Mazzeroth.
Signed-off-by: Ira Rice <irarice@gmail.com>
|