Merge branch 'master' of https://git.bib.de/PBS2H20AAL/HappyBird
This commit is contained in:
@@ -5,14 +5,19 @@
|
||||
<?import javafx.scene.image.*?>
|
||||
<?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 >
|
||||
|
||||
>>>>>>> c070a72d9131552445c751d71391bab4f0059fd4
|
||||
<ImageView>
|
||||
<image>
|
||||
<Image url="@pics/Background.png"></Image>
|
||||
</image>
|
||||
</ImageView>
|
||||
|
||||
</VBox>
|
||||
</StackPane>
|
||||
|
Reference in New Issue
Block a user