diff --git a/out/artifacts/idatg1002_2022_group6_jar/idatg1002_2022_group6.jar b/out/artifacts/idatg1002_2022_group6_jar/idatg1002_2022_group6.jar index eafa4dcbe7eb26d7f7a2b0376f8f504b0fea1cfc..d8f1474848ffaf92c62c32e4f78647db74fabb7e 100644 Binary files a/out/artifacts/idatg1002_2022_group6_jar/idatg1002_2022_group6.jar and b/out/artifacts/idatg1002_2022_group6_jar/idatg1002_2022_group6.jar differ diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF new file mode 100644 index 0000000000000000000000000000000000000000..2711829def036dfeaae2d4943e411acaede50517 --- /dev/null +++ b/src/main/java/META-INF/MANIFEST.MF @@ -0,0 +1,4 @@ +Manifest-Version: 1.0 +Main-Class: no.ntnu.idatg1002.idatg1002_2022_group6.TableTennisApplicati + on + diff --git a/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/info-menu-view.fxml b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/info-menu-view.fxml index fbdb82ead8323402e4c24e9ab7c43086f98dc98c..df9d5e84e9df036be9ebd27df0102bb1566f3e01 100644 --- a/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/info-menu-view.fxml +++ b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/info-menu-view.fxml @@ -4,10 +4,10 @@ <?import javafx.scene.layout.*?> <?import javafx.scene.text.*?> -<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.14-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatg1002.idatg1002_2022_group6.InfoMenuController"> +<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatg1002.idatg1002_2022_group6.InfoMenuController"> <children> <Button layoutX="22.0" layoutY="520.0" mnemonicParsing="false" onAction="#onPressBackToMenu" style="-fx-background-color: #297ca6;" text="Back to main menu" textFill="#fffcfc" /> - <TextArea editable="false" layoutX="105.0" layoutY="114.0" prefHeight="385.0" prefWidth="603.0" text=" 1. To start a tournament: 1.1 Click “Start tournament†1.2 Add the participants by writing their name in the designated fields. 1.3 Click “Add players†while names of participants are written in the fields. 1.4 Click “Create match†after adding the players. 1.5 Player brackets will be automatically formed. 1.6 Once ready, click “Play match†when your game starts. 2. Adding score to each player: 2.1 While in the match screen, simply click on button “Point†under the player you want to add a point to. 3. View info: 3.1 While in main menu, click “Infoâ€. 3.2 To return to menu, click “Back to main menuâ€. 4. View rules: 4.1 While in main menu, click “Rulesâ€. 5. Exit application: 5.1 While in main menu, click “Exit applicationâ€. " /> + <TextArea editable="false" layoutX="105.0" layoutY="114.0" prefHeight="385.0" prefWidth="603.0" text="To start a tournament: 1. Click “Start tournament†2. Pick a tournament player bracket size (pick between 4,8,16 and 32). 3. Add the participants by writing their name in the designated fields. 4. Click “Add players†while names of participants are written in the fields. 5. Click “Start tournament†after adding the players. 6. Player brackets will be formed. 7. Once ready, click “Play match†when your game starts. While in tournament: 1. To add score to a player, simply click on button “Point†under the player you want to add a point to. First player to reach 11 points wins. 2. You can save the game at any time by clicking “Save game†while in game. When you load a game from menu, this game will be loaded. To start a quick match (single match): 1. While in main menu, click “Quick match†2. Add player names to fields 3. Click “Add players†after finished entering player names 4. Click “Create match†then “Play match†when you want to start the match. View info, rules and load a saved game: 1. While in main menu, click the appropriate button for the action you want to do. Exit application: 1. While in main menu, click “Exit applicationâ€. " /> <Label layoutX="82.0" layoutY="34.0" text="Table Tennis Application - HOW TO USE" textFill="#297ca6"> <font> <Font size="36.0" />