Merge branch 'master' of https://gitlab.istic.univ-rennes1.fr/fautin/jeu-de-combat.git

.gitignore

@@ -3,3 +3,4 @@
 /bin/
 /.idea/
 /jeu-de-combat.iml
+/game.set

game.set

@@ -1 +0,0 @@
-{"game":[{"character2":"ken","character1":"ryu","fullscreen":"true","stage":"default","width":"1920","rounds":"5","height":"1080"}]}

src/launcher/Config.java

@@ -1,4 +1,4 @@
-package configuration;
+package launcher;
 
 import java.io.*;
 import org.json.simple.*;

src/launcher/Launcher.java

@@ -45,6 +45,7 @@ public class Launcher extends Application {
 	 * Start method is used by Launcher as an implementation of the Application class to create a JavaFX thread to display the GUI window
 	 */
 	
+	@SuppressWarnings("unchecked")
 	public void start(Stage primaryStage) throws Exception {
 		
 		FXMLLoader loader = new FXMLLoader(getClass().getResource("launcher.fxml"));
@@ -80,6 +81,7 @@ public class Launcher extends Application {
 
 	}
 	
+	@SuppressWarnings("unchecked")
 	@FXML
 	public void runGame() {
 		try {

src/launcher/Settings.java

@@ -1,12 +1,7 @@
 package launcher;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.util.HashMap;
 
-import configuration.*;
-
 public class Settings {
 	
 	private Config config;