From c61029e5962e19ebb9673d3dfb49b0735f45e63d Mon Sep 17 00:00:00 2001 From: Jonas Bernard Date: Sun, 25 Apr 2021 14:07:38 +0200 Subject: New Button colors --- .../left_hover.png-dee3c576042cdf4d1c62b960923a7f79.md5 | 4 ++-- ...left_hover.png-dee3c576042cdf4d1c62b960923a7f79.stex | Bin 150 -> 150 bytes ...iddle_hover.png-a098b1c2fabb904b5f6c8653f956cfff.md5 | 4 ++-- ...ddle_hover.png-a098b1c2fabb904b5f6c8653f956cfff.stex | Bin 141 -> 141 bytes ...right_hover.png-acfe17fb2abd2d8eb701c51b11c9ee33.md5 | 4 ++-- ...ight_hover.png-acfe17fb2abd2d8eb701c51b11c9ee33.stex | Bin 155 -> 155 bytes scenes/introduction.tscn | 2 +- scenes/levels/base_level.tscn | 2 +- scenes/pause.gd | 4 ++-- scenes/pause.tscn | 1 - textures/components/button/left_hover.png | Bin 600 -> 583 bytes textures/components/button/left_hover.xcf | Bin 849 -> 849 bytes textures/components/button/middle_hover.png | Bin 592 -> 575 bytes textures/components/button/middle_hover.xcf | Bin 711 -> 711 bytes textures/components/button/right_hover.png | Bin 603 -> 586 bytes textures/components/button/right_hover.xcf | Bin 849 -> 849 bytes 16 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.import/left_hover.png-dee3c576042cdf4d1c62b960923a7f79.md5 b/.import/left_hover.png-dee3c576042cdf4d1c62b960923a7f79.md5 index 9c3914b..d62e599 100644 --- a/.import/left_hover.png-dee3c576042cdf4d1c62b960923a7f79.md5 +++ b/.import/left_hover.png-dee3c576042cdf4d1c62b960923a7f79.md5 @@ -1,3 +1,3 @@ -source_md5="15d247ded421b807f4e87548dc2d68c0" -dest_md5="5d8c71c0739785a5284700870dfcc4be" +source_md5="e58a5ae6a34b012102b6e795674e833b" +dest_md5="9068150c54cefd6fe38811c5c8fbfdaf" diff --git a/.import/left_hover.png-dee3c576042cdf4d1c62b960923a7f79.stex b/.import/left_hover.png-dee3c576042cdf4d1c62b960923a7f79.stex index 8e94119..8861c9c 100644 Binary files a/.import/left_hover.png-dee3c576042cdf4d1c62b960923a7f79.stex and b/.import/left_hover.png-dee3c576042cdf4d1c62b960923a7f79.stex differ diff --git a/.import/middle_hover.png-a098b1c2fabb904b5f6c8653f956cfff.md5 b/.import/middle_hover.png-a098b1c2fabb904b5f6c8653f956cfff.md5 index a21b7b4..56a1c8d 100644 --- a/.import/middle_hover.png-a098b1c2fabb904b5f6c8653f956cfff.md5 +++ b/.import/middle_hover.png-a098b1c2fabb904b5f6c8653f956cfff.md5 @@ -1,3 +1,3 @@ -source_md5="dadd8e8d465ab153ea6e0c986709e6e4" -dest_md5="a3667bc1189e6a385b82fadf8e3021eb" +source_md5="42650eff4269fd3b8ebaefce1e32d56b" +dest_md5="2c0aef87326e468d0f1bf6e79f0ac176" diff --git a/.import/middle_hover.png-a098b1c2fabb904b5f6c8653f956cfff.stex b/.import/middle_hover.png-a098b1c2fabb904b5f6c8653f956cfff.stex index fe40b9a..5f93784 100644 Binary files a/.import/middle_hover.png-a098b1c2fabb904b5f6c8653f956cfff.stex and b/.import/middle_hover.png-a098b1c2fabb904b5f6c8653f956cfff.stex differ diff --git a/.import/right_hover.png-acfe17fb2abd2d8eb701c51b11c9ee33.md5 b/.import/right_hover.png-acfe17fb2abd2d8eb701c51b11c9ee33.md5 index d2672bb..02e549a 100644 --- a/.import/right_hover.png-acfe17fb2abd2d8eb701c51b11c9ee33.md5 +++ b/.import/right_hover.png-acfe17fb2abd2d8eb701c51b11c9ee33.md5 @@ -1,3 +1,3 @@ -source_md5="f7bc7e973ee1b477cb4e9b3a37b680a4" -dest_md5="aceb8c7a20d2c82e2a94b939fde6d4c0" +source_md5="73a493f6445185588b7c91976d83fb7e" +dest_md5="6b201ef7ed41cbe09083b87b91e0b19d" diff --git a/.import/right_hover.png-acfe17fb2abd2d8eb701c51b11c9ee33.stex b/.import/right_hover.png-acfe17fb2abd2d8eb701c51b11c9ee33.stex index ec75993..35b2d0d 100644 Binary files a/.import/right_hover.png-acfe17fb2abd2d8eb701c51b11c9ee33.stex and b/.import/right_hover.png-acfe17fb2abd2d8eb701c51b11c9ee33.stex differ diff --git a/scenes/introduction.tscn b/scenes/introduction.tscn index 8447d96..303bea3 100644 --- a/scenes/introduction.tscn +++ b/scenes/introduction.tscn @@ -28,7 +28,7 @@ position = Vector2( 10, 260 ) text = "Continue" [node name="Skip" parent="." instance=ExtResource( 3 )] -position = Vector2( 552.365, 339.54 ) +position = Vector2( 557.234, 339.165 ) text = "Skip" [connection signal="finished_reveal" from="TextReveal" to="." method="_on_TextReveal_finished_reveal"] [connection signal="on_click" from="Continue" to="." method="_on_Button_on_click"] diff --git a/scenes/levels/base_level.tscn b/scenes/levels/base_level.tscn index cd32baa..c174aa3 100644 --- a/scenes/levels/base_level.tscn +++ b/scenes/levels/base_level.tscn @@ -38,7 +38,7 @@ maxhealth = 3 offset = 60 [node name="MenuButton" parent="." instance=ExtResource( 4 )] -position = Vector2( 734.768, 113.978 ) +position = Vector2( 740.235, 113.978 ) text = "Menu" [node name="Control" type="Control" parent="."] diff --git a/scenes/pause.gd b/scenes/pause.gd index 43a2d5b..57ab574 100644 --- a/scenes/pause.gd +++ b/scenes/pause.gd @@ -6,7 +6,7 @@ onready var backgroud = $Sprite func pause(): pause_menu.visible = true pause_menu.pause_mode = PAUSE_MODE_PROCESS # to be save - get_tree().paused = true + # get_tree().paused = true func _ready(): @@ -15,7 +15,7 @@ func _ready(): func _on_Resume_on_click(): pause_menu.visible = false - get_tree().paused = false + # get_tree().paused = false func _on_Main_Menu_on_click(): diff --git a/scenes/pause.tscn b/scenes/pause.tscn index f88d04c..fecfc28 100644 --- a/scenes/pause.tscn +++ b/scenes/pause.tscn @@ -25,6 +25,5 @@ position = Vector2( -1.68179, 50 ) z_index = 1 text = "Main Menu" fixed_width = 250 - [connection signal="on_click" from="Resume" to="." method="_on_Resume_on_click"] [connection signal="on_click" from="Main Menu" to="." method="_on_Main_Menu_on_click"] diff --git a/textures/components/button/left_hover.png b/textures/components/button/left_hover.png index 93a80b0..11fb35e 100644 Binary files a/textures/components/button/left_hover.png and b/textures/components/button/left_hover.png differ diff --git a/textures/components/button/left_hover.xcf b/textures/components/button/left_hover.xcf index 30c5383..34116c2 100644 Binary files a/textures/components/button/left_hover.xcf and b/textures/components/button/left_hover.xcf differ diff --git a/textures/components/button/middle_hover.png b/textures/components/button/middle_hover.png index 19e6df9..d3a5bdb 100644 Binary files a/textures/components/button/middle_hover.png and b/textures/components/button/middle_hover.png differ diff --git a/textures/components/button/middle_hover.xcf b/textures/components/button/middle_hover.xcf index 06d5b34..bfe8ab1 100644 Binary files a/textures/components/button/middle_hover.xcf and b/textures/components/button/middle_hover.xcf differ diff --git a/textures/components/button/right_hover.png b/textures/components/button/right_hover.png index 9dade91..6bc5bfd 100644 Binary files a/textures/components/button/right_hover.png and b/textures/components/button/right_hover.png differ diff --git a/textures/components/button/right_hover.xcf b/textures/components/button/right_hover.xcf index 7d7a029..c10e54c 100644 Binary files a/textures/components/button/right_hover.xcf and b/textures/components/button/right_hover.xcf differ -- cgit