From fa173f1e87db4887b26356ea4241807d4667ec39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20Sobczy=C5=84ski?= <32263891+h4570@users.noreply.github.com> Date: Sun, 28 Aug 2022 16:51:46 +0200 Subject: [PATCH 1/2] Update README.MD --- README.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.MD b/README.MD index 9789b67..08abca2 100644 --- a/README.MD +++ b/README.MD @@ -56,7 +56,7 @@ Decision was simple - I need to create an engine which will handle 3D file loadi ### Tutorials * 01 - Setup environment - [Text tutorial](https://github.com/h4570/tyra/tree/master/docs/install) or [Video](https://www.youtube.com/watch?v=9IXOU1SPdzc) * 02 - Cooking game assets - [Video](https://www.youtube.com/watch?v=LjO71ovPFJs) -* 03 - Create game from template - [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH) +* 03 - Create a game repository - [Video](https://www.youtube.com/watch?v=DKfIKar3GUM) * 04 - Run game from USB in PS2 - [Video (soon)](https://www.youtube.com/playlist?list=PLdQVLBcXRRWvtMi-OqccDWLTEFEisD5RH) --- * 01 - [Code](https://github.com/h4570/tyra/tree/master/tutorials/01-hello) - Hello world From 822663f95e45a7f7a65cc35c21b7f01f1917b223 Mon Sep 17 00:00:00 2001 From: h4570 Date: Sun, 28 Aug 2022 17:21:10 +0200 Subject: [PATCH 2/2] true fix --- .vscode/configurations/windows-docker/tasks.json | 4 ++-- template/.vscode/configurations/windows-docker/tasks.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.vscode/configurations/windows-docker/tasks.json b/.vscode/configurations/windows-docker/tasks.json index d5c81c8..3e94ea5 100644 --- a/.vscode/configurations/windows-docker/tasks.json +++ b/.vscode/configurations/windows-docker/tasks.json @@ -60,12 +60,12 @@ { "type": "shell", "label": "Send to PS2", - "command": "docker exec -t tyra-compiler sh -c 'cd ${config:buildDirectory}/bin && killall -v ps2client || true && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} execee host:$(find . -maxdepth 1 -type f -name \"*.elf\")'" + "command": "docker exec -t tyra-compiler sh -c 'cd ${config:buildDirectory}/bin && killall -v ps2client || $true && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} execee host:$(find . -maxdepth 1 -type f -name \"*.elf\")'" }, { "type": "shell", "label": "Open PS2 output logger", - "command": "docker stop ps2-logs || true && docker run -t --rm --name=ps2-logs -p ${input:local2Ip}:18194:18194/udp h4570/tyra sh -c 'ps2client -h ${input:ps2Ip} listen'", + "command": "docker stop ps2-logs || $true && docker run -t --rm --name=ps2-logs -p ${input:local2Ip}:18194:18194/udp h4570/tyra sh -c 'ps2client -h ${input:ps2Ip} listen'", "runOptions": { "instanceLimit": 1 }, diff --git a/template/.vscode/configurations/windows-docker/tasks.json b/template/.vscode/configurations/windows-docker/tasks.json index 9e69f8e..3ad0777 100644 --- a/template/.vscode/configurations/windows-docker/tasks.json +++ b/template/.vscode/configurations/windows-docker/tasks.json @@ -65,7 +65,7 @@ { "type": "shell", "label": "Send to PS2", - "command": "docker exec -t tyra-game-compiler sh -c 'cd ${config:buildDirectory}/bin && killall -v ps2client || true && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} execee host:$(find . -maxdepth 1 -type f -name \"*.elf\")'" + "command": "docker exec -t tyra-game-compiler sh -c 'cd ${config:buildDirectory}/bin && killall -v ps2client || $true && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} reset && ps2client -h ${input:ps2Ip} execee host:$(find . -maxdepth 1 -type f -name \"*.elf\")'" }, { "type": "shell",