diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index 6bf22be6..d73d1e21 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -83,6 +83,8 @@ jobs: Export: runs-on: godot + env: + RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache needs: - BumpTag @@ -105,6 +107,7 @@ jobs: run: | mkdir -v -p build/windows ${{ steps.setup-godot.outputs.godot_bin }} --headless --verbose --export-release "Windows Desktop" build/windows/${{ env.GAME_NAME }}.exe + ls -la build/windows # - name: Setup Butler # shell: bash diff --git a/.gitea/workflows/release-branch.yaml b/.gitea/workflows/release-branch.yaml index cd1c49a7..f45472bf 100644 --- a/.gitea/workflows/release-branch.yaml +++ b/.gitea/workflows/release-branch.yaml @@ -63,6 +63,7 @@ jobs: run: | mkdir -v -p build/windows ${{ steps.setup-godot.outputs.godot_bin }} --headless --verbose --build-solutions --export-release "Windows Desktop" build/windows/${{ env.GAME_NAME }}.exe + ls -la build/windows zip -r Windows.zip build/windows - name: Upload Windows to itch.io shell: bash @@ -79,7 +80,7 @@ jobs: mkdir -v -p build/windowsArm ${{ steps.setup-godot.outputs.godot_bin }} --headless --verbose --build-solutions --export-release "Windows ARM" build/windowsArm/${{ env.GAME_NAME }}.exe zip -r WindowsArm.zip build/windowsArm - - name: Upload Windows to itch.io + - name: Upload Windows ARM to itch.io shell: bash env: BUTLER_API_KEY: ${{ secrets.BUTLER_TOKEN }} @@ -94,7 +95,7 @@ jobs: mkdir -v -p build/linux ${{ steps.setup-godot.outputs.godot_bin }} --headless --verbose --export-release "Linux/X11" build/linux/${{ env.GAME_NAME }}.x86_64 zip -r Linux.zip build/linux - - name: Upload Windows to itch.io + - name: Upload Linux to itch.io shell: bash env: BUTLER_API_KEY: ${{ secrets.BUTLER_TOKEN }} @@ -109,7 +110,7 @@ jobs: mkdir -v -p build/mac ${{ steps.setup-godot.outputs.godot_bin }} --headless --verbose --export-release "macOS" build/mac/${{ env.GAME_NAME }}.zip zip -r Mac.zip build/mac - - name: Upload Windows to itch.io + - name: Upload Mac to itch.io shell: bash env: BUTLER_API_KEY: ${{ secrets.BUTLER_TOKEN }} diff --git a/.gitignore b/.gitignore index 82c2b023..b6a141fa 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ *.suo *.user _ReSharper.* +*.DotSettings.user bin obj packages diff --git a/Movement tests.csproj b/Movement tests.csproj index 5ad057f8..48481545 100644 --- a/Movement tests.csproj +++ b/Movement tests.csproj @@ -125,27 +125,13 @@ - - + - - - - - - - - - - - - - @@ -156,5 +142,4 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - \ No newline at end of file diff --git a/Movement tests.sln.DotSettings.user b/Movement tests.sln.DotSettings.user deleted file mode 100644 index 24317e8e..00000000 --- a/Movement tests.sln.DotSettings.user +++ /dev/null @@ -1,15 +0,0 @@ - - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - - - <SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"> - <Solution /> -</SessionState> - D:\Godot\Projects\movement-tests\.runsettings - True \ No newline at end of file diff --git a/global.json b/global.json deleted file mode 100644 index 802ab217..00000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "test": { - "runner": "Microsoft.Testing.Platform" - } -} \ No newline at end of file diff --git a/maps/levels/2 - tuto_sword.tscn b/maps/levels/2 - tuto_sword.tscn index 42bd22d6..49df4614 100644 --- a/maps/levels/2 - tuto_sword.tscn +++ b/maps/levels/2 - tuto_sword.tscn @@ -770,3 +770,10 @@ transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, -0.5, 0, 0) [node name="PlayerFellRespawn" parent="." index="10" unique_id=479136076] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 1.5, 0) + +[node name="OmniLight3D" type="OmniLight3D" parent="." index="13" unique_id=702421172] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 25, 4) + +[node name="OmniLight3D2" type="OmniLight3D" parent="." index="14" unique_id=2016820716] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 25, -9.5) +omni_range = 12.0 diff --git a/xunit.runner.json b/xunit.runner.json deleted file mode 100644 index 86c7ea05..00000000 --- a/xunit.runner.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json" -}