Merge 2b86314cb6 into 9da0bd1fbd

README.md

@@ -21,7 +21,7 @@ Wanna build your own level? Great! Here's how to do it:
 1. Run the game – the easiest way to do so is to run `godot scenes/main.tscn` from the project directory.
 1. Get a bit familiar with the levels which are currently there.
 1. Take a look into the `levels` directory. It's split into chapters, and each level is a file.
-1. Make a copy of an existing level or start writing your own. See the documention of the format below.
+1. Make a copy of an existing level or start writing your own. See the documentation of the format below.
 1. Write and test your level. If you're happy with it, feel free to send it to us in a pull request! <3
 
 ### Level format

levels/index/add

@@ -35,4 +35,4 @@ test "$(git show main^:c)" != "c"
 
 [congrats]
 
-Well done! Try tavelling between the commits using `git checkout`, so you can look at their contents again!
+Well done! Try travelling between the commits using `git checkout`, so you can look at their contents again!

levels/stash/stash-merge

@@ -39,7 +39,7 @@ git add recipe
 
 [win]
 
-# Did you resolve the confict and commit?
+# Did you resolve the conflict and commit?
 { git show HEAD | grep "Flour"; } && { git show HEAD | grep "Salt"; }
 
 # Did you clear stash stack?

org.ohmygit.OhMyGit.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Oh My Git!
+
+Exec=oh-my-git
+Terminal=false
+Icon=org.ohmygit.OhMyGit
+Type=Application
+Categories=Game;LogicGame;Education;ComputerScience;

org.ohmygit.OhMyGit.metainfo.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>org.ohmygit.OhMyGit</id>
+    <metadata_license>FSFAP</metadata_license>
+    <project_license>BlueOak-1.0.0</project_license>
+    <name>Oh My Git!</name>
+    <summary>An open source game about learning Git!</summary>
+    <description>
+        <p>
+            <em>Oh My Git!</em> is an open source game that introduces players to the popular version control system "Git". It is highly interactive, and aims at building intuition for operations like "merging" or "rebasing" branches. Players are guided through the features of Git step by step – each level tells a little story where the player can use their new-found powers to solve problems or help others.
+        </p>
+    </description>
+
+    <launchable type="desktop-id">org.ohmygit.OhMyGit.desktop</launchable>
+
+    <screenshots>
+        <screenshot type="default">
+            <image>https://ohmygit.org/assets/images/cover.png</image>
+        </screenshot>
+        <screenshot>
+            <image>https://ohmygit.org/assets/images/screenshots/commit.png</image>
+        </screenshot>
+        <screenshot>
+            <image>https://ohmygit.org/assets/images/screenshots/branches.png</image>
+        </screenshot>
+        <screenshot>
+            <image>https://ohmygit.org/assets/images/screenshots/bisect.png</image>
+        </screenshot>
+        <screenshot>
+            <image>https://ohmygit.org/assets/images/screenshots/levels.png</image>
+        </screenshot>
+    </screenshots>
+
+    <url type="homepage">https://ohmygit.org/</url>
+    <url type="bugtracker">https://github.com/git-learning-game/oh-my-git/issues</url>
+    <url type="vcs-browser">https://github.com/git-learning-game/oh-my-git</url>
+    <url type="contribute">https://github.com/git-learning-game/oh-my-git#contribute-code</url>
+
+    <developer_name>bleeptrack and blinry</developer_name>
+
+    <content_rating type="oars-1.1" />
+
+    <releases>
+        <release version="0.6.5" date="2022-07-21"/>
+    </releases>
+</component>

scenes/game.gd

@@ -74,7 +74,7 @@ func shell_received(text):
 
 func _notification(what):
 	if what == MainLoop.NOTIFICATION_WM_QUIT_REQUEST:
-		#get_tree().quit() # default behavio
+		#get_tree().quit() # default behavior
 		get_tree().change_scene("res://scenes/survey.tscn")