472 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jason Yundt	8e9617af93	Clarify Godot requirements ... At the moment, the most recent commit to the main branch was created before Godot 4 was released [1] [2]. When that commit was created, it was accurate to tell users to download the latest version of Godot because the latest version of Godot was a version of Godot 3. Now, that statement is no longer accurate because the latest version of Godot is a version of Godot 4, and Oh My Git! hasn’t been ported to Godot 4 yet. It’s possible that we can just import Oh My Git! into Godot 4 and have it work fine, but that would require significant testing that I’m not going to do at the moment. [1]: 853b8e2 (Merge pull request #144 from n4mr3g/patch-1, 2022-07-19) [2]: <https://godotengine.org/article/godot-4-0-sets-sail/>	2023-05-11 07:49:51 -04:00
blinry	853b8e2d53	Merge pull request #144 from n4mr3g/patch-1 ... Added info of the 'friend' repo, that the player needs to clone, in the level description.	2022-07-19 14:50:16 +02:00
blinry	562816b5a2	Merge pull request #137 from Elatronion/patch-1 ... fix typo in bisect level Yellow brick road	2022-07-19 14:46:43 +02:00
blinry	727a32d72f	Merge pull request #119 from kmomberg/fix-revert-card-desc ... Fix typo in revert description card	2022-07-19 14:45:46 +02:00
Germán Piccioni	d67e5056ea	Added in the description the location of the repo to clone.	2022-06-20 01:33:30 +02:00
Elatronion	0ea34e6bd9	fix typo in bisect level Yellow brick road ... `"bisect good card"` has been changed to `"bisect good" card` to be more accurate and consistent with `"bisect start" card` and `"bisect bad" card`.	2022-02-16 21:38:05 -05:00
Kurt	c8ea26ecbb	Fix typo in revert description card	2021-05-14 22:58:01 -04:00
blinry	929c634cc4	Merge pull request #111 from MK-UDUE/patch-3 ... Fixed small typo "named" instead of "names"	2021-05-10 12:16:48 +02:00
blinry	b9dff307b2	Merge pull request #110 from MK-UDUE/patch-2 ... Suggesting pushing rather than pulling	2021-05-10 12:16:02 +02:00
blinry	5e0af1d2f1	Merge pull request #108 from nikopp/patch-1 ... Fixed typo in reflog description.	2021-05-10 12:15:28 +02:00
blinry	2bb5d4c4b3	Merge pull request #96 from artt/patch-1 ... Fixed typo in files > add level	2021-05-10 12:15:00 +02:00
blinry	5b8fc43026	Merge pull request #94 from Tokugero/patch-1 ... Sample of making this level more clear.	2021-05-10 12:13:48 +02:00
MK-UDUE	c117503375	Fixed small typo "named" instead of "names"	2021-04-29 19:15:48 +02:00
MK-UDUE	b64aeef896	Suggesting pushing rather than pulling ... Twice pulling doesn't make sense (to me).	2021-04-29 19:10:02 +02:00
nikopp	98ffccf515	Fixed typo in reflog description.	2021-04-25 21:30:44 +02:00
Art Tosborvorn	6a7c1eab6f	Update files-add ... Fixed it's -> its typo.	2021-04-15 09:10:51 +07:00
Tokugero	f9123b5652	Sample of making this level more clear. ... It wasn't at all clear how to solve this until I came to look at the actual tests. The first win condition step also didn't display which may have been a result of the format? Here's an example of something that might be more clear to the player.	2021-04-13 12:42:51 -07:00
blinry	1606e0565e	Merge pull request #59 from mundifex/stash-deadlock-fix ... Fix deadlock in stash levels	2021-04-12 16:48:31 +02:00
blinry	b8a18c4c2e	Merge pull request #88 from RedXanadu/main ... Corrected spelling mistake	2021-04-12 16:40:11 +02:00
blinry	e8b8583f49	Simplify the win condition for the remotes/problems level ... Basically, the level now accepts every compromise, and just looks at the shape of the commit graph. Closes #87.	2021-04-12 16:23:59 +02:00
blinry	ffadebb0df	Simplify careful_delete even more by relying on user:// on each OS ... Closes #83.	2021-04-12 16:03:11 +02:00
blinry	3211cd0481	Use HOME variables in careful_delete ... This helps in cases where the home directory is in unexpected places, like on external hard drives, and should still be very safe. Closes #60, closes #81.	2021-04-12 15:49:20 +02:00
blinry	2b3903a599	Clarify instructions for the "Moving branches around" level ... Closes #77.	2021-04-12 15:22:02 +02:00
blinry	74b59cff0a	Double-check that players solved the "merging timelines" level correctly ... Fixes #75.	2021-04-12 15:14:32 +02:00
Xanadu	7df6b60fa3	Corrected spelling mistake	2021-04-04 19:09:26 +01:00
blinry	44666d59ef	Merge pull request #82 from blanorama/patch-1 ... fix: typo in level stash	2021-03-30 18:10:58 +02:00
blinry	3e5c422663	Merge pull request #80 from mundifex/reorder-perl ... Make reorder level winnable on macOS platforms by using perl instead …	2021-03-30 18:09:53 +02:00
Eugen Blattner	cb1c0c2848	fix: typo in level stash	2021-03-29 02:02:41 +02:00
mundifex	c2a2f87f4c	Fix deadlock in stash levels ... - use vertical tab character instead of "MAGIC" string to denote end of input - check for terminator using pattern match instead of eq Users are unable to provide special characters to Bash process so this should be relatively safe. Pattern match succeeds even when `git stash` omits newline while rendering commit subjects. Fixes git-learning-game/oh-my-git#56	2021-03-26 21:34:22 -05:00
Ben Donatelli	5b12679988	Make reorder level winnable on macOS platforms by using perl instead of grep ... macOS provides BSD grep which does not support -P flag. Perl pattern match works on all platforms. Fixes git-learning-game/oh-my-git#79	2021-03-26 20:38:15 -05:00
blinry	f8f562b742	Merge pull request #53 from mundifex/main ... Force grep command to use UTF-8 locale in solution for 'reorder' level	2021-03-25 07:06:27 +01:00
blinry	d7870743d6	Merge pull request #63 from kunzaatko/main ... Fix: gpgsign fails the commit	2021-03-24 15:56:45 +01:00
blinry	9560254739	Merge branch 'main' into main	2021-03-24 15:56:30 +01:00
Martin Kunz	144388aa83	Fix: commit fails when gpgsign = true ... [Fixes: #62]	2021-03-24 15:44:57 +01:00
blinry	b5ca69264a	On Windows, compare paths case-insensitively for the purpose of careful_delete ... Fixes #27.	2021-03-24 15:38:53 +01:00
blinry	d44c7d0d49	Explicitly set pull.rebase = false, to avoid the long confusing warning ... Fixes #45.	2021-03-24 14:55:10 +01:00
blinry	9b7cc5de02	Merge pull request #64 from kunzaatko/patch-1 ... Fix: typo	2021-03-24 14:21:15 +01:00
blinry	1ca3e9d208	Merge pull request #58 from mundifex/simplify-stash-merge ... Simplify solution for level 'stash-merge' by adding recipe to index	2021-03-24 14:11:33 +01:00
blinry	6ff58f7354	Merge pull request #54 from mtreinik/main ... Fix goal and congrats messages	2021-03-24 14:11:04 +01:00
blinry	bb21bd7750	Merge pull request #52 from bepstein/main ... Move coffee branch chain to the main branch to fix the uneaten baguette.	2021-03-24 14:04:38 +01:00
Martin Kunz	c979939905	Fix: typo	2021-03-20 17:32:15 +01:00
Ben Donatelli	fd1a770a94	Simplify solution for level 'stash-merge' by adding recipe to index ... If recipe isn't part of index, user receives an error warning that local changes to file would be overwritten by merge when executing `git stash pop`. Since the focus of this lesson is learning about popping the stash, starting with recipe already added to index neatly sidesteps this error.	2021-03-11 20:53:13 -06:00
Mikko Reinikainen	d9b6165aa8	Fix goal and congrats messages	2021-03-10 08:17:26 +02:00
Ben Donatelli	b99510dea7	Force grep command to use UTF-8 locale in solution for 'reorder' level	2021-03-09 22:14:48 -06:00
Brian Epstein	5380212c88	Move coffee branch chain to the main branch to fix the uneaten baguette.	2021-03-09 17:12:54 -05:00
blinry	ec9b467cc6	Merge pull request #47 from ByteHamster/patch-1 ... Fixed description text of "remove tags" level	2021-03-09 18:29:35 +01:00
ByteHamster	432206ebfe	Fixed description text of "remove tags" level	2021-03-09 17:15:54 +01:00
blinry	41aba7d9cc	Make win condition in level about adding files case-insensitive ... Fixes #43.	2021-03-08 14:51:07 +01:00
blinry	087a77527e	Run game in fullscreen mode	2021-03-05 14:18:43 +01:00
blinry	5770fa6896	On Windows, wait until connection to bash has been established	2021-03-05 14:17:48 +01:00