summaryrefslogtreecommitdiff
path: root/src/text.cpp
AgeCommit message (Collapse)AuthorFilesLines
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer1-5/+1
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
2009-02-11Changed spelling from colour to color.Philipp Sehmisch1-5/+5
2009-02-11More capitalization fixes for 'color'Bjørn Lindeijer1-2/+2
Hopefully these are the last ones. :)
2009-02-10Changed spelling from colour to color.Philipp Sehmisch1-6/+6
2009-02-09Fixed up the copyright headersBjørn Lindeijer1-19/+21
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-4/+2
Conflicts: A lot of files...
2009-02-09Fixed up the copyright headersBjørn Lindeijer1-1/+1
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-01-27Bjørn Lindeijer1-3/+4
Conflicts: Almost everywhere.
2009-02-07Some more include cleanups.Ira Rice1-4/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-24Updated DejaVuSans ttf file, as well as adding the bolded version, whichIra Rice1-3/+3
is used in a few spots. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-24Use standard GUI font also for speech and namesBjørn Lindeijer1-10/+25
The speech bitmap font can't handle unicode, so it has now been replaced by the standard GUI font, drawn with a shadow for chat and with a full outline for names.
2009-01-24Use standard GUI font also for speech and namesBjørn Lindeijer1-10/+45
The speech bitmap font can't handle unicode, so it has now been replaced by the standard GUI font, drawn with a shadow for chat and with a full outline for names.
2009-01-24Added speech bubble background by QOALBjørn Lindeijer1-10/+61
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-2/+1
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2009-01-23Removed unnecessary references to The Mana World in code headersBjørn Lindeijer1-4/+4
This dates back to the old days of TMW, but the usage instructions of GPLv2 don't mention this being necessary. Since it doesn't add anything, avoid the branding in these sections.
2008-11-18Pedantic fixes to the client, where I alphabetized all of the include Ira Rice1-2/+1
statements, as well as removing the new skill dialog, which we do not, nor will we use (if we do, it'd be a new one that we'd make). WARNING!!! This, and all other previous builds have a linker error for the Gnome libraries version 4.3.2 on my setup. It's assumed that this is also the case for other users of this library as well. I'm currently assuming that there's a bug in the compiler itself, and will look into reporting this, but in the mean time, it doesn't build for these users, unfortunately. Sorry about this.
2008-11-16Got rid of CVS/Subversion $Id$ markersBjørn Lindeijer1-2/+0
I don't know why we dealt with these things for so long. Did we ever get anything out of it?
2008-10-23Fixed a crash that I caused earlier when I was fixing compiler warnings. Caused Ira Rice1-11/+0
by adding a new destructor.
2008-10-23Removed a few compiler warnings.Ira Rice1-0/+11
2008-08-28Accepted Patch by Scraggy that moves text in such a way that no text overlapsBjørn Lindeijer1-0/+104
2008-07-18Import of client treeLloyd Bryant1-0/+102