Age | Commit message (Collapse) | Author | Files | Lines |
|
Conflicts:
data/graphics/CMakeLists.txt
data/graphics/Makefile.am
src/client.cpp
|
|
Reviewed-by: Bertram
Resolve: Manasource Mantis #143
|
|
|
|
Themes can now control the colors they use. Colors in the Viewport (being
names, particles, etc) can still be changed by the user. Also make
ProgressBars more easily colored. DyePalette was made more flexible in the
process.
Also fixes comparing strings of different lengths insensitively.
Reviewed-by: Thorbjørn Lindeijer
|
|
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
|
|
|
|
Reviewed-by: Jared Adams
|
|
With CMakeLists.txt adaptions from the Aethyra project.
Reviewed-by: Bernd Wachter
Reviewed-by: Jared Adams
|
|
Reviewed-by: Jared Adams
|
|
Reviewed-by: Thorbjørn Lindeijer
|
|
Reviewed-by: Jared Adams
|
|
Fix "(C) 2009-2009" to just "(C) 2009"
Fix "(C) 2010 TMW" to "(C) 2010 Mana"
Remove TMW compyright on (hopefully all) files added after 0.0.29.1
|
|
|
|
|
|
Also added the update copyright tool from the Wormux Team.
( And not forgetting credit's due. :P )
|
|
|
|
|
|
|
|
|
|
|
|
This will decrease warnings in the log file by a good bit
|
|
|
|
download music optionally
I had to edit the XML wrapper a bit, basicilly its constructor can now take a optional
thrid arguement which will tell it to use a resman or open the file directly
Also I added fallback support for the old resouce2.txt so servers don't have to
upgrade if they do not want to
|
|
With the changed __attribute__ it compiles now without warnings
on gcc 4.4.0. For other compiler this should work too, because
this format is already used for log() in log.h.
|
|
|
|
|
|
Better for future use.
|
|
Since it isn't generated on all platforms or by all build systems.
Problem reported by Aard.
|
|
|
|
|
|
format once again. This was originally reverted because it caused a
regression on Windows, but not Linux, which was later found out to be
because there's a Linux kernel function which will convert hex strings
into an integer format, while Windows doesn't share the same luxury. So,
to avoid any issues, this commit adds an atox (ascii to hex) string
utility, and uses it when parsing hex strings for colors from the
configuration file. Also ensured that people who have colors saved in
the old, raw integer format can get their colors converted to hex
values.
Signed-off-by: Tametomo <irarice@gmail.com>
Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
|
|
A function call could be quite a large overhead on top of a fast square
root function.
|
|
* Setup menu now has settings for the HP bar colors.
* StatusWindow handles HP bar changes a little more consistently.
* Fixed a bug that cut weightedAverage values in half, making the
HP bar very dark.
|
|
|
|
It has fast(inv)sqrt and weightedAverage.
Also cleanup the last ocmmit a bit.
|
|
|
|
|
|
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.
|
|
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 string utility methods are now grouped together in the stringutils.h
header. Also, a toLower method was added for convenience.
|
|
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
|
|
useful since buddy lists are tracked through the player relation
interface instead)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Conflicts:
A lot of files...
|
|
Conflicts:
Almost everywhere.
|
|
(merged from eAthena client)
|
|
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
include anything not needed by that specific widget or window. This
appears to have cleaned up system performance a bit on my current setup,
where it went from idling on 45% in game with opengl down to 30% now.
Also moved iptostring to the tostring header, as importing all of
network.h is a little overkill to use that function, and it goes along
with the basic functions that are in that header file anyways. TODO:
find out a way to get rid of warnings when a class doesn't use this
function.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
|
|
|