Compare commits
	
		
			2 Commits
		
	
	
		
			8f8f5a5f96
			...
			c828169573
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| c828169573 | |||
| a420b83875 | 
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							@@ -7,4 +7,13 @@
 | 
			
		||||
 | 
			
		||||
<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>
 | 
			
		||||
 
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							@@ -87,7 +87,7 @@ public class HappyBirdMain extends Application {
 | 
			
		||||
        menuButton.setLayoutY(625);
 | 
			
		||||
        menuButton.setVisible(false);
 | 
			
		||||
 | 
			
		||||
        Button buttons[] = {startButton, highscoresButton, settingsButton};
 | 
			
		||||
        //Button buttons[] = {startButton, highscoresButton, settingsButton};
 | 
			
		||||
 | 
			
		||||
        int yPosition = 225;
 | 
			
		||||
        for (Button button : buttons) {
 | 
			
		||||
@@ -113,7 +113,7 @@ public class HappyBirdMain extends Application {
 | 
			
		||||
            headline.setText("Start");
 | 
			
		||||
            for(Button button : buttons) {
 | 
			
		||||
                button.setVisible(false);
 | 
			
		||||
 | 
			
		||||
                menuButton.setVisible(true);
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            Label nameLabel = new Label("Name:");
 | 
			
		||||
@@ -165,7 +165,7 @@ public class HappyBirdMain extends Application {
 | 
			
		||||
        });
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        startButton.setOnAction(event ->  {});
 | 
			
		||||
        //startButton.setOnAction(event ->  {});
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user