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

alte Files

Browse Source
This commit is contained in:
Mats Pape 2021-11-25 13:20:21 +01:00
parent da0e493461
commit 7ad6f414df
10 changed files with 0 additions and 14 deletions
Happy_Bird
.gradle
7.1.1
executionHistory
executionHistory.binexecutionHistory.lock
fileHashes
fileHashes.binfileHashes.lock
buildOutputCleanup
buildOutputCleanup.lock
build
classes/java/main/com/example/happy_bird
HappyBirdMain.class
libs
Happy_Bird-1.0-SNAPSHOT.jar
resources/main/com/example/happy_bird
happyBird.fxml
tmp/compileJava
previous-compilation-data.bin
src/main/resources/com/example/happy_bird
happyBird.fxml

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

7
Happy_Bird/build/resources/main/com/example/happy_bird/happyBird.fxml

@ -5,15 +5,8 @@
<?import javafx.scene.image.*?> <?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<<<<<<< HEAD
<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">
<Button>
Start
</Button>
=======
<StackPane 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" back > <StackPane 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" back >
>>>>>>> c070a72d9131552445c751d71391bab4f0059fd4
<ImageView> <ImageView>
<image> <image>
<Image url="@pics/Background.png"></Image> <Image url="@pics/Background.png"></Image>

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

Binary file not shown.

7
Happy_Bird/src/main/resources/com/example/happy_bird/happyBird.fxml

@ -5,15 +5,8 @@
<?import javafx.scene.image.*?> <?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<<<<<<< HEAD
<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">
<Button>
Start
</Button>
=======
<StackPane 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" back > <StackPane 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" back >
>>>>>>> c070a72d9131552445c751d71391bab4f0059fd4
<ImageView> <ImageView>
<image> <image>
<Image url="@pics/Background.png"></Image> <Image url="@pics/Background.png"></Image>