Merge branch 'master' of github.com:Allanis/LibD

Conflicts:
	src/Main/Game.cpp

LibDQt/LibDQt.pro

@@ -64,7 +64,8 @@ HEADERS += ../src/Actor/Player.h \
     ../src/Font/Font.h \
     ../src/Animation/AnimatingSprite.h \
     ../src/UI/Menu.h \
-    ../src/UI/Button.h
+    ../src/UI/Button.h \
+    ../src/Main/TitleScreen.h
 SOURCES += ../src/Actor/Player.cpp \
     ../src/Collision/AABB.cpp \
     ../src/Global/Globals.cpp \
@@ -103,5 +104,5 @@ SOURCES += ../src/Actor/Player.cpp \
     ../src/Font/Font.cpp \
     ../src/Animation/AnimatingSprite.cpp \
     ../src/UI/Menu.cpp \
-    ../src/UI/Button.cpp
+    ../src/UI/Button.cpp \
-OTHER_FILES += 
+    ../src/Main/TitleScreen.cpp

README

@@ -0,0 +1,35 @@
+Readme plz!
+___________
+
+~~Instructions~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Arrow keys/wasd		- Move Player.
+'Shift'			      - Run.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+##Developers######################################################
+Allanis
+KonoM
+##################################################################
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Copyright (C) 2011 SaraCraft
+allanis@saracraft.net
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+Here is a nice link to the licence:
+http://www.gnu.org/licenses/gpl-2.0.html

src/Actor/Actor.h

@@ -42,8 +42,8 @@ public:
 
   void SetXY(float xArg, float yArg)    { x = xArg; y = yArg; }
 
-  Facing GetDirection(void)                 { return _direction; }
+  Facing GetDirection(void)             { return _direction; }
-  void SetDirection(Facing direction)      { _direction = direction; }
+  void SetDirection(Facing direction)   { _direction = direction; }
 
 protected:
   virtual void Move(float dt) = 0;

src/Main/Game.cpp

@@ -183,9 +183,9 @@ void Game::RenderGame(void) {
   _player->Render();
   _NPC->Render();
   _testFont->RenderText(
-    _player->GetX() - 5,
+    _player->GetX() - 50,
     _player->GetY() - _testFont->GetLineSkip() - 2,
-    "Miss D");
+    "<Mistress of Magic>");
 
   if(_inGameMenuShown) {
     glLoadIdentity();
@@ -195,6 +195,7 @@ void Game::RenderGame(void) {
 
     _inGameMenu->Render();
   }
+  
 }
 
 void Game::NewGame(void) {

src/Main/TitleScreen.cpp

@@ -8,7 +8,7 @@ TitleScreen::TitleScreen(void) {
   _result = TitleScreen::QUIT;
 
   _font = new Font();
-  _font->Load("../Data/Font/fairydust.ttf", 24);
+  _font->Load("../Data/Font/Fairydust.ttf", 24);
 
   Button* newGameButton = new Button();
   Button* loadGameButton = new Button();