mirror of
				https://github.com/mightypanders/GMTKJam2021.git
				synced 2025-11-04 11:09:50 +01:00 
			
		
		
		
	Fontcolors changed, minor bugs fixed
This commit is contained in:
		@@ -5,11 +5,11 @@
 | 
				
			|||||||
[ext_resource path="res://assets/ui/coin.png" type="Texture" id=3]
 | 
					[ext_resource path="res://assets/ui/coin.png" type="Texture" id=3]
 | 
				
			||||||
[ext_resource path="res://assets/MonoRaccoon.ttf" type="DynamicFontData" id=4]
 | 
					[ext_resource path="res://assets/MonoRaccoon.ttf" type="DynamicFontData" id=4]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[sub_resource type="DynamicFont" id=2]
 | 
					[sub_resource type="DynamicFont" id=1]
 | 
				
			||||||
size = 21
 | 
					size = 21
 | 
				
			||||||
font_data = ExtResource( 4 )
 | 
					font_data = ExtResource( 4 )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[sub_resource type="DynamicFont" id=1]
 | 
					[sub_resource type="DynamicFont" id=2]
 | 
				
			||||||
size = 25
 | 
					size = 25
 | 
				
			||||||
font_data = ExtResource( 4 )
 | 
					font_data = ExtResource( 4 )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -53,7 +53,8 @@ margin_left = 17.0
 | 
				
			|||||||
margin_top = 28.1352
 | 
					margin_top = 28.1352
 | 
				
			||||||
margin_right = 94.0
 | 
					margin_right = 94.0
 | 
				
			||||||
margin_bottom = 42.1352
 | 
					margin_bottom = 42.1352
 | 
				
			||||||
custom_fonts/font = SubResource( 2 )
 | 
					custom_fonts/font = SubResource( 1 )
 | 
				
			||||||
 | 
					custom_colors/font_color = Color( 0, 0, 0, 1 )
 | 
				
			||||||
text = "City Bound"
 | 
					text = "City Bound"
 | 
				
			||||||
__meta__ = {
 | 
					__meta__ = {
 | 
				
			||||||
"_edit_use_anchors_": false
 | 
					"_edit_use_anchors_": false
 | 
				
			||||||
@@ -98,7 +99,8 @@ margin_left = 11.0
 | 
				
			|||||||
margin_top = 13.0
 | 
					margin_top = 13.0
 | 
				
			||||||
margin_right = 77.0
 | 
					margin_right = 77.0
 | 
				
			||||||
margin_bottom = 63.0
 | 
					margin_bottom = 63.0
 | 
				
			||||||
custom_fonts/font = SubResource( 1 )
 | 
					custom_fonts/font = SubResource( 2 )
 | 
				
			||||||
 | 
					custom_colors/font_color = Color( 0, 0, 0, 1 )
 | 
				
			||||||
align = 2
 | 
					align = 2
 | 
				
			||||||
valign = 1
 | 
					valign = 1
 | 
				
			||||||
__meta__ = {
 | 
					__meta__ = {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,3 +7,4 @@ func _ready():
 | 
				
			|||||||
	
 | 
						
 | 
				
			||||||
func _on_New_Game_pressed():
 | 
					func _on_New_Game_pressed():
 | 
				
			||||||
	get_tree().change_scene("res://World.tscn")
 | 
						get_tree().change_scene("res://World.tscn")
 | 
				
			||||||
 | 
						queue_free()
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										30
									
								
								World.tscn
									
									
									
									
									
								
							
							
						
						
									
										30
									
								
								World.tscn
									
									
									
									
									
								
							@@ -1,4 +1,4 @@
 | 
				
			|||||||
[gd_scene load_steps=127 format=2]
 | 
					[gd_scene load_steps=128 format=2]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[ext_resource path="res://assets/city_tiles/Street.png" type="Texture" id=1]
 | 
					[ext_resource path="res://assets/city_tiles/Street.png" type="Texture" id=1]
 | 
				
			||||||
[ext_resource path="res://assets/city_tiles/Buildings.png" type="Texture" id=2]
 | 
					[ext_resource path="res://assets/city_tiles/Buildings.png" type="Texture" id=2]
 | 
				
			||||||
@@ -216,18 +216,18 @@ points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
 | 
				
			|||||||
[sub_resource type="ConvexPolygonShape2D" id=58]
 | 
					[sub_resource type="ConvexPolygonShape2D" id=58]
 | 
				
			||||||
points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
 | 
					points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[sub_resource type="ConvexPolygonShape2D" id=56]
 | 
					 | 
				
			||||||
points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[sub_resource type="ConvexPolygonShape2D" id=57]
 | 
					 | 
				
			||||||
points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[sub_resource type="ConvexPolygonShape2D" id=58]
 | 
					 | 
				
			||||||
points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
[sub_resource type="ConvexPolygonShape2D" id=59]
 | 
					[sub_resource type="ConvexPolygonShape2D" id=59]
 | 
				
			||||||
points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
 | 
					points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[sub_resource type="ConvexPolygonShape2D" id=60]
 | 
				
			||||||
 | 
					points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[sub_resource type="ConvexPolygonShape2D" id=61]
 | 
				
			||||||
 | 
					points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					[sub_resource type="ConvexPolygonShape2D" id=62]
 | 
				
			||||||
 | 
					points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[sub_resource type="ConvexPolygonShape2D" id=63]
 | 
					[sub_resource type="ConvexPolygonShape2D" id=63]
 | 
				
			||||||
points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
 | 
					points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -1477,14 +1477,14 @@ margin_right = 1331.08
 | 
				
			|||||||
margin_bottom = 74.3368
 | 
					margin_bottom = 74.3368
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[node name="GameTime" type="Timer" parent="."]
 | 
					[node name="GameTime" type="Timer" parent="."]
 | 
				
			||||||
wait_time = 45.0
 | 
					wait_time = 35.853
 | 
				
			||||||
autostart = true
 | 
					autostart = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[node name="GUI2" parent="." instance=ExtResource( 41 )]
 | 
					[node name="GUI2" parent="." instance=ExtResource( 41 )]
 | 
				
			||||||
margin_left = -0.840881
 | 
					margin_left = 46.2492
 | 
				
			||||||
margin_top = 640.763
 | 
					margin_top = 632.354
 | 
				
			||||||
margin_right = 1281.16
 | 
					margin_right = 1328.25
 | 
				
			||||||
margin_bottom = 720.763
 | 
					margin_bottom = 712.354
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[connection signal="scored" from="Playa" to="." method="_on_Playa_scored"]
 | 
					[connection signal="scored" from="Playa" to="." method="_on_Playa_scored"]
 | 
				
			||||||
[connection signal="timeout" from="GuestTimer" to="." method="_on_GuestTimer_timeout"]
 | 
					[connection signal="timeout" from="GuestTimer" to="." method="_on_GuestTimer_timeout"]
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user