summaryrefslogtreecommitdiff
path: root/src/gui/emoteshortcutcontainer.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer1-1/+2
Conflicts: Many files.
2009-03-14Got rid of two direct references to the color black. These now alwaysIra Rice1-1/+2
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>
2009-03-12Move emote sprite loading into EmoteDBJared Adams1-2/+2
2009-03-12Move emote sprite loading into EmoteDBJared Adams1-2/+2
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer1-19/+15
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
2009-03-05Made some optimizations based on some profiling done by Octalot, as wellIra Rice1-19/+15
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>
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer1-1/+1
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice1-1/+2
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Fixed up the copyright headersBjørn Lindeijer1-17/+17
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.
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer1-2/+11
Conflicts: A lot of files...
2009-02-09Fixed up the copyright headersBjørn Lindeijer1-17/+17
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.
2009-01-30Exposed most gui elements to take alpha values. There are still a fewIra Rice1-2/+11
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>
2009-01-16Candidate release for 0.0.27.1 (Windows needs to get colors fixed, andIra Rice1-2/+0
then this build might be official) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-16Fixed a potential crash when the emotes aren't loaded, or there are lessIra Rice1-1/+1
than 12 emotes. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-16Made emotes load in only one location, as well as fixing the code on theIra Rice1-8/+1
being so that the last emote draws (which got broken). Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-15Added emote database, which is loosely based off of the NPC database.Ira Rice1-15/+27
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>
2009-01-12Some code style cleanups, as well as uncommented the font setting forIra Rice1-1/+1
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>
2009-01-12Some rather pedantic changes. Unified all naming for emoticons in theIra Rice1-0/+192
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>