Merge branch 'master' of https://github.com/WagicProject/wagic

Conflicts: JGE/include/JTypes.h
2013-10-29 23:36:07 +01:00
parent a3a1bc2b79 9037699281
commit f08f0ad3b9
180 changed files with 725 additions and 23783 deletions
@@ -86,7 +86,7 @@ void InteractiveButton::Render()
    {
        renderer->RenderQuad(buttonImage.get(), buttonXOffset - buttonImage.get()->mWidth/2, buttonYOffset + mainFontHeight/2, 0, pspIconsSize, pspIconsSize);
    }
-    mainFont->SetColor(ARGB(255, 200, 200, 200));
+    mainFont->SetColor(ARGB(255, 0, 0, 0));
    mainFont->DrawString(detailedInfoString, buttonXOffset, buttonYOffset);
 }