Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development

This commit is contained in:
Paul Gross
2020-04-30 19:10:48 +02:00
29 changed files with 861 additions and 885 deletions

View File

@@ -125,7 +125,7 @@ public class PlayersController implements Initializable{
final URL fxmlURL = getClass().getResource("../ressources/PlateauTest.fxml");
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRENCH);
final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
Parent root = fxmlLoader.load();
AnchorPane root = fxmlLoader.load();
PlateauController pc = fxmlLoader.getController();
gj.setPlateauController(pc);