| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
|
|
In commit 2a9f8e05312c210ec204e09861f47c3d017706eb I meant to move the
normalizing of item names into the database, but the commit failed to
include this change.
|
|
Conflicts:
src/gui/widgets/chattab.cpp
|
|
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
(cherry picked from commit 9712489ef67f95d6a5fa1fc3102bb7c4ee6a1f59)
|
|
The crash was due to an assertion which shouldn't have been there, so I
removed the assertion instead. I've also made sure the unknown item has
its id initialized to 0, so that it can be used to check against instead
of the item name.
Normalization of item names was moved within the item database.
|
|
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
|
|
Tried to make the client continue attacking (it does not need to send
attack packets, but just continue playing attack animation and sounds).
Now logs a warning when a weapon is found without an attack-range (I
keep finding weapons with an attack-range of 0 which makes it hard to
target monsters).
|
|
There is no need to separate these projects more than necessary. Also
fixed a bug that made the hair always white.
(cherry picked from commit e0eeaef318d63ae79522c1d0407e4f5b8212c5f7)
|
|
(cherry picked from commit b0475c40bb256107aa13919b8d020b172af9d788)
|
|
There is no need to separate these projects more than necessary. Also
fixed a bug that made the hair always white.
|
|
|
|
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.
|
