Age | Commit message (Collapse) | Author | Files | Lines |
|
Conflicts:
Many files.
|
|
pull from the stored text color. This should help in situations in which
the user has their own custom skin in the future, and needs to adjust
text colors to be more friendly to a darker skin.
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
|
|
as some other optimizations that I could see that cut down on some
unneeded redraws, which in turn improved frame rates slightly.
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.
|
|
useful since buddy lists are tracked through the player relation
interface instead)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Decision is to go with exact authors when some file is basically done by
one person, and in most other cases assign TMW or Aethyra team copyright
when multiple people from those teams have been involved.
Also, the first summary line should now contain the subset of
functionality that the file is part of, not the name of the whole
project.
|
|
Conflicts:
A lot of files...
|
|
Decision is to go with exact authors when some file is basically done by
one person, and in most other cases assign TMW or Aethyra team copyright
when multiple people from those teams have been involved.
Also, the first summary line should now contain the subset of
functionality that the file is part of, not the name of the whole
project.
|
|
spots that could also be fixed up as well, but require other methods to
fix them (the filled color rectangles on the progress bars, as well as
the text on them as well, as an example).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
then this build might be official)
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
than 12 emotes.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
being so that the last emote draws (which got broken).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
Also changed all emotes to be animated sprites now, and to load from
emotes.xml. This gives us a bit more flexibility to not only add more
emotes in the future, but allowing them to be animated as well.
NOTE: This commit, unlike the previous emote commits, breaks emotes if
you don't have the xml file. This will be available on Aethyra soon, but
is not rolled into an update at the moment.
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
the emote shortcut window (which I meant to test before committing.
Don't remove this line, as text drawing behavior is rather crazy
without it).
Signed-off-by: Ira Rice <irarice@gmail.com>
|
|
code so that only one term is used everywhere (to simplify
maintainability), as well as corrected several variable names and
comments where there was copy/pasted code, but it wasn't corrected. Also
moved emote shortcuts back to where they were originally, to reduce
player confusion when the next build comes around.
Signed-off-by: Ira Rice <irarice@gmail.com>
|