PBS2H20AAL/HappyBird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: PBS2H20AAL:4fac1b1511d83e3c1db4fa8b782e7dd16b9e3b1b
Branches Tags
PBS2H20AAL:master
...
compare: PBS2H20AAL:8aabc3f235e2b2581f8b4c4d7b664f70887c36fd
Branches Tags
PBS2H20AAL:master

2 Commits
4fac1b1511 ... 8aabc3f235

Author SHA1 Message Date
pbs2h20aal
8aabc3f235 Konflikt lösen 2021-11-17 09:18:53 +01:00
pbs2h20aal
4e7b664325 test 2021-11-17 09:04:45 +01:00
12 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

BIN
Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin
View File

Binary file not shown.

BIN
Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock
View File

Binary file not shown.

BIN
Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

2
Happy_Bird/.idea/.name generated
View File

@ -1 +1 @@
HappyBird.java
HappyBirdMain.java

BIN
Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class
View File

Binary file not shown.

BIN
Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar
View File

Binary file not shown.

4
Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml
View File

@ -3,11 +3,11 @@
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<VBox prefHeight="578.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.happy_bird.HappyBird">
<VBox prefHeight="800.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.happy_bird.HappyBird">
<ImageView>
<image>
<Image url="@screen.png" />
<Image url="@pics/Background.png" />
</image>
</ImageView>

BIN
Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin
View File

Binary file not shown.

2
Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java
View File

@ -20,7 +20,7 @@ public class HappyBirdMain extends Application {
@Override
public void start(Stage stage) throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("happyBird.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 578, 700);
Scene scene = new Scene(fxmlLoader.load(), 800, 700);
stage.setTitle("HappyBird");
stage.setScene(scene);
stage.show();

4
Happy_Bird/src/main/resources/com/example/happy_bird/happyBird.fxml
View File

@ -3,11 +3,11 @@
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<VBox prefHeight="578.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.happy_bird.HappyBird">
<VBox prefHeight="800.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.happy_bird.HappyBird">
<ImageView>
<image>
<Image url="@screen.png" />
<Image url="@pics/Background.png" />
</image>
</ImageView>