Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 31b7b5ea0c | |||
| 78ab2cc637 |
@@ -59,6 +59,11 @@ jobs:
|
|||||||
mkdir -v -p build/windows
|
mkdir -v -p build/windows
|
||||||
godot --headless --verbose --build-solutions --export-release "Windows Desktop" build/windows/${{ env.GAME_NAME }}.exe
|
godot --headless --verbose --build-solutions --export-release "Windows Desktop" build/windows/${{ env.GAME_NAME }}.exe
|
||||||
zip -r Windows.zip build/windows
|
zip -r Windows.zip build/windows
|
||||||
|
- name: Build Windows ARM
|
||||||
|
run: |
|
||||||
|
mkdir -v -p build/windowsArm
|
||||||
|
godot --headless --verbose --build-solutions --export-release "Windows ARM" build/windowsArm/${{ env.GAME_NAME }}.exe
|
||||||
|
zip -r WindowsArm.zip build/windowsArm
|
||||||
# - name: Linux Build
|
# - name: Linux Build
|
||||||
# run: |
|
# run: |
|
||||||
# mkdir -v -p build/linux
|
# mkdir -v -p build/linux
|
||||||
@@ -79,6 +84,15 @@ jobs:
|
|||||||
buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
|
buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
|
||||||
gameData: Windows.zip
|
gameData: Windows.zip
|
||||||
buildChannel: windows
|
buildChannel: windows
|
||||||
|
- name: Upload to Itch
|
||||||
|
uses: KikimoraGames/itch-publish@v0.0.3
|
||||||
|
with:
|
||||||
|
butlerApiKey: ${{ secrets.BUTLER_TOKEN }}
|
||||||
|
itchUsername: ${{ env.ITCHIO_USERNAME }}
|
||||||
|
itchGameId: ${{ env.ITCHIO_GAMEID }}
|
||||||
|
buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
|
||||||
|
gameData: WindowsArm.zip
|
||||||
|
buildChannel: windows-arm
|
||||||
# - name: Upload to Itch
|
# - name: Upload to Itch
|
||||||
# uses: KikimoraGames/itch-publish@v0.0.3
|
# uses: KikimoraGames/itch-publish@v0.0.3
|
||||||
# with:
|
# with:
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -26,7 +26,7 @@ debug/export_console_wrapper=1
|
|||||||
binary_format/embed_pck=false
|
binary_format/embed_pck=false
|
||||||
texture_format/s3tc_bptc=true
|
texture_format/s3tc_bptc=true
|
||||||
texture_format/etc2_astc=false
|
texture_format/etc2_astc=false
|
||||||
shader_baker/enabled=false
|
shader_baker/enabled=true
|
||||||
binary_format/architecture="x86_64"
|
binary_format/architecture="x86_64"
|
||||||
ssh_remote_deploy/enabled=false
|
ssh_remote_deploy/enabled=false
|
||||||
ssh_remote_deploy/host="user@host_ip"
|
ssh_remote_deploy/host="user@host_ip"
|
||||||
@@ -125,55 +125,6 @@ texture_format/etc2=false
|
|||||||
|
|
||||||
[preset.2]
|
[preset.2]
|
||||||
|
|
||||||
name="Web"
|
|
||||||
platform="Web"
|
|
||||||
runnable=true
|
|
||||||
advanced_options=false
|
|
||||||
dedicated_server=false
|
|
||||||
custom_features=""
|
|
||||||
export_filter="all_resources"
|
|
||||||
include_filter=""
|
|
||||||
exclude_filter=""
|
|
||||||
export_path=""
|
|
||||||
patches=PackedStringArray()
|
|
||||||
encryption_include_filters=""
|
|
||||||
encryption_exclude_filters=""
|
|
||||||
seed=0
|
|
||||||
encrypt_pck=false
|
|
||||||
encrypt_directory=false
|
|
||||||
script_export_mode=2
|
|
||||||
|
|
||||||
[preset.2.options]
|
|
||||||
|
|
||||||
custom_template/debug=""
|
|
||||||
custom_template/release=""
|
|
||||||
variant/extensions_support=false
|
|
||||||
variant/thread_support=true
|
|
||||||
vram_texture_compression/for_desktop=true
|
|
||||||
vram_texture_compression/for_mobile=false
|
|
||||||
html/export_icon=true
|
|
||||||
html/custom_html_shell=""
|
|
||||||
html/head_include=""
|
|
||||||
html/canvas_resize_policy=2
|
|
||||||
html/focus_canvas_on_start=true
|
|
||||||
html/experimental_virtual_keyboard=false
|
|
||||||
progressive_web_app/enabled=false
|
|
||||||
progressive_web_app/ensure_cross_origin_isolation_headers=true
|
|
||||||
progressive_web_app/offline_page=""
|
|
||||||
progressive_web_app/display=1
|
|
||||||
progressive_web_app/orientation=0
|
|
||||||
progressive_web_app/icon_144x144=""
|
|
||||||
progressive_web_app/icon_180x180=""
|
|
||||||
progressive_web_app/icon_512x512=""
|
|
||||||
progressive_web_app/background_color=Color(0, 0, 0, 1)
|
|
||||||
threads/emscripten_pool_size=8
|
|
||||||
threads/godot_pool_size=4
|
|
||||||
dotnet/include_scripts_content=false
|
|
||||||
dotnet/include_debug_symbols=true
|
|
||||||
dotnet/embed_build_outputs=false
|
|
||||||
|
|
||||||
[preset.3]
|
|
||||||
|
|
||||||
name="macOS"
|
name="macOS"
|
||||||
platform="macOS"
|
platform="macOS"
|
||||||
runnable=true
|
runnable=true
|
||||||
@@ -192,7 +143,7 @@ encrypt_pck=false
|
|||||||
encrypt_directory=false
|
encrypt_directory=false
|
||||||
script_export_mode=2
|
script_export_mode=2
|
||||||
|
|
||||||
[preset.3.options]
|
[preset.2.options]
|
||||||
|
|
||||||
export/distribution_type=1
|
export/distribution_type=1
|
||||||
binary_format/architecture="universal"
|
binary_format/architecture="universal"
|
||||||
@@ -212,7 +163,7 @@ application/min_macos_version_x86_64="10.12"
|
|||||||
application/min_macos_version_arm64="11.00"
|
application/min_macos_version_arm64="11.00"
|
||||||
application/export_angle=0
|
application/export_angle=0
|
||||||
display/high_res=true
|
display/high_res=true
|
||||||
shader_baker/enabled=false
|
shader_baker/enabled=true
|
||||||
application/additional_plist_content=""
|
application/additional_plist_content=""
|
||||||
xcode/platform_build="14C18"
|
xcode/platform_build="14C18"
|
||||||
xcode/sdk_version="13.1"
|
xcode/sdk_version="13.1"
|
||||||
@@ -430,3 +381,74 @@ dotnet/include_scripts_content=false
|
|||||||
dotnet/include_debug_symbols=true
|
dotnet/include_debug_symbols=true
|
||||||
dotnet/embed_build_outputs=false
|
dotnet/embed_build_outputs=false
|
||||||
application/min_macos_version="10.12"
|
application/min_macos_version="10.12"
|
||||||
|
|
||||||
|
[preset.3]
|
||||||
|
|
||||||
|
name="Windows ARM"
|
||||||
|
platform="Windows Desktop"
|
||||||
|
runnable=false
|
||||||
|
advanced_options=false
|
||||||
|
dedicated_server=false
|
||||||
|
custom_features=""
|
||||||
|
export_filter="all_resources"
|
||||||
|
include_filter=""
|
||||||
|
exclude_filter=""
|
||||||
|
export_path=""
|
||||||
|
patches=PackedStringArray()
|
||||||
|
encryption_include_filters=""
|
||||||
|
encryption_exclude_filters=""
|
||||||
|
seed=0
|
||||||
|
encrypt_pck=false
|
||||||
|
encrypt_directory=false
|
||||||
|
script_export_mode=2
|
||||||
|
|
||||||
|
[preset.3.options]
|
||||||
|
|
||||||
|
custom_template/debug=""
|
||||||
|
custom_template/release=""
|
||||||
|
debug/export_console_wrapper=1
|
||||||
|
binary_format/embed_pck=false
|
||||||
|
texture_format/s3tc_bptc=true
|
||||||
|
texture_format/etc2_astc=false
|
||||||
|
shader_baker/enabled=true
|
||||||
|
binary_format/architecture="arm64"
|
||||||
|
codesign/enable=false
|
||||||
|
codesign/timestamp=true
|
||||||
|
codesign/timestamp_server_url=""
|
||||||
|
codesign/digest_algorithm=1
|
||||||
|
codesign/description=""
|
||||||
|
codesign/custom_options=PackedStringArray()
|
||||||
|
application/modify_resources=true
|
||||||
|
application/icon=""
|
||||||
|
application/console_wrapper_icon=""
|
||||||
|
application/icon_interpolation=4
|
||||||
|
application/file_version=""
|
||||||
|
application/product_version=""
|
||||||
|
application/company_name=""
|
||||||
|
application/product_name=""
|
||||||
|
application/file_description=""
|
||||||
|
application/copyright=""
|
||||||
|
application/trademarks=""
|
||||||
|
application/export_angle=0
|
||||||
|
application/export_d3d12=0
|
||||||
|
application/d3d12_agility_sdk_multiarch=true
|
||||||
|
ssh_remote_deploy/enabled=false
|
||||||
|
ssh_remote_deploy/host="user@host_ip"
|
||||||
|
ssh_remote_deploy/port="22"
|
||||||
|
ssh_remote_deploy/extra_args_ssh=""
|
||||||
|
ssh_remote_deploy/extra_args_scp=""
|
||||||
|
ssh_remote_deploy/run_script="Expand-Archive -LiteralPath '{temp_dir}\\{archive_name}' -DestinationPath '{temp_dir}'
|
||||||
|
$action = New-ScheduledTaskAction -Execute '{temp_dir}\\{exe_name}' -Argument '{cmd_args}'
|
||||||
|
$trigger = New-ScheduledTaskTrigger -Once -At 00:00
|
||||||
|
$settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries
|
||||||
|
$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings
|
||||||
|
Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true
|
||||||
|
Start-ScheduledTask -TaskName godot_remote_debug
|
||||||
|
while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }
|
||||||
|
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"
|
||||||
|
ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
|
||||||
|
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
|
||||||
|
Remove-Item -Recurse -Force '{temp_dir}'"
|
||||||
|
dotnet/include_scripts_content=false
|
||||||
|
dotnet/include_debug_symbols=true
|
||||||
|
dotnet/embed_build_outputs=false
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
[gd_scene load_steps=19 format=3 uid="uid://dmkw8cmalm5k"]
|
[gd_scene load_steps=20 format=3 uid="uid://dmkw8cmalm5k"]
|
||||||
|
|
||||||
[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_2vsi6"]
|
[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_2vsi6"]
|
||||||
[ext_resource type="Texture2D" uid="uid://ca4kkq3w8cd4n" path="res://assets/sky/sky_15_2k.png" id="2_ruo5i"]
|
[ext_resource type="Texture2D" uid="uid://ca4kkq3w8cd4n" path="res://assets/sky/sky_15_2k.png" id="2_ruo5i"]
|
||||||
@@ -14,6 +14,7 @@
|
|||||||
[ext_resource type="PackedScene" uid="uid://c066hc7yu36wx" path="res://assets/water/water.tscn" id="12_i2xii"]
|
[ext_resource type="PackedScene" uid="uid://c066hc7yu36wx" path="res://assets/water/water.tscn" id="12_i2xii"]
|
||||||
[ext_resource type="PackedScene" uid="uid://gir68sk3762e" path="res://assets/lift/lift.tscn" id="13_eca4n"]
|
[ext_resource type="PackedScene" uid="uid://gir68sk3762e" path="res://assets/lift/lift.tscn" id="13_eca4n"]
|
||||||
[ext_resource type="CylinderMesh" uid="uid://bhkbwvuft1bpg" path="res://systems/weapon/weapon_tuto.tres" id="14_0ari0"]
|
[ext_resource type="CylinderMesh" uid="uid://bhkbwvuft1bpg" path="res://systems/weapon/weapon_tuto.tres" id="14_0ari0"]
|
||||||
|
[ext_resource type="Script" uid="uid://v4nnql2laqdn" path="res://systems/weapon/placed_tutorial_weapon.gd" id="15_165wb"]
|
||||||
|
|
||||||
[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_feb1n"]
|
[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_feb1n"]
|
||||||
panorama = ExtResource("2_ruo5i")
|
panorama = ExtResource("2_ruo5i")
|
||||||
@@ -46,7 +47,7 @@ size = Vector3(11.5, 9, 4.5)
|
|||||||
[node name="Main" type="Node3D"]
|
[node name="Main" type="Node3D"]
|
||||||
|
|
||||||
[node name="Player" parent="." node_paths=PackedStringArray("TutorialWeaponTarget") instance=ExtResource("1_2vsi6")]
|
[node name="Player" parent="." node_paths=PackedStringArray("TutorialWeaponTarget") instance=ExtResource("1_2vsi6")]
|
||||||
transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, -15.285732, -78.24933, 121.65933)
|
transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, -1.2857323, -132.74933, 116.15933)
|
||||||
collision_layer = 17
|
collision_layer = 17
|
||||||
TutorialWeaponTarget = NodePath("../PlacedTutorialWeapon/WeaponLocationTarget")
|
TutorialWeaponTarget = NodePath("../PlacedTutorialWeapon/WeaponLocationTarget")
|
||||||
|
|
||||||
@@ -95,6 +96,7 @@ lift_time = 15.0
|
|||||||
[node name="PlacedTutorialWeapon" type="MeshInstance3D" parent="."]
|
[node name="PlacedTutorialWeapon" type="MeshInstance3D" parent="."]
|
||||||
transform = Transform3D(-2, 3.019916e-07, 0, -3.019916e-07, -2, 0, 0, 0, 2, -17.904, -79.265, 145.317)
|
transform = Transform3D(-2, 3.019916e-07, 0, -3.019916e-07, -2, 0, 0, 0, 2, -17.904, -79.265, 145.317)
|
||||||
mesh = ExtResource("14_0ari0")
|
mesh = ExtResource("14_0ari0")
|
||||||
|
script = ExtResource("15_165wb")
|
||||||
|
|
||||||
[node name="SpotLight3D" type="SpotLight3D" parent="PlacedTutorialWeapon"]
|
[node name="SpotLight3D" type="SpotLight3D" parent="PlacedTutorialWeapon"]
|
||||||
transform = Transform3D(1, -1.509958e-07, 6.600236e-15, 0, -4.371139e-08, -1, 1.509958e-07, 1, -4.371139e-08, 0, -2.3931274, 0)
|
transform = Transform3D(1, -1.509958e-07, 6.600236e-15, 0, -4.371139e-08, -1, 1.509958e-07, 1, -4.371139e-08, 0, -2.3931274, 0)
|
||||||
@@ -113,4 +115,14 @@ collision_mask = 16
|
|||||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7500105, 4, 0.7499695)
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7500105, 4, 0.7499695)
|
||||||
shape = SubResource("BoxShape3D_0ari0")
|
shape = SubResource("BoxShape3D_0ari0")
|
||||||
|
|
||||||
|
[node name="WeaponRetrieved" type="Area3D" parent="."]
|
||||||
|
transform = Transform3D(0.9961947, 0, -0.08715574, 0, 1, 0, 0.08715574, 0, 0.9961947, -18, -79, 145)
|
||||||
|
collision_layer = 0
|
||||||
|
collision_mask = 16
|
||||||
|
|
||||||
|
[node name="CollisionShape3D" type="CollisionShape3D" parent="WeaponRetrieved"]
|
||||||
|
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7500105, 4, 0.7499695)
|
||||||
|
shape = SubResource("BoxShape3D_0ari0")
|
||||||
|
|
||||||
[connection signal="body_entered" from="TutorialDoneArea" to="Player" method="OnTutorialDone"]
|
[connection signal="body_entered" from="TutorialDoneArea" to="Player" method="OnTutorialDone"]
|
||||||
|
[connection signal="body_entered" from="WeaponRetrieved" to="PlacedTutorialWeapon" method="_on_weapon_retrieved_body_entered"]
|
||||||
|
|||||||
5
systems/weapon/placed_tutorial_weapon.gd
Normal file
5
systems/weapon/placed_tutorial_weapon.gd
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
extends MeshInstance3D
|
||||||
|
|
||||||
|
|
||||||
|
func _on_weapon_retrieved_body_entered(body: Node3D) -> void:
|
||||||
|
visible = false
|
||||||
1
systems/weapon/placed_tutorial_weapon.gd.uid
Normal file
1
systems/weapon/placed_tutorial_weapon.gd.uid
Normal file
@@ -0,0 +1 @@
|
|||||||
|
uid://v4nnql2laqdn
|
||||||
Reference in New Issue
Block a user