Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2024-12-22 20:32:38 +01:00
Code Issues Projects Releases Packages Wiki Activity
520 commits 4 branches 22 tags 47 MiB
Commit graph

520 commits

This branch
This branch
All branches
Author SHA1 Message Date
blinry
76c4aab834 Quick implementation of the 3-layer files 2021-01-06 17:04:23 +01:00
blinry
e6b12b75f7 Beginning of remotes chapter 2021-01-06 13:10:32 +01:00
bleeptrack
d9a9498277 Merge remote-tracking branch 'origin/main' into main 2021-01-05 17:58:10 +01:00
bleeptrack
e457ed10c5 One merge level 2021-01-05 17:58:06 +01:00
blinry
779d03416f Tweaks to "shit-happens", like an ordering 2021-01-05 17:14:50 +01:00
blinry
12ea306302 shit-happens chapter :P 2021-01-05 16:58:42 +01:00
bleeptrack
9109394271 stashing 2021-01-05 16:44:17 +01:00
blinry
82b8e8f458 Reload button for level sequence. Order tag levels. 2021-01-05 13:27:52 +01:00
bleeptrack
aef7882dcb Merge remote-tracking branch 'origin/main' into main 2021-01-05 13:15:08 +01:00
bleeptrack
a629765f46 tag levels 2021-01-05 13:15:05 +01:00
blinry
77a5b9f9e7 Only trigger GitHub deploy workflow on tags 
We're doing a lot of half-baked prototyping in between. :D
 2021-01-05 13:12:21 +01:00
blinry
00ec6f6700 Reload card store when reloading a level 2021-01-05 13:08:43 +01:00
blinry
7c96367d72 Reload levels when entering the level select, and show titles in levels 2021-01-05 13:05:46 +01:00
blinry
e754671b88 First version of an "index" chapter 2021-01-05 12:59:48 +01:00
blinry
21d8366dbb Tweaks to jspricke's level improvements 
Especially, introduce a better way to count branches
 2021-01-04 13:57:39 +01:00
Jochen Sprickerhof
6141268bdd Advance after sandbox 
Make it an instant win so the "Next Level" button is displayed.
 2020-12-23 17:09:23 +01:00
Jochen Sprickerhof
d9d62d24c7 simplify bag (of chips) 
Otherwise the content is "An empty bag of chips. of chips".
 2020-12-23 16:57:42 +01:00
Jochen Sprickerhof
39551adf2b concert, birthday and main are three branches 2020-12-23 16:55:43 +01:00
blinry
8bfba3f0aa Simple title screen and level select menu 2020-12-23 12:01:32 +01:00
bleeptrack
2e6d30134c Merge remote-tracking branch 'origin/main' into main 2020-12-22 17:53:25 +01:00
bleeptrack
676dcadb81 tip system 2020-12-22 17:53:16 +01:00
blinry
497c8a81ea Friend level with some interactivity 2020-12-22 17:52:30 +01:00
bleeptrack
275ffc5ec4 adding actions 2020-12-22 17:04:01 +01:00
blinry
d8d48c245e Take hints on port 1235, hint script in user's PATH 2020-12-22 16:05:35 +01:00
blinry
cf10605bf4 game.notify() creates a popup 2020-12-22 15:38:43 +01:00
bleeptrack
34841c496b Show win states in level description 2020-12-22 12:44:07 +01:00
blinry
9cfbd9ff96 Allow splitting win conditions in multiple parts 2020-12-22 12:13:40 +01:00
bleeptrack
04e48a8bf2 Fix MacOS Crash because of sed -r option 
closes #9.
 2020-11-17 10:53:22 +01:00
blinry
803f4f897a "branch-remove" level 2020-11-13 12:27:37 +01:00
bleeptrack
3904abb6c4 branch create level 2020-11-13 12:23:14 +01:00
bleeptrack
91e5f3749a Merge remote-tracking branch 'origin/main' 2020-11-13 11:43:28 +01:00
bleeptrack
54ae7ce3a8 file-delete level 2020-11-13 11:43:22 +01:00
blinry
adfc753096 "move file" level 2020-11-13 11:36:05 +01:00
blinry
f742085fd1 Add a "create files" level 2020-11-13 11:21:36 +01:00
blinry
5311e1d469 Explain how to open the project in the Godot editor and how to build binaries 
Closes #4.
 2020-11-10 23:40:42 +01:00
blinry
898f276eba Make fonts 15% larger 
This should help make the game more accessible, and reduce font
rendering issues. Closes #5.
 2020-11-10 23:23:10 +01:00
blinry
9a9541a858 Close all open editors when running a terminal command 
This is a first workaround for the problem that editors are sometimes
out of date. The UI around these will probably continue to change
significantly. Closes #7.
 2020-11-10 22:52:48 +01:00
blinry
0e2cacabce Make terminal not react to hotkeys, unless focused 
Closes #8.
 2020-11-10 22:45:03 +01:00
blinry
4d97430d44 Fix warnings 2020-11-10 22:45:03 +01:00
blinry
d57674acca Allow cards with [string] parameters 2020-11-10 22:44:52 +01:00
blinry
4fa9b27354 Always show index and working directory 
Seems confusing to have them disappear?
 2020-11-10 21:51:59 +01:00
bleeptrack
39e62eb8cf New File Popup (no function) 2020-11-10 18:34:51 +01:00
bleeptrack
563f6ba835 Delete Files via Popup Menue 2020-11-10 18:22:24 +01:00
blinry
107d6f8fb1 Show deleted files in the working directory and the index 2020-11-10 15:28:37 +01:00
bleeptrack
20358f78a1 Tween animation for highlights 2020-11-10 12:42:47 +01:00
bleeptrack
45442dd549 Shader as Target Highlights 2020-11-10 12:14:45 +01:00
blinry
8760ad7178 Enable files' drop area, two levels about the index 2020-11-09 21:00:18 +01:00
blinry
a893cba9d3 When yielding after an async command, call the rest deferred 
This might help fix the crash bug?
 2020-11-09 19:37:26 +01:00
blinry
38faac5485 Make drop areas react to collision with "cursor" scene 
This is a preparation to allow drop areas on GUI elements.
 2020-11-07 14:08:15 +01:00
blinry
f6c7ef90d8 Update the FileBrowser when saving a file 
Status icons could have been changed.
 2020-11-03 17:06:22 +01:00