diff --git a/README.md b/README.md index 3183206..2717850 100644 --- a/README.md +++ b/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 diff --git a/levels/index/add b/levels/index/add index e627917..b68f357 100644 --- a/levels/index/add +++ b/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! diff --git a/levels/stash/stash-merge b/levels/stash/stash-merge index a8c9ac1..edab359 100644 --- a/levels/stash/stash-merge +++ b/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? diff --git a/scenes/game.gd b/scenes/game.gd index 2f2a0b5..b9cab74 100644 --- a/scenes/game.gd +++ b/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")