Merge remote-tracking branch 'origin/master'

# Conflicts:
#	scores.kus

config.yml

@@ -4,10 +4,10 @@ general:
 
 # Players config
 players:
- width: 250
+ width: 100
  startXPosition: 50
  fireCooldown: 10
- speed: 10
+ speed: 20
  user1:
   color: red
   keys:

scores.kus

@@ -1,6 +1,6 @@
-10912949710723305374
+6613206509173847490
-Thomas,2000
+Thomas,2500
+Thomas,1200
 Thomas,1000
 Thomas,300
 Thomas,0
-Thomas,0

src/entityDraw.cpp

@@ -3,9 +3,9 @@
 #include "utils.h"
 #include "god.h"
 
-
 using namespace nsShape;
 
+
 PixelManager::PixelManager(MinGL& a) : window(a) {
 	window.initGlut();
 	window.initGraphic();
@@ -72,14 +72,6 @@ void PixelManager::drawBackground() const {
 	background.draw(window);
 }
 
-PlayMode PixelManager::showInitialMenu() const {
-	return PlayMode::SINGLE;
-}
-
-bool PixelManager::showDeathMenu() const {
-	return true;
-}
-
 unsigned PixelManager::getScreenHeight() const {
 	return window.getWindowSize().getY();
 }

src/main.cpp

@@ -5,6 +5,7 @@ using namespace std;
 // TODO changer tout les unsigned par des size_t dans les boucles
 int main(){
 	srand(time(NULL));
+	
 	Game g;
 	g.managedGames();
 

src/menuDraw.cpp

@@ -0,0 +1,15 @@
+#include <playMode.h>
+#include "pixelManager.h"
+#include "utils.h"
+#include "god.h"
+
+PlayMode PixelManager::showInitialMenu() const {
+	return PlayMode::SINGLE;
+}
+
+bool PixelManager::showDeathMenu() const {
+	return true;
+}
+
+
+