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

Merging

Browse Source
This commit is contained in:
Lars Alteköster 2021-11-26 12:47:36 +01:00
commit e25465873b
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,13 +7,10 @@
<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 >
<<<<<<< HEAD
=======
<ImageView>
<image>
<Image url="@pics/Background.png"></Image>
</image>
</ImageView>
>>>>>>> 5db5b6bb195a2b7d1296e7d3f9b98d6c75dba2c2
</StackPane>

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

@ -86,12 +86,18 @@ public class HappyBirdMain extends Application {
menuButton.setLayoutX(575);
menuButton.setLayoutY(625);
menuButton.setVisible(false);
<<<<<<< HEAD
=======
>>>>>>> 6697cdef8e121846595c7e99f811d1088227faa6
startGame.setVisible(false);
//Button buttons[] = {startButton, highscoresButton, settingsButton};
<<<<<<< HEAD
=======
>>>>>>> 6697cdef8e121846595c7e99f811d1088227faa6
int yPosition = 225;
for (Button button : buttons) {
@ -113,12 +119,18 @@ public class HappyBirdMain extends Application {
startGame.setVisible(false);
<<<<<<< HEAD
=======
>>>>>>> 6697cdef8e121846595c7e99f811d1088227faa6
Label nameLabel = new Label("Name:");
Label acronymLabel = new Label("Kürzel:");
Label startLabels[] = {nameLabel, acronymLabel};
<<<<<<< HEAD
=======
>>>>>>> 6697cdef8e121846595c7e99f811d1088227faa6
startButton.setOnAction(event -> {
headline.setText("Start");
for (Button button : buttons) {
@ -167,6 +179,7 @@ public class HappyBirdMain extends Application {
feld.setVisible(false);
}
startButton.setOnAction(event -> {
headline.setText("Start");
for(Button button : buttons) {
@ -188,9 +201,7 @@ public class HappyBirdMain extends Application {
});
//startGame.setOnAction(event -> {});
//startButton.setOnAction(event -> {});