Commit graph

494 commits

Author SHA1 Message Date
Andrea Leon Cavallo
292a34c8bb Merge branch 'intro-levels-translation' of github.com:aleoncavallo/oh-my-git-es into intro-levels-translation 2024-06-05 00:38:28 -03:00
Andrea Leon Cavallo
675e3bfe5a elimino card al final de commit 2024-06-05 00:37:41 -03:00
Ana Murinigo
579d58dccd
Adding more # remote 2024-06-05 00:28:12 -03:00
Ana Murinigo
cae2296e5f
Adding # remote 2024-06-05 00:26:09 -03:00
Ana Murinigo
9e20ecc55b
Adding # in win init 2024-06-05 00:19:37 -03:00
Ana Murinigo
3371fbe331
Deleting enter commit 2024-06-05 00:16:46 -03:00
Ana Murinigo
f7c08c1027
Update remote 2024-06-04 00:30:05 -03:00
Ana Murinigo
e2dfb8991c
Fixing minor bugs and deleting duplicated code commit 2024-06-04 00:26:11 -03:00
Ana Murinigo
d9c1ea2895
Deleting duplicate parragraph commit 2024-06-04 00:19:01 -03:00
Ana Murinigo
8391983ae2
Translate who-are-you 2024-06-03 23:23:34 -03:00
Ana Murinigo
e1bdd6a2ae
Translate risky 2024-06-03 23:22:12 -03:00
Ana Murinigo
e95a3e0023
Translate remote 2024-06-03 23:21:01 -03:00
Ana Murinigo
424f5e0429
Translate cli 2024-06-03 23:18:40 -03:00
Ana Murinigo
6b28416d15
Translate commit 2024-06-03 23:17:13 -03:00
Ana Murinigo
b780fe7bc1
Translate init 2024-06-03 23:10:26 -03:00
Ana Murinigo
de464442aa
Translate copies 2024-06-03 23:09:44 -03:00
aleoncavallo
590a256b13
translate cards.json 2024-06-01 21:06:03 -03:00
Marcel Ribeiro-Dantas
9da0bd1fbd Fix typos 2024-02-13 15:20:04 +01:00
bleeptrack
ce9fcda773
Merge pull request #173 from derNiklaas/fix-readme-logo
Fixed Logos for organizations that fund the project
2023-05-11 14:08:37 +02:00
bleeptrack
2aeef1d053
Merge pull request #174 from Jayman2000/clarify-godot-requirements
Clarify Godot requirements
2023-05-11 14:07:37 +02:00
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
Niklas
70c0d5576f
Removed lines left over from pasting the images 2023-04-18 16:19:51 +02:00
Niklas
73966b27bb
Fixed Logos for organizations that fund the project 2023-04-18 16:18:09 +02: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