Compare commits

..

8 Commits

Author SHA1 Message Date
e39620ce52 F O G
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 16s
Create tag and build when new code gets to main / Export (push) Successful in 5m14s
2025-10-15 13:57:44 +02:00
7312b2b22b second part of city well on track
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 14s
Create tag and build when new code gets to main / Export (push) Successful in 3m36s
2025-10-14 23:15:55 +02:00
45e8ac2f3c mor city
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 9s
Create tag and build when new code gets to main / Export (push) Successful in 3m17s
2025-10-13 17:12:03 +02:00
46bea7ba14 more greyboxing
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 8s
Create tag and build when new code gets to main / Export (push) Successful in 3m17s
2025-10-07 10:28:11 +02:00
c35ce49669 more greyboxing
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 7s
Create tag and build when new code gets to main / Export (push) Successful in 3m9s
2025-10-03 16:55:24 +02:00
c1e8235895 moving away from blend files and using explicit imports through gltf
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 8s
Create tag and build when new code gets to main / Export (push) Successful in 3m37s
2025-10-03 15:45:40 +02:00
1813973daa weapon clip fix
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 7s
Create tag and build when new code gets to main / Export (push) Has been cancelled
2025-09-16 11:01:31 +02:00
7b036c5889 fixed mantle after dash bug
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 7s
Create tag and build when new code gets to main / Export (push) Failing after 2s
2025-09-16 10:28:41 +02:00
58 changed files with 3067 additions and 1308 deletions

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://2huty67y1g5w"
path="res://.godot/imported/Guard tower.glb-7dc55f179090ff4a70140c5e94077843.scn"
[deps]
source_file="res://assets/greyboxing/Guard tower.glb"
dest_files=["res://.godot/imported/Guard tower.glb-7dc55f179090ff4a70140c5e94077843.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/root_script=null
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_name_suffixes=true
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
materials/extract=0
materials/extract_format=0
materials/extract_path=""
_subresources={}
gltf/naming_version=2
gltf/embedded_image_handling=1

Binary file not shown.

View File

@@ -1,59 +0,0 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://b7w8cn15vsiy0"
path="res://.godot/imported/city.blend-135341795722816c412126e50c6067d4.scn"
[deps]
source_file="res://assets/greyboxing/city.blend"
dest_files=["res://.godot/imported/city.blend-135341795722816c412126e50c6067d4.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/root_script=null
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
nodes/use_name_suffixes=true
nodes/use_node_type_suffixes=true
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
materials/extract=0
materials/extract_format=0
materials/extract_path=""
_subresources={}
blender/nodes/visible=0
blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/export_geometry_nodes_instances=false
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true
gltf/naming_version=2

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d1w1flf6xdy6f"
path.bptc="res://.godot/imported/citrus_orchard_road_puresky_4k.exr-c4b50f0c95051d3e2f93c8d518de8eb8.bptc.ctex"
path.astc="res://.godot/imported/citrus_orchard_road_puresky_4k.exr-c4b50f0c95051d3e2f93c8d518de8eb8.astc.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/sky/citrus_orchard_road_puresky_4k.exr"
dest_files=["res://.godot/imported/citrus_orchard_road_puresky_4k.exr-c4b50f0c95051d3e2f93c8d518de8eb8.bptc.ctex", "res://.godot/imported/citrus_orchard_road_puresky_4k.exr-c4b50f0c95051d3e2f93c8d518de8eb8.astc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

View File

@@ -0,0 +1,9 @@
[gd_resource type="ProceduralSkyMaterial" format=3 uid="uid://bb4c25ot8f4rt"]
[resource]
sky_top_color = Color(0.68341744, 0.41567144, 0.87147236, 1)
sky_horizon_color = Color(0.9058611, 0.56007004, 0.5634753, 1)
ground_bottom_color = Color(0.68235296, 0.41568628, 0.87058824, 1)
ground_horizon_color = Color(0.90588236, 0.56078434, 0.5647059, 1)
ground_curve = 0.14420073
sun_angle_max = 10.0

BIN
assets/sky/sky_12_2k.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dtkyhk8q5qitp"
path.s3tc="res://.godot/imported/sky_12_2k.png-9ca073e8443d469e1cec2dec0d53efff.s3tc.ctex"
path.etc2="res://.godot/imported/sky_12_2k.png-9ca073e8443d469e1cec2dec0d53efff.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/sky/sky_12_2k.png"
dest_files=["res://.godot/imported/sky_12_2k.png-9ca073e8443d469e1cec2dec0d53efff.s3tc.ctex", "res://.godot/imported/sky_12_2k.png-9ca073e8443d469e1cec2dec0d53efff.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
assets/sky/sky_12_cubemap_2k/cubemap_layout.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://7v8n5l1jwqms"
path="res://.godot/imported/cubemap_layout.png-b6dae0db04ee7c9cbc9a7aadeb5ccab7.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/cubemap_layout.png"
dest_files=["res://.godot/imported/cubemap_layout.png-b6dae0db04ee7c9cbc9a7aadeb5ccab7.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_12_cubemap_2k/nx.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://hdkvbhxv74j6"
path="res://.godot/imported/nx.png-e15247724725306f62acfb90c21225be.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/nx.png"
dest_files=["res://.godot/imported/nx.png-e15247724725306f62acfb90c21225be.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_12_cubemap_2k/ny.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b5i6hyvrf6wr6"
path="res://.godot/imported/ny.png-edb2c080597642cc467608a8c1b7d3bd.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/ny.png"
dest_files=["res://.godot/imported/ny.png-edb2c080597642cc467608a8c1b7d3bd.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_12_cubemap_2k/nz.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bujopqmkixx3e"
path="res://.godot/imported/nz.png-af180c68b72cd850f86875d2f15512e2.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/nz.png"
dest_files=["res://.godot/imported/nz.png-af180c68b72cd850f86875d2f15512e2.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_12_cubemap_2k/px.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://balk16vpipwxi"
path="res://.godot/imported/px.png-7ea47271df79321386b0e32cb687208d.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/px.png"
dest_files=["res://.godot/imported/px.png-7ea47271df79321386b0e32cb687208d.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_12_cubemap_2k/py.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cf2j8rtis5j7m"
path="res://.godot/imported/py.png-0d93a31a98aa56298cb968aa366790ff.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/py.png"
dest_files=["res://.godot/imported/py.png-0d93a31a98aa56298cb968aa366790ff.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_12_cubemap_2k/pz.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bm7ihmtlp53ae"
path="res://.godot/imported/pz.png-651528e7a908f53bf85a39c4afb837c5.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_12_cubemap_2k/pz.png"
dest_files=["res://.godot/imported/pz.png-651528e7a908f53bf85a39c4afb837c5.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_2k.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,42 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ca4kkq3w8cd4n"
path.s3tc="res://.godot/imported/sky_15_2k.png-635fc4f2c92a6d84fbe74d4b06ec849b.s3tc.ctex"
path.etc2="res://.godot/imported/sky_15_2k.png-635fc4f2c92a6d84fbe74d4b06ec849b.etc2.ctex"
metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://assets/sky/sky_15_2k.png"
dest_files=["res://.godot/imported/sky_15_2k.png-635fc4f2c92a6d84fbe74d4b06ec849b.s3tc.ctex", "res://.godot/imported/sky_15_2k.png-635fc4f2c92a6d84fbe74d4b06ec849b.etc2.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

BIN
assets/sky/sky_15_cubemap_2k/cubemap_layout.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d1glcaopf33pm"
path="res://.godot/imported/cubemap_layout.png-6cd743dfe803537ed52cf90d8f87fc09.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/cubemap_layout.png"
dest_files=["res://.godot/imported/cubemap_layout.png-6cd743dfe803537ed52cf90d8f87fc09.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_cubemap_2k/nx.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ha35oqdprgxn"
path="res://.godot/imported/nx.png-9940f01cf2d318eac22e77aed0924dea.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/nx.png"
dest_files=["res://.godot/imported/nx.png-9940f01cf2d318eac22e77aed0924dea.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_cubemap_2k/ny.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://7nv6cngqgxck"
path="res://.godot/imported/ny.png-aa2c4907898777556ecbcdf7f8c9cc9b.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/ny.png"
dest_files=["res://.godot/imported/ny.png-aa2c4907898777556ecbcdf7f8c9cc9b.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_cubemap_2k/nz.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bmpoy5dldy4qb"
path="res://.godot/imported/nz.png-353d3b652e87892a2437b1cd16e570dc.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/nz.png"
dest_files=["res://.godot/imported/nz.png-353d3b652e87892a2437b1cd16e570dc.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_cubemap_2k/px.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://qsqveq4oifw4"
path="res://.godot/imported/px.png-34404ac21659a59edf3d6c7f85f54bcb.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/px.png"
dest_files=["res://.godot/imported/px.png-34404ac21659a59edf3d6c7f85f54bcb.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_cubemap_2k/py.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://m3475w1xwy25"
path="res://.godot/imported/py.png-9566cd2f8ccdd1ce1116f23c6b3eb3a1.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/py.png"
dest_files=["res://.godot/imported/py.png-9566cd2f8ccdd1ce1116f23c6b3eb3a1.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

BIN
assets/sky/sky_15_cubemap_2k/pz.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cpebv08pjd3m5"
path="res://.godot/imported/pz.png-dc8cc0e23d6ad35898672269481b4221.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/sky/sky_15_cubemap_2k/pz.png"
dest_files=["res://.godot/imported/pz.png-dc8cc0e23d6ad35898672269481b4221.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

View File

@@ -0,0 +1,88 @@
shader_type spatial;
uniform vec3 albedo : source_color;
uniform vec3 albedo2 : source_color;
uniform float metallic : hint_range(0.0, 1.0, 0.01) = 0;
uniform float roughness : hint_range(0.0, 1.0, 0.01) = 0.02;
uniform sampler2D texture_normal;
uniform sampler2D texture_normal2;
uniform vec2 wave_direction = vec2(0.0, 0.0);
uniform vec2 wave_direction2 = vec2(0.0, 0.0);
uniform float time_scale : hint_range(0.0, 0.2, 0.005) = 0.025;
uniform sampler2D depth_texture : hint_depth_texture, repeat_disable, filter_nearest;
uniform sampler2D screen_texture : hint_screen_texture, repeat_disable, filter_nearest;
uniform vec4 color_deep : source_color;
uniform vec4 color_shallow : source_color;
uniform float beers_law = 2.0;
uniform float depth_offset = -0.75;
uniform float depth_color_change = 5.0;
uniform float edge_scale = 0.1;
uniform float near = 1.0;
uniform float far = 100.0;
uniform vec3 edge_color : source_color;
uniform sampler2D waves;
uniform float noise_scale = 10.0;
uniform float height_scale = 0.15;
varying float height;
varying vec3 world_pos;
float fresnel(float amount, vec3 normal, vec3 view)
{
return pow((1.0 - clamp(dot(normalize(normal), normalize(view)), 0.0, 1.0)), amount);
}
float edge(float depth)
{
depth = 1.0 - 2.0*depth;
return near * far / (far + depth * (near - far));
}
void vertex() {
world_pos = (MODEL_MATRIX * vec4(VERTEX, 1.0)).xyz;
height = texture(waves, world_pos.xz / noise_scale + TIME * time_scale).r;
VERTEX.y += height * height_scale;
}
void fragment() {
float depth_tex = clamp(pow(texture(depth_texture, SCREEN_UV).r * depth_color_change, 5.0), 0.0, 1.0);
float depth = PROJECTION_MATRIX[3][2] / (clamp(depth_tex, 0.0, 1.0) + PROJECTION_MATRIX[2][2]);
float depth_blend = exp((depth+VERTEX.z + depth_offset) * -beers_law);
depth_blend = clamp(1.0 - depth_blend, 0.0, 1.0);
float depth_blend_power = clamp(pow(depth_blend, 2.5), 0.0, 1.0);
vec3 screen_color = textureLod(screen_texture, SCREEN_UV, 0.0).rgb;
vec3 depth_color = mix(color_shallow.rgb, color_deep.rgb, depth_blend_power);
vec3 color = mix(screen_color*depth_color, depth_color*0.25, depth_blend_power*0.5);
float z_depth = edge(texture(depth_texture, SCREEN_UV).x);
float z_pos = edge(FRAGCOORD.z);
float z_dif = z_depth - z_pos;
vec2 time = (TIME * wave_direction) * time_scale;
vec2 time2 = (TIME * wave_direction2) * time_scale;
vec3 normal = mix(texture(texture_normal, world_pos.xz/(noise_scale*2.0) + time).rgb, texture(texture_normal2, world_pos.xz/noise_scale + time2).rgb, 0.5);
float fresnel_alpha = fresnel(5.0, NORMAL, VIEW);
vec3 surface_color = mix(albedo, albedo2, fresnel_alpha);
vec3 surface_and_depth_color = mix(surface_color, color, 0.75);
vec3 with_edges = mix(edge_color, surface_color, step(edge_scale, z_dif));
ALBEDO = vec3(surface_color);
METALLIC = metallic;
ROUGHNESS = roughness;
NORMAL_MAP = normal;
}
//void light() {
// // Called for every pixel for every light affecting the material.
// // Uncomment to replace the default light processing function with this one.
//}

View File

@@ -0,0 +1 @@
uid://l11jog608jo1

56
assets/water/water.tres Normal file
View File

@@ -0,0 +1,56 @@
[gd_resource type="ShaderMaterial" load_steps=8 format=3 uid="uid://bibpkiinj8gq7"]
[ext_resource type="Shader" uid="uid://l11jog608jo1" path="res://assets/water/water.gdshader" id="1_441rt"]
[sub_resource type="FastNoiseLite" id="FastNoiseLite_441rt"]
noise_type = 3
fractal_type = 2
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_qceba"]
noise = SubResource("FastNoiseLite_441rt")
seamless = true
as_normal_map = true
bump_strength = 6.9
[sub_resource type="FastNoiseLite" id="FastNoiseLite_v5uja"]
noise_type = 3
seed = 10
fractal_type = 2
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_oqpjr"]
noise = SubResource("FastNoiseLite_v5uja")
seamless = true
as_normal_map = true
bump_strength = 2.4
[sub_resource type="FastNoiseLite" id="FastNoiseLite_qceba"]
fractal_octaves = 3
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_v5uja"]
noise = SubResource("FastNoiseLite_qceba")
seamless = true
[resource]
render_priority = 0
shader = ExtResource("1_441rt")
shader_parameter/albedo = Color(0, 0.32156864, 0.43137255, 1)
shader_parameter/albedo2 = Color(0.23849446, 0.558395, 0.6758933, 1)
shader_parameter/metallic = 0.01999999955296
shader_parameter/roughness = 0.01999999955296
shader_parameter/texture_normal = SubResource("NoiseTexture2D_qceba")
shader_parameter/texture_normal2 = SubResource("NoiseTexture2D_oqpjr")
shader_parameter/wave_direction = Vector2(2, 0)
shader_parameter/wave_direction2 = Vector2(0, 1)
shader_parameter/time_scale = 0.0249999994412
shader_parameter/color_deep = Color(0, 0.32156864, 0.43137255, 1)
shader_parameter/color_shallow = Color(0.37512296, 0.8792228, 0.9831924, 1)
shader_parameter/beers_law = 0.01
shader_parameter/depth_offset = -0.75
shader_parameter/depth_color_change = 73.16
shader_parameter/edge_scale = 0.395
shader_parameter/near = 1.0
shader_parameter/far = 100.0
shader_parameter/edge_color = Color(0.816028, 0.99999994, 0.9852888, 1)
shader_parameter/waves = SubResource("NoiseTexture2D_v5uja")
shader_parameter/noise_scale = 10.0
shader_parameter/height_scale = 0.1

13
assets/water/water.tscn Normal file
View File

@@ -0,0 +1,13 @@
[gd_scene load_steps=3 format=3 uid="uid://c066hc7yu36wx"]
[ext_resource type="Material" uid="uid://bibpkiinj8gq7" path="res://assets/water/water.tres" id="1_6nw2d"]
[sub_resource type="PlaneMesh" id="PlaneMesh_i6g1k"]
size = Vector2(1, 1)
subdivide_width = 200
subdivide_depth = 200
[node name="Water" type="MeshInstance3D"]
cast_shadow = 0
mesh = SubResource("PlaneMesh_i6g1k")
surface_material_override/0 = ExtResource("1_6nw2d")

0
authoring/.gdignore Normal file
View File

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -53,6 +53,7 @@ WalkSpeed = 7.5
AccelerationAir = 2.0
DecelerationAir = 0.1
Weight = 5.0
MantleTime = 0.2
SimpleJumpStartVelocity = 8.0
SimpleJumpHangTimeInFrames = 1
SimpleJumpGravityLesseningFactor = 2.5
@@ -201,6 +202,7 @@ offset_left = 1524.0
offset_top = 1.0
offset_right = -8.0
offset_bottom = 1.0
enabled = false
initial_node_to_watch = NodePath("../StateChart")
[node name="UI" type="CanvasLayer" parent="."]

View File

@@ -310,7 +310,7 @@ public partial class PlayerController : CharacterBody3D
// Movement stuff
// Getting universal setting from GODOT editor to be in sync
_gravity = (float)ProjectSettings.GetSetting("physics/3d/default_gravity");
MantleSystem.Init(HeadSystem);
MantleSystem.Init();
StairsSystem.Init(stairsBelowRayCast3D, stairsAheadRayCast3D, cameraSmooth);
DashSystem.Init(HeadSystem, camera, TweenQueueSystem);
WeaponSystem.Init(HeadSystem, camera);
@@ -438,7 +438,7 @@ public partial class PlayerController : CharacterBody3D
{
if (CanMantle())
{
MantleToLocation(MantleSystem.FindMantleInFrontOfPlayer().Unwrap());
MantleToLocation(MantleSystem.FindMantleForHeadRotation(HeadSystem.Rotation.Y).Unwrap());
return;
}
@@ -871,7 +871,7 @@ public partial class PlayerController : CharacterBody3D
{
// Try mantling but don't know if this is useful
if (CanMantle())
MantleToLocation(MantleSystem.FindMantleInFrontOfPlayer().Unwrap());
MantleToLocation(MantleSystem.FindMantleForHeadRotation(HeadSystem.Rotation.Y).Unwrap());
}
public void FinishPoweredDash()
@@ -912,7 +912,7 @@ public partial class PlayerController : CharacterBody3D
// Mantling
public bool CanMantle()
{
var mantleLocationResult = MantleSystem.FindMantleInFrontOfPlayer();
var mantleLocationResult = MantleSystem.FindMantleForHeadRotation(HeadSystem.Rotation.Y);
return mantleLocationResult.IsSome(out _);
}
public void MantleToLocation(Vector3 location)

View File

@@ -133,3 +133,5 @@ copy_path="res://scenes"
[rendering]
textures/vram_compression/import_etc2_astc=true
environment/volumetric_fog/volume_size=192
environment/volumetric_fog/volume_depth=192

View File

@@ -66,7 +66,7 @@ public partial class DashSystem: Node3D
_tweenQueueSystem = tweenQueueSystem;
_mantleSystem = GetNode<MantleSystem>("MantleSystem");
_mantleSystem.Init(this);
_mantleSystem.Init();
_dashTarget = GetNode<MeshInstance3D>("DashTarget");
_dashTarget.SetVisible(false);
@@ -116,7 +116,8 @@ public partial class DashSystem: Node3D
var targetMaterial = (StandardMaterial3D) _dashTarget.GetSurfaceOverrideMaterial(0);
targetMaterial.SetAlbedo(targetColor);
_dashTarget.SetVisible(true);
_dashTarget.SetGlobalPosition(PlannedLocation);
var targetLocation = ShouldMantle ? PlannedMantleLocation : PlannedLocation;
_dashTarget.SetGlobalPosition(targetLocation);
}
public void StopPreparingDash()

View File

@@ -35,7 +35,7 @@ mesh = SubResource("SphereMesh_qu4wy")
surface_material_override/0 = SubResource("StandardMaterial3D_v31n3")
[node name="MantleSystem" parent="." instance=ExtResource("2_pff7b")]
MantleEndLocationDistanceFromWall = 0.3
MantleEndLocationDistanceFromWall = 0.25
MantleHeightCastStart = 2.0
[node name="DashIndicator" parent="." instance=ExtResource("2_tqt6i")]

View File

@@ -5,50 +5,40 @@ namespace Movementtests.systems;
public partial class MantleSystem: Node3D
{
[Export(PropertyHint.Range, "0,2,0.1,suffix:m,or_greater")]
[Export(PropertyHint.Range, "0,2,0.01,suffix:m,or_greater")]
public float MantleEndLocationDistanceFromWall { get; set; } = 1f;
[Export(PropertyHint.Range, "0,10,0.1,suffix:m,or_greater")]
public float MantleHeightCastStart { get; set; } = 2f;
[Export(PropertyHint.Range, "0,10,0.01,suffix:m,or_greater")]
public float MaxStepHeight = 0.5f;
private Node3D _head;
private ShapeCast3D _wallInFrontCast3D;
private ShapeCast3D _mantleCast3D;
private RayCast3D _mantleCheckCast3D;
private Option<Vector3> _mantleLocation;
public void Init(Node3D head)
public void Init()
{
_head = head;
_wallInFrontCast3D = GetNode<ShapeCast3D>("WallInFrontCast3D");
_mantleCast3D = GetNode<ShapeCast3D>("MantleCast3D");
}
public override void _PhysicsProcess(double delta)
public Option<Vector3> FindMantleForHeadRotation(float rotation)
{
base._PhysicsProcess(delta);
_wallInFrontCast3D.SetRotation(new Vector3(
_wallInFrontCast3D.Rotation.X,
_head.Rotation.Y,
rotation,
_wallInFrontCast3D.Rotation.Z));
if (!_wallInFrontCast3D.IsColliding())
{
_mantleLocation = Option<Vector3>.None;
return;
return Option<Vector3>.None;
}
var collisionPoint = _wallInFrontCast3D.GetCollisionPoint(0);
var collisionNormal = _wallInFrontCast3D.GetCollisionNormal(0);
_mantleLocation = FindMantleLocationAtPoint(collisionPoint, collisionNormal);
}
public Option<Vector3> FindMantleInFrontOfPlayer()
{
return _mantleLocation;
return FindMantleLocationAtPoint(collisionPoint, collisionNormal);
}
public Option<Vector3> FindMantleLocationAtPoint(Vector3 point, Vector3 wallNormal)
@@ -59,8 +49,8 @@ public partial class MantleSystem: Node3D
_mantleCast3D.SetGlobalPosition(shapeCastStartLocation);
var targetLocation = Vector3.Down * MantleHeightCastStart + Vector3.Up * MaxStepHeight;
_mantleCast3D.SetTargetPosition(targetLocation);
if (_mantleCast3D.IsColliding() && _mantleCast3D.GetCollisionNormal(0).Y > 0.9f)
if (_mantleCast3D.IsColliding() && _mantleCast3D.GetCollisionNormal(0).Y >= 0.1f)
return Option.Some(_mantleCast3D.GetCollisionPoint(0));
return Option<Vector3>.None;
}

View File

@@ -218,22 +218,4 @@ public partial class MoveSystem : Node3D
var jumpVelocity = jumpForce * effectiveJumpDirection * boost;
_parent.Velocity = currentHorizontalVelocity + jumpVelocity;
}
public bool CanMantle()
{
var mantleLocationResult = _mantleSystem.FindMantleInFrontOfPlayer();
return mantleLocationResult.IsSome(out _);
}
public Option<Tween> Mantle()
{
var mantleLocationResult = _mantleSystem.FindMantleInFrontOfPlayer();
if (mantleLocationResult.IsSome(out var mantleLocation))
{
var duration = 0.1f * mantleLocation.DistanceTo(_parent.Position);
var tween = _tweenQueueSystem.TweenToLocation(new TweenQueueSystem.TweenInputs(mantleLocation, duration));
return tween.Some();
}
return Option<Tween>.None;
}
}

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=3 uid="uid://ckm3d6k08a72u"]
[gd_scene load_steps=10 format=3 uid="uid://ckm3d6k08a72u"]
[ext_resource type="Script" uid="uid://iii3wfto4t5b" path="res://systems/weapon/WeaponSystem.cs" id="1_csqwk"]
[ext_resource type="PackedScene" uid="uid://dbe5f0p6lvqtr" path="res://systems/tween_queue/tween_queue_system.tscn" id="2_x1nha"]
@@ -11,7 +11,14 @@
height = 1.0
radius = 0.1
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5owyf"]
use_z_clip_scale = true
z_clip_scale = 0.9
use_fov_override = true
fov_override = 70.0
[sub_resource type="CylinderMesh" id="CylinderMesh_x1nha"]
material = SubResource("StandardMaterial3D_5owyf")
top_radius = 0.0
bottom_radius = 0.05
height = 1.0