diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index afc6a1c..fe37d8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: - '*' env: - PROJECT_NAME: ${{ github.event.repository.name }} + PROJECT_NAME: oh-my-git GODOT_VERSION: 3.2.3 jobs: diff --git a/Makefile b/Makefile index 2a93549..b04a605 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -name = "git-hydra" +name = "oh-my-git" all: linux macos windows diff --git a/README.md b/README.md index 7e4aa73..ecdbd51 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# git-hydra +# Oh My Git! -**git-hydra** (working title) is an open-source game about learning Git! +**Oh My Git!** is an open-source game about learning Git! The current form is an early prototype, and will change significantly until the end of February 2021. diff --git a/export_presets.cfg b/export_presets.cfg index d44ab73..99aaf85 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -42,7 +42,7 @@ script_encryption_key="" custom_template/debug="" custom_template/release="" -application/name="git-hydra" +application/name="Oh My Git!" application/info="" application/icon="" application/identifier="" diff --git a/images/oh-my-git.png b/images/oh-my-git.png new file mode 100644 index 0000000..b70b4bb Binary files /dev/null and b/images/oh-my-git.png differ diff --git a/images/oh-my-git.png.import b/images/oh-my-git.png.import new file mode 100644 index 0000000..708ee15 --- /dev/null +++ b/images/oh-my-git.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/oh-my-git.png-03c5c1a10d0db12a4f28d5f579674ccb.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/oh-my-git.png" +dest_files=[ "res://.import/oh-my-git.png-03c5c1a10d0db12a4f28d5f579674ccb.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/levels/sequence b/levels/sequence index ef70220..6a76971 100644 --- a/levels/sequence +++ b/levels/sequence @@ -3,4 +3,9 @@ files branches merge index +remotes +changing-the-past +shit-happens +workflows +bisect sandbox diff --git a/project.godot b/project.godot index 7c0e44e..84a6bd6 100644 --- a/project.godot +++ b/project.godot @@ -50,7 +50,7 @@ _global_script_class_icons={ [application] -config/name="Git Guru" +config/name="Oh My Git!" run/main_scene="res://scenes/title.tscn" config/use_custom_user_dir=true boot_splash/bg_color=Color( 0, 0, 0, 1 ) diff --git a/scenes/level_select.tscn b/scenes/level_select.tscn index 2ee1296..c3b25ab 100644 --- a/scenes/level_select.tscn +++ b/scenes/level_select.tscn @@ -81,7 +81,7 @@ margin_left = 63.0 margin_top = 159.0 margin_right = 378.0 margin_bottom = 220.0 -text = "Help us improving git-hydra by +text = "Help us improving Oh My Git! by answering some questions:" __meta__ = { "_edit_use_anchors_": false diff --git a/scenes/survey.tscn b/scenes/survey.tscn index ae22153..85aa1a1 100644 --- a/scenes/survey.tscn +++ b/scenes/survey.tscn @@ -31,7 +31,7 @@ margin_top = 234.592 margin_right = 1034.46 margin_bottom = 290.592 custom_fonts/font = ExtResource( 4 ) -text = "git-hydra" +text = "Oh My Git!" __meta__ = { "_edit_use_anchors_": false } @@ -88,7 +88,7 @@ __meta__ = { margin_right = 466.0 margin_bottom = 93.0 text = "Thank you very much for playing! -Please help us improve git-hydra +Please help us improve Oh My Git! by filling out this survey:" align = 1 diff --git a/scenes/title.tscn b/scenes/title.tscn index bcac0d2..3bd8262 100644 --- a/scenes/title.tscn +++ b/scenes/title.tscn @@ -1,17 +1,10 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://styles/theme.tres" type="Theme" id=1] -[ext_resource path="res://nodes/head1.svg" type="Texture" id=2] +[ext_resource path="res://images/oh-my-git.png" type="Texture" id=2] [ext_resource path="res://scenes/title.gd" type="Script" id=3] -[ext_resource path="res://fonts/cabin-bold.ttf" type="DynamicFontData" id=4] [ext_resource path="res://fonts/default.tres" type="DynamicFont" id=5] -[sub_resource type="DynamicFont" id=1] -size = 80 -use_mipmaps = true -use_filter = true -font_data = ExtResource( 4 ) - [node name="Title" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -21,32 +14,11 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="ColorRect" type="ColorRect" parent="."] -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_top = -0.889893 -margin_bottom = -0.889893 -color = Color( 0, 0, 0, 1 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="Label" type="Label" parent="."] -margin_left = 795.993 -margin_top = 243.349 -margin_right = 1166.99 -margin_bottom = 353.349 -custom_fonts/font = SubResource( 1 ) -text = "Git Guru" -__meta__ = { -"_edit_use_anchors_": false -} - [node name="Label2" type="Label" parent="."] -margin_left = 773.285 -margin_top = 346.274 -margin_right = 1114.29 -margin_bottom = 402.274 +margin_left = 790.904 +margin_top = 570.287 +margin_right = 1131.91 +margin_bottom = 626.287 custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0.533333, 0.392157, 0.392157, 1 ) text = "by bleeptrack & blinry" @@ -56,10 +28,10 @@ __meta__ = { } [node name="Label3" type="Label" parent="."] -margin_left = 692.22 -margin_top = 373.555 -margin_right = 1192.22 -margin_bottom = 429.555 +margin_left = 709.839 +margin_top = 597.568 +margin_right = 1209.84 +margin_bottom = 653.568 custom_fonts/font = ExtResource( 5 ) custom_colors/font_color = Color( 0.533333, 0.392157, 0.392157, 1 ) text = "Original score by winniehell" @@ -68,15 +40,11 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="head" type="Sprite" parent="."] -position = Vector2( 944.114, 185.713 ) -texture = ExtResource( 2 ) - [node name="VBoxContainer" type="VBoxContainer" parent="."] -margin_left = 765.813 -margin_top = 465.05 -margin_right = 1117.81 -margin_bottom = 648.05 +margin_left = 783.432 +margin_top = 689.063 +margin_right = 1135.43 +margin_bottom = 872.063 __meta__ = { "_edit_use_anchors_": false } @@ -97,6 +65,13 @@ margin_top = 88.0 margin_right = 351.0 margin_bottom = 127.0 text = "Quit" + +[node name="Sprite" type="Sprite" parent="."] + +[node name="oh-my-git" type="Sprite" parent="Sprite"] +position = Vector2( 969.045, 326.247 ) +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"]