Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2024-11-03 19:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity
413 commits 4 branches 22 tags 47 MiB
Commit graph

130 commits

Author SHA1 Message Date
blinry
023a98cfae config level, clone level, PR level 2021-01-07 17:35:08 +01:00
blinry
c99a35d54f Reorder levels and chapters into a better sequence 2021-01-07 12:57:31 +01:00
blinry
5c1f1ce722 Savegames! 2021-01-07 11:36:11 +01:00
blinry
76c4aab834 Quick implementation of the 3-layer files 2021-01-06 17:04:23 +01:00
blinry
82b8e8f458 Reload button for level sequence. Order tag levels. 2021-01-05 13:27:52 +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
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
blinry
f742085fd1 Add a "create files" level 2020-11-13 11:21:36 +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
bleeptrack
a725508dc8 Index Status Icons 2020-11-03 16:39:55 +01:00
blinry
f2b8a252a1 Set drop areas to "not highlighted" by default 2020-11-03 14:39:54 +01:00
blinry
751434c4d8 Enable actual command execution again, when playing cards 2020-11-03 13:08:07 +01:00
blinry
977a085940 Specify valid targets in cards' command, highlight them when dragged 2020-11-03 12:39:40 +01:00
blinry
3a3baa54fa When the history contains an entry like "git ", don't crash 2020-11-02 15:39:12 +01:00
blinry
664fefe2e5 Store reference to thread in ShellCommand 2020-11-02 15:34:00 +01:00
blinry
e220211140 Add run_async to shell, which should be more stable than the previous threading 
This might fix the "random crash" problem?
 2020-11-02 14:35:34 +01:00
blinry
53f60247f3 Disable file explorer popups for commits 
Our beta testers seemed to be confused by this and recommended removing
it.
 2020-10-30 19:41:15 +01:00
blinry
af78043251 Clip content inside of repository scene 2020-10-30 19:32:34 +01:00
blinry
c2763846c7 Manually rename branch to "main" after initializing 2020-10-30 13:02:34 +01:00
blinry
8548074be4 Always play pop sounds for commits and refs 2020-10-29 20:34:28 +01:00
blinry
c53f6aa009 Fix the "phantom commit" bug 
I don't know why this helps, and I think this causes trouble on Windows.
But it fixes this problem for tomorrow's playtesting! :)
 2020-10-29 20:16:46 +01:00
blinry
7740c43a62 Polish levels some more 2020-10-29 20:02:43 +01:00
blinry
951ebd4c59 Hide arrow target when HEAD is on branch 2020-10-29 17:41:25 +01:00
blinry
e7842fb4ee Show commit ID in file browser 2020-10-29 17:39:26 +01:00
blinry
617adc8e06 Build custom .gitconfig for the game environment 
Fixes #3.
 2020-10-29 17:30:12 +01:00
Sebastian Morr
25d8905df8 Refactor arrow scene, give it reversibility and color 2020-10-29 16:59:46 +01:00
Sebastian Morr
6b612c083d Draw HEAD under terminal popup 2020-10-29 16:17:04 +01:00
Sebastian Morr
c343546473 Make HEAD not draggable 2020-10-29 16:07:22 +01:00
Sebastian Morr
814caca382 Make single HEAD float to the center 2020-10-29 16:06:38 +01:00
Sebastian Morr
c49fa2f7d4 Show what HEAD points to when branch does not exist 2020-10-29 16:00:39 +01:00
Sebastian Morr
7d7b15e3fb Show single card properly upright 2020-10-29 15:58:26 +01:00
Sebastian Morr
eb4f46e52f Stating to polish the time travel levels... 2020-10-29 15:55:10 +01:00
Sebastian Morr
cb7742466b Make monster stand on nodes, other small fixes 2020-10-27 19:44:17 +01:00
bleeptrack
ea2c731cd3 File explorer document icon 2020-10-27 18:21:57 +01:00
bleeptrack
208ddd02c2 Cleanup leftover file browsers 2020-10-27 17:38:41 +01:00
bleeptrack
454520d3ae Working directory in RightSide 2020-10-27 17:32:41 +01:00
bleeptrack
a0abd40308 Merge remote-tracking branch 'origin/main' 2020-10-27 16:56:32 +01:00
bleeptrack
4ea0308bd6 remove prints 2020-10-27 16:55:06 +01:00
Sebastian Morr
ac2062bd5a First attempt of rearranging the elements better in horizontal layout 2020-10-27 16:53:19 +01:00
Sebastian Morr
00538ee581 Layout graphs in a horizontal direction 2020-10-27 16:10:02 +01:00
bleeptrack
4c1d70a99f Reordering Layout 2020-10-27 15:48:23 +01:00
Sebastian Morr
9f9548abcf Cards have images! 2020-10-27 13:15:43 +01:00
Sebastian Morr
3437b89ffc Levels specify which cards should be displayed 2020-10-27 13:15:43 +01:00
Sebastian Morr
f19d2bee8a Move card descriptions into resources/cards.json 2020-10-27 13:15:43 +01:00
bleeptrack
37adce3bb4 HEAD is now a monster 2020-10-27 13:11:15 +01:00
bleeptrack
85ad33a028 Adding inverted arrows that point along time 2020-10-27 12:58:38 +01:00
bleeptrack
10a130a913 Open only one file browser for commits 2020-10-27 12:15:45 +01:00
bleeptrack
5ab98677bd Do not open file browser on dragging commit node 2020-10-27 12:02:20 +01:00
bleeptrack
599270cd2b Temporarily remove hash on hover commit 2020-10-27 11:40:44 +01:00
bleeptrack
39de925a66 No pop sound on hidden blob 2020-10-27 11:38:04 +01:00
Sebastian Morr
448ed89ead Have fake-editor send the content of the file itself 
So we don't have to fetch the content from the outside.
 2020-10-26 21:29:11 +01:00
Sebastian Morr
8f70770107 Fix warnings 2020-10-26 19:56:52 +01:00
Sebastian Morr
2dc04b1682 Fix a problem where arrows sometimes disappear 2020-10-26 19:27:53 +01:00
Sebastian Morr
61304803bc Move all .tscn and .gd files into scenes/ directory 2020-10-26 19:16:22 +01:00