Merge branch 'master' of https://git.sjkillen.ca/sjkillen/meat_madness_redux
This commit is contained in:
commit
2ae781cc7d
BIN
godot/assets/models/black_box/Slime.material (Stored with Git LFS)
BIN
godot/assets/models/black_box/Slime.material (Stored with Git LFS)
Binary file not shown.
|
@ -42,14 +42,14 @@ margin_top = 40.0
|
||||||
margin_right = 208.0
|
margin_right = 208.0
|
||||||
margin_bottom = 76.0
|
margin_bottom = 76.0
|
||||||
focus_neighbour_top = NodePath("../RetryButton")
|
focus_neighbour_top = NodePath("../RetryButton")
|
||||||
focus_neighbour_bottom = NodePath("../QuitButton")
|
focus_neighbour_bottom = NodePath("../CreditsButton")
|
||||||
text = "Main Menu"
|
text = "Main Menu"
|
||||||
|
|
||||||
[node name="CreditsButton" type="Button" parent="Menu"]
|
[node name="CreditsButton" type="Button" parent="Menu"]
|
||||||
margin_top = 80.0
|
margin_top = 80.0
|
||||||
margin_right = 208.0
|
margin_right = 208.0
|
||||||
margin_bottom = 116.0
|
margin_bottom = 116.0
|
||||||
focus_neighbour_top = NodePath("../RetryButton")
|
focus_neighbour_top = NodePath("../MenuButton")
|
||||||
focus_neighbour_bottom = NodePath("../QuitButton")
|
focus_neighbour_bottom = NodePath("../QuitButton")
|
||||||
text = "Credits"
|
text = "Credits"
|
||||||
|
|
||||||
|
@ -57,8 +57,8 @@ text = "Credits"
|
||||||
margin_top = 120.0
|
margin_top = 120.0
|
||||||
margin_right = 208.0
|
margin_right = 208.0
|
||||||
margin_bottom = 156.0
|
margin_bottom = 156.0
|
||||||
focus_neighbour_top = NodePath("../MenuButton")
|
focus_neighbour_top = NodePath("../CreditsButton")
|
||||||
focus_neighbour_bottom = NodePath("../PlayButton")
|
focus_neighbour_bottom = NodePath("../RetryButton")
|
||||||
text = "Quit"
|
text = "Quit"
|
||||||
|
|
||||||
[node name="Blackout" type="CanvasLayer" parent="."]
|
[node name="Blackout" type="CanvasLayer" parent="."]
|
||||||
|
|
Loading…
Reference in New Issue