diff --git a/images/bleeptrack.png b/images/bleeptrack.png new file mode 100644 index 0000000..1ea9b31 Binary files /dev/null and b/images/bleeptrack.png differ diff --git a/images/bleeptrack.png.import b/images/bleeptrack.png.import new file mode 100644 index 0000000..4408dcf --- /dev/null +++ b/images/bleeptrack.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/bleeptrack.png-e6a78ab92e2451e1526705d715c3b295.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/bleeptrack.png" +dest_files=[ "res://.import/bleeptrack.png-e6a78ab92e2451e1526705d715c3b295.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/images/blinry.png b/images/blinry.png new file mode 100644 index 0000000..8e65b1a Binary files /dev/null and b/images/blinry.png differ diff --git a/images/blinry.png.import b/images/blinry.png.import new file mode 100644 index 0000000..834d669 --- /dev/null +++ b/images/blinry.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/blinry.png-6d889c8c41292ac118049d5cae074026.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/blinry.png" +dest_files=[ "res://.import/blinry.png-6d889c8c41292ac118049d5cae074026.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project.godot b/project.godot index 8af698d..ce54de4 100644 --- a/project.godot +++ b/project.godot @@ -81,26 +81,26 @@ window/stretch/aspect="keep" left={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } right={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } up={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } down={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } click={ @@ -125,27 +125,27 @@ right_click={ } tab_complete={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777218,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777218,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } save={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } delete_word={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } clear={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":76,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":true,"meta":false,"command":true,"pressed":false,"scancode":76,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } mute={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":77,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":77,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } diff --git a/scenes/game.gd b/scenes/game.gd index 2f2a0b5..aeecfac 100644 --- a/scenes/game.gd +++ b/scenes/game.gd @@ -129,7 +129,8 @@ func notify(text, target=null, hint_slug=null): save_state() func open_survey(): - OS.shell_open("https://docs.google.com/forms/d/e/1FAIpQLSehHVcYfELT59h6plcn2ilbuqBcmDX3TH0qzB4jCgFIFOy_qg/viewform") + OS.shell_open("https://patreon.com/bleeptrack") + OS.shell_open("https://patreon.com/blinry") func toggle_music(): var music = game.find_node("Music") diff --git a/scenes/survey.tscn b/scenes/survey.tscn index 85aa1a1..4a0d95f 100644 --- a/scenes/survey.tscn +++ b/scenes/survey.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://styles/theme.tres" type="Theme" id=1] [ext_resource path="res://nodes/head.svg" type="Texture" id=2] @@ -7,23 +7,19 @@ [ext_resource path="res://fonts/default.tres" type="DynamicFont" id=5] [ext_resource path="res://styles/alert_button.tres" type="StyleBox" id=6] [ext_resource path="res://styles/alert_button_hover.tres" type="StyleBox" id=7] +[ext_resource path="res://images/blinry.png" type="Texture" id=8] +[ext_resource path="res://images/bleeptrack.png" type="Texture" id=9] [node name="Title" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 theme = ExtResource( 1 ) script = ExtResource( 3 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="ColorRect" type="ColorRect" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 color = Color( 0, 0, 0, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="Label" type="Label" parent="."] margin_left = 854.463 @@ -41,8 +37,8 @@ margin_left = 774.698 margin_top = 297.059 margin_right = 1115.7 margin_bottom = 353.059 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0.533333, 0.392157, 0.392157, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "by bleeptrack & blinry" align = 1 __meta__ = { @@ -86,25 +82,38 @@ __meta__ = { [node name="Label" type="Label" parent="VBoxContainer2"] margin_right = 466.0 -margin_bottom = 93.0 -text = "Thank you very much for playing! -Please help us improve Oh My Git! -by filling out this survey:" +margin_bottom = 189.0 +text = "Thanks for playing! + +Oh My Git! is free and open-source! <3 + +If this game was valuable to you, consider joining our supporters on Patreon:" align = 1 +autowrap = true [node name="Button" type="Button" parent="VBoxContainer2"] -margin_top = 117.0 +margin_top = 213.0 margin_right = 466.0 -margin_bottom = 156.0 +margin_bottom = 252.0 focus_mode = 0 custom_styles/hover = ExtResource( 7 ) custom_styles/pressed = ExtResource( 7 ) custom_styles/focus = ExtResource( 7 ) custom_styles/normal = ExtResource( 6 ) enabled_focus_mode = 0 -text = "To the survey /o/" +text = "Support us! (Open two browser tabs)" __meta__ = { "_edit_use_anchors_": false } + +[node name="Bleeptrack" type="Sprite" parent="."] +position = Vector2( 854.699, 736.706 ) +texture = ExtResource( 9 ) + +[node name="Blinry" type="Sprite" parent="."] +position = Vector2( 1053.08, 738.03 ) +scale = Vector2( 0.161431, 0.161431 ) +texture = ExtResource( 8 ) + [connection signal="pressed" from="VBoxContainer/Button2" to="." method="quit"] [connection signal="pressed" from="VBoxContainer2/Button" to="." method="on_survey_pressed"] diff --git a/scenes/title.tscn b/scenes/title.tscn index 8363e84..17aa86f 100644 --- a/scenes/title.tscn +++ b/scenes/title.tscn @@ -10,17 +10,14 @@ anchor_right = 1.0 anchor_bottom = 1.0 theme = ExtResource( 1 ) script = ExtResource( 3 ) -__meta__ = { -"_edit_use_anchors_": false -} [node name="Label2" type="Label" parent="."] margin_left = 790.778 margin_top = 594.135 margin_right = 1131.78 margin_bottom = 650.135 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0.533333, 0.392157, 0.392157, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "by bleeptrack & blinry" align = 1 __meta__ = { @@ -32,8 +29,8 @@ margin_left = 709.713 margin_top = 621.416 margin_right = 1209.71 margin_bottom = 677.416 -custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0.533333, 0.392157, 0.392157, 1 ) +custom_fonts/font = ExtResource( 5 ) text = "Original score by winniehell" align = 1 __meta__ = { @@ -72,6 +69,7 @@ text = "Quit" position = Vector2( 967.924, 306.066 ) scale = Vector2( 0.320895, 0.320895 ) texture = ExtResource( 2 ) + [connection signal="pressed" from="VBoxContainer/Button" to="." method="levels"] [connection signal="pressed" from="VBoxContainer/Button3" to="." method="sandbox"] [connection signal="pressed" from="VBoxContainer/Button2" to="." method="quit"]