Merge branch 'master' of http://git.wolfsberg.local/philipp.clima/heisser_draht
This commit is contained in:
		@@ -123,7 +123,7 @@ All buttons are close-contact.
 | 
				
			|||||||
            |           |           |           | 
 | 
					            |           |           |           | 
 | 
				
			||||||
            +----+      +----+      +----+      +----+
 | 
					            +----+      +----+      +----+      +----+
 | 
				
			||||||
            |    |      |    |      |    |      |    |
 | 
					            |    |      |    |      |    |      |    |
 | 
				
			||||||
            |   P_32    |   P_37    |   P_32    |   P_32    
 | 
					            |   P_32    |   P_33    |   P_36    |   P_37    
 | 
				
			||||||
            \           \           \           \
 | 
					            \           \           \           \
 | 
				
			||||||
             \           \           \           \
 | 
					             \           \           \           \
 | 
				
			||||||
              \           \           \           \
 | 
					              \           \           \           \
 | 
				
			||||||
@@ -640,7 +640,7 @@ img_metalliclogo_image  = pygame.image.load(img_metalliclogo)
 | 
				
			|||||||
img_metalliclogo_imagex = get_image_width(img_metalliclogo)
 | 
					img_metalliclogo_imagex = get_image_width(img_metalliclogo)
 | 
				
			||||||
img_metalliclogo_imagey = get_image_height(img_metalliclogo)
 | 
					img_metalliclogo_imagey = get_image_height(img_metalliclogo)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
img_background = 'img/bg.png'
 | 
					img_background = 'img/bg.jpg'
 | 
				
			||||||
img_background_image  = pygame.image.load(img_background)
 | 
					img_background_image  = pygame.image.load(img_background)
 | 
				
			||||||
img_background_imagex = get_image_width(img_background)
 | 
					img_background_imagex = get_image_width(img_background)
 | 
				
			||||||
img_background_imagey = get_image_height(img_background)
 | 
					img_background_imagey = get_image_height(img_background)
 | 
				
			||||||
@@ -689,7 +689,7 @@ while True:
 | 
				
			|||||||
        # fill all surfaces again to contain the proper text
 | 
					        # fill all surfaces again to contain the proper text
 | 
				
			||||||
        header_surface = pygame_font_1.render('Dr' + u'ü' + 'cken Sie Start!', True, pygame_font_main_color)
 | 
					        header_surface = pygame_font_1.render('Dr' + u'ü' + 'cken Sie Start!', True, pygame_font_main_color)
 | 
				
			||||||
        header_rectangle = header_surface.get_rect()
 | 
					        header_rectangle = header_surface.get_rect()
 | 
				
			||||||
        header_rectangle.topleft = (560, 250)
 | 
					        header_rectangle.topleft = (560, 270)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        highscore_header_surface = pygame_font_2.render('Highscores:', True, pygame_font_main_color)
 | 
					        highscore_header_surface = pygame_font_2.render('Highscores:', True, pygame_font_main_color)
 | 
				
			||||||
        highscore_header_rectangle = highscore_header_surface.get_rect()
 | 
					        highscore_header_rectangle = highscore_header_surface.get_rect()
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										
											BIN
										
									
								
								img/bg.jpg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								img/bg.jpg
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 98 KiB  | 
							
								
								
									
										
											BIN
										
									
								
								img/bg.png
									
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								img/bg.png
									
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 320 KiB  | 
		Reference in New Issue
	
	Block a user