Commit graph

490 commits

Author SHA1 Message Date
Morten Minde Neergaard
c64e8f276a terminal: Change input handling
1. Handle page up / down for scrolling terminal history
2. Handle repeat keypresses, so e.g. holding pgdn will scroll
3. _input is passed a single event, so we save some CPU cycles by using
   `elif` for all branches
2025-03-25 12:37:53 -04:00
Morten Minde Neergaard
88eeef9a68 terminal: handle basic coloring
This closes issue 
2025-03-25 12:33:46 -04:00
Morten Minde Neergaard
f4a1230e77 fake-editor: Prefix save message with an "s"
With this, we can distinguish "save" from "close"

This fixes issue 
2025-03-25 12:30:10 -04:00
Morten Minde Neergaard
751b3b24a3 TCP port listen: Fix the hint server as well 2025-03-25 12:18:28 -04:00
Morten Minde Neergaard
00d940fb86 TCP connections: Only listen to localhost, not all interfaces 2025-03-25 12:18:28 -04:00
Charles Haines
290798d774 Fix spelling error in level stash-merge 2025-03-24 12:06:16 -04:00
Pablo Dobry
7f2fa3039f Fix control in [win] seccion on checkout-commit 2025-03-24 12:05:45 -04:00
blinry
c92afeaf55 Merge local version and GitHub version 2025-03-24 16:40:28 +01:00
blinry
fd34a36b6d Merge branch 'main' of github.com:git-learning-game/oh-my-git 2025-03-24 16:39:15 +01:00
bleeptrack
fbe95c3580
Merge pull request from wyattscarpenter/patch-1
Update reflog: Grammar
2024-08-22 11:26:29 +02:00
wyattscarpenter
1a8fe69f7a
Update reflog: Grammar
This commit is comprised of three changes; two stylistic and one grammatical error fix:

1. change "commit in the past" to "past commit", which flows better in the sentence

2. change "on which past commit you were before" to "which past commit you were on before". While both sentences are grammatical, the former is likely to confuse the reader momentarily because the "on" has to take a long and unexpected journey to land in between "were" and "before".

3. "your HEAD did point to" to "your HEAD has pointed to". This changes the tense to present perfect, which is correct in this circumstance.

The commas in the description are technically ungrammatical, or would be judged so by some, but I like the tone they convey, so I left them.
2024-08-22 01:28:06 -07:00
Marcel Ribeiro-Dantas
9da0bd1fbd Fix typos 2024-02-13 15:20:04 +01:00
bleeptrack
ce9fcda773
Merge pull request 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 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  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
b09b5f0e11 Move to butler-publish-itchio-action@v1.0.3 2022-07-21 12:22:28 +02:00
blinry
853b8e2d53
Merge pull request 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 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 from kmomberg/fix-revert-card-desc
Fix typo in revert description card
2022-07-19 14:45:46 +02:00
blinry
30fd0c184c Change link on the closing page to open our Patreon pages 2022-07-19 14:43:36 +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 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 from MK-UDUE/patch-2
Suggesting pushing rather than pulling
2021-05-10 12:16:02 +02:00
blinry
5e0af1d2f1
Merge pull request from nikopp/patch-1
Fixed typo in reflog description.
2021-05-10 12:15:28 +02:00
blinry
2bb5d4c4b3
Merge pull request from artt/patch-1
Fixed typo in files > add level
2021-05-10 12:15:00 +02:00
blinry
5b8fc43026
Merge pull request 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 from mundifex/stash-deadlock-fix
Fix deadlock in stash levels
2021-04-12 16:48:31 +02:00
blinry
b8a18c4c2e
Merge pull request 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 .
2021-04-12 16:23:59 +02:00
blinry
ffadebb0df Simplify careful_delete even more by relying on user:// on each OS
Closes .
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 , closes .
2021-04-12 15:49:20 +02:00
blinry
2b3903a599 Clarify instructions for the "Moving branches around" level
Closes .
2021-04-12 15:22:02 +02:00
blinry
74b59cff0a Double-check that players solved the "merging timelines" level correctly
Fixes .
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 from blanorama/patch-1
fix: typo in level stash
2021-03-30 18:10:58 +02:00
blinry
3e5c422663
Merge pull request 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 
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 
2021-03-26 20:38:15 -05:00
blinry
f8f562b742
Merge pull request 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 from kunzaatko/main
Fix: gpgsign fails the commit
2021-03-24 15:56:45 +01:00