Merge remote-tracking branch 'origin/master'

README.md

@@ -13,6 +13,8 @@ Currently, only a single character is playable. However, the engine allows for e
 
 Set your preferences in the launcher window, plug-in two DirectInput or XInput capable controllers in your computer, and press start! Use the left analog stick or the D-Pad to move, and the four face buttons for kick and punch, neo-geo style.
 
+![Launcher screenshot](docs/launcher_screenshot.png)
+
 Blue, the main character, knows some advanced martial arts techniques, which can be unlocked through special combinaisons ;).
 
 ## How to install / build?

src/main/java/launcher/Launcher.java

@@ -153,13 +153,15 @@ public class Launcher extends Application {
 		/*******************/
 		
 		// Removing window decorations
-		// primaryStage.initStyle(StageStyle.UNDECORATED);
+		primaryStage.initStyle(StageStyle.UNDECORATED);
 		// Setting the window as unresizeable
 		primaryStage.setResizable(false);
 		// Setting window title
 		primaryStage.setTitle("Boulevard Combattant");
 		// Assinging main scene to primaryStage
 		primaryStage.setScene(main);
+		// Adding icon to taskbar
+		primaryStage.getIcons().add(new Image(Launcher.class.getResourceAsStream("logo.png")));
 		// Showing the stage to the user
 		primaryStage.show();