- ported bugfixes for 3.6.0.3 release:

- CMake build system fixes applied during debian testing (like checking for compiler SSE support etc)
 - Windows client fix for headless server operation
 - Crash for some systems when trying to use VBO's
 - Fixed AZERTY keyboard support
 - Enhanced support for screenshots in g3d viewer
 - Updated particle code from titi
 - Bugfix for custom data path override causing compiler error
 - Bugfix for fontconfig to properly find fonts on systems that support and have fontconfig installed (fixes numerous non debian based systems that reported null font errors)
 - Minor UI fix on battle end screen when playing 8 players (last player was sometimes chopped off)
This commit is contained in:
Mark Vejvoda
2012-01-23 07:22:43 +00:00
parent 2224d75d10
commit f40c37f5e8
63 changed files with 948 additions and 470 deletions

View File

@@ -84,17 +84,16 @@ void Font3DGl::end() {
}}}//end namespace
namespace Shared { namespace Graphics {
using namespace Gl;
Font3D * ConvertFont2DTo3D(Font2D *font) {
Font3D *result = new Font3DGl();
result->setSize(font->getSize());
result->setType("",font->getType());
result->setWidth(font->getWidth());
result->init();
return result;
}
}}
//namespace Shared { namespace Graphics {
//
// using namespace Gl;
//Font3D * ConvertFont2DTo3D(Font2D *font) {
//
// Font3D *result = new Font3DGl();
// result->setSize(font->getSize());
// result->setType("",font->getType());
// result->setWidth(font->getWidth());
// result->init();
// return result;
//}
//}}