switch to godot 4 alpha 5
This commit is contained in:
parent
e29fa2f4dd
commit
2c3ffc67b4
52 changed files with 340 additions and 338 deletions
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bm3stvdb2qt8v"
|
||||
path="res://.godot/imported/CheckedBox.png-df43479fa5644f6ccc714a3c5b7d9b7c.stex"
|
||||
path="res://.godot/imported/CheckedBox.png-df43479fa5644f6ccc714a3c5b7d9b7c.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/khanat/Icons/CheckedBox.png"
|
||||
dest_files=["res://.godot/imported/CheckedBox.png-df43479fa5644f6ccc714a3c5b7d9b7c.stex"]
|
||||
dest_files=["res://.godot/imported/CheckedBox.png-df43479fa5644f6ccc714a3c5b7d9b7c.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://clp4xvrajsoh7"
|
||||
path="res://.godot/imported/CheckedButton.png-f734f1b582a043082ded79585b231e4f.stex"
|
||||
path="res://.godot/imported/CheckedButton.png-f734f1b582a043082ded79585b231e4f.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/khanat/Icons/CheckedButton.png"
|
||||
dest_files=["res://.godot/imported/CheckedButton.png-f734f1b582a043082ded79585b231e4f.stex"]
|
||||
dest_files=["res://.godot/imported/CheckedButton.png-f734f1b582a043082ded79585b231e4f.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bfcc5l8gouobw"
|
||||
path="res://.godot/imported/CheckedButtonDis.png-6ba98b2a525d82e2be324e6cc60e1c85.stex"
|
||||
path="res://.godot/imported/CheckedButtonDis.png-6ba98b2a525d82e2be324e6cc60e1c85.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/khanat/Icons/CheckedButtonDis.png"
|
||||
dest_files=["res://.godot/imported/CheckedButtonDis.png-6ba98b2a525d82e2be324e6cc60e1c85.stex"]
|
||||
dest_files=["res://.godot/imported/CheckedButtonDis.png-6ba98b2a525d82e2be324e6cc60e1c85.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://cd0g0fq0po1fl"
|
||||
path="res://.godot/imported/Grapper.png-0aa78019ea7c9beb90f297c9b11c5f18.stex"
|
||||
path="res://.godot/imported/Grapper.png-0aa78019ea7c9beb90f297c9b11c5f18.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/khanat/Icons/Grapper.png"
|
||||
dest_files=["res://.godot/imported/Grapper.png-0aa78019ea7c9beb90f297c9b11c5f18.stex"]
|
||||
dest_files=["res://.godot/imported/Grapper.png-0aa78019ea7c9beb90f297c9b11c5f18.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://clbq135thsds3"
|
||||
path="res://.godot/imported/GrapperHighlight.png-c69e72c49488011174065c9f9f5c4971.stex"
|
||||
path="res://.godot/imported/GrapperHighlight.png-c69e72c49488011174065c9f9f5c4971.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/khanat/Icons/GrapperHighlight.png"
|
||||
dest_files=["res://.godot/imported/GrapperHighlight.png-c69e72c49488011174065c9f9f5c4971.stex"]
|
||||
dest_files=["res://.godot/imported/GrapperHighlight.png-c69e72c49488011174065c9f9f5c4971.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://c82656trhlwxw"
|
||||
path="res://.godot/imported/UnCheckButton.png-fc18402ab7029f4623a3375fd5768dc1.stex"
|
||||
path="res://.godot/imported/UnCheckButton.png-fc18402ab7029f4623a3375fd5768dc1.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/khanat/Icons/UnCheckButton.png"
|
||||
dest_files=["res://.godot/imported/UnCheckButton.png-fc18402ab7029f4623a3375fd5768dc1.stex"]
|
||||
dest_files=["res://.godot/imported/UnCheckButton.png-fc18402ab7029f4623a3375fd5768dc1.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://q88jglhok1ra"
|
||||
path="res://.godot/imported/UnCheckButtonDis.png-9cd8278aa0ba52cf12cf924b32910ef9.stex"
|
||||
path="res://.godot/imported/UnCheckButtonDis.png-9cd8278aa0ba52cf12cf924b32910ef9.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/khanat/Icons/UnCheckButtonDis.png"
|
||||
dest_files=["res://.godot/imported/UnCheckButtonDis.png-9cd8278aa0ba52cf12cf924b32910ef9.stex"]
|
||||
dest_files=["res://.godot/imported/UnCheckButtonDis.png-9cd8278aa0ba52cf12cf924b32910ef9.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://k8gmk12dyw3l"
|
||||
path="res://.godot/imported/UnCheckedBox.png-90caeb926741975401bb47b82348c6b1.stex"
|
||||
path="res://.godot/imported/UnCheckedBox.png-90caeb926741975401bb47b82348c6b1.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/khanat/Icons/UnCheckedBox.png"
|
||||
dest_files=["res://.godot/imported/UnCheckedBox.png-90caeb926741975401bb47b82348c6b1.stex"]
|
||||
dest_files=["res://.godot/imported/UnCheckedBox.png-90caeb926741975401bb47b82348c6b1.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bhgbxuutyxraw"
|
||||
path="res://.godot/imported/spinbox.png-975c95220fc9d01e26d16f89dd804329.stex"
|
||||
path="res://.godot/imported/spinbox.png-975c95220fc9d01e26d16f89dd804329.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/khanat/Icons/spinbox.png"
|
||||
dest_files=["res://.godot/imported/spinbox.png-975c95220fc9d01e26d16f89dd804329.stex"]
|
||||
dest_files=["res://.godot/imported/spinbox.png-975c95220fc9d01e26d16f89dd804329.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bm3stvdb2qt8v"
|
||||
path="res://.godot/imported/CheckedBox.png-a3d3c6138cfa51f1feccc157bdb80830.stex"
|
||||
path="res://.godot/imported/CheckedBox.png-a3d3c6138cfa51f1feccc157bdb80830.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/zbasu/Icons/CheckedBox.png"
|
||||
dest_files=["res://.godot/imported/CheckedBox.png-a3d3c6138cfa51f1feccc157bdb80830.stex"]
|
||||
dest_files=["res://.godot/imported/CheckedBox.png-a3d3c6138cfa51f1feccc157bdb80830.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://clp4xvrajsoh7"
|
||||
path="res://.godot/imported/CheckedButton.png-fad670a94e7c010c2b0dbe13e64ba876.stex"
|
||||
path="res://.godot/imported/CheckedButton.png-fad670a94e7c010c2b0dbe13e64ba876.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/zbasu/Icons/CheckedButton.png"
|
||||
dest_files=["res://.godot/imported/CheckedButton.png-fad670a94e7c010c2b0dbe13e64ba876.stex"]
|
||||
dest_files=["res://.godot/imported/CheckedButton.png-fad670a94e7c010c2b0dbe13e64ba876.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bfcc5l8gouobw"
|
||||
path="res://.godot/imported/CheckedButtonDis.png-b56ad0f83714d3baa3e8eb5457ba4418.stex"
|
||||
path="res://.godot/imported/CheckedButtonDis.png-b56ad0f83714d3baa3e8eb5457ba4418.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/zbasu/Icons/CheckedButtonDis.png"
|
||||
dest_files=["res://.godot/imported/CheckedButtonDis.png-b56ad0f83714d3baa3e8eb5457ba4418.stex"]
|
||||
dest_files=["res://.godot/imported/CheckedButtonDis.png-b56ad0f83714d3baa3e8eb5457ba4418.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://cd0g0fq0po1fl"
|
||||
path="res://.godot/imported/Grapper.png-b94171de3e6595f788b74ece1b1e1f04.stex"
|
||||
path="res://.godot/imported/Grapper.png-b94171de3e6595f788b74ece1b1e1f04.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/zbasu/Icons/Grapper.png"
|
||||
dest_files=["res://.godot/imported/Grapper.png-b94171de3e6595f788b74ece1b1e1f04.stex"]
|
||||
dest_files=["res://.godot/imported/Grapper.png-b94171de3e6595f788b74ece1b1e1f04.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://clbq135thsds3"
|
||||
path="res://.godot/imported/GrapperHighlight.png-65dc2e3d66fa79440b4bff463f554398.stex"
|
||||
path="res://.godot/imported/GrapperHighlight.png-65dc2e3d66fa79440b4bff463f554398.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/zbasu/Icons/GrapperHighlight.png"
|
||||
dest_files=["res://.godot/imported/GrapperHighlight.png-65dc2e3d66fa79440b4bff463f554398.stex"]
|
||||
dest_files=["res://.godot/imported/GrapperHighlight.png-65dc2e3d66fa79440b4bff463f554398.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://c82656trhlwxw"
|
||||
path="res://.godot/imported/UnCheckButton.png-5b33e05dfc5c52c6a07198403dd6eff7.stex"
|
||||
path="res://.godot/imported/UnCheckButton.png-5b33e05dfc5c52c6a07198403dd6eff7.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/zbasu/Icons/UnCheckButton.png"
|
||||
dest_files=["res://.godot/imported/UnCheckButton.png-5b33e05dfc5c52c6a07198403dd6eff7.stex"]
|
||||
dest_files=["res://.godot/imported/UnCheckButton.png-5b33e05dfc5c52c6a07198403dd6eff7.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://q88jglhok1ra"
|
||||
path="res://.godot/imported/UnCheckButtonDis.png-9f4f77c0b3f818e75ec67bb037010ac7.stex"
|
||||
path="res://.godot/imported/UnCheckButtonDis.png-9f4f77c0b3f818e75ec67bb037010ac7.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/zbasu/Icons/UnCheckButtonDis.png"
|
||||
dest_files=["res://.godot/imported/UnCheckButtonDis.png-9f4f77c0b3f818e75ec67bb037010ac7.stex"]
|
||||
dest_files=["res://.godot/imported/UnCheckButtonDis.png-9f4f77c0b3f818e75ec67bb037010ac7.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://k8gmk12dyw3l"
|
||||
path="res://.godot/imported/UnCheckedBox.png-6edb70849742a67c55c2044b41c5acf7.stex"
|
||||
path="res://.godot/imported/UnCheckedBox.png-6edb70849742a67c55c2044b41c5acf7.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/zbasu/Icons/UnCheckedBox.png"
|
||||
dest_files=["res://.godot/imported/UnCheckedBox.png-6edb70849742a67c55c2044b41c5acf7.stex"]
|
||||
dest_files=["res://.godot/imported/UnCheckedBox.png-6edb70849742a67c55c2044b41c5acf7.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bhgbxuutyxraw"
|
||||
path="res://.godot/imported/spinbox.png-f2cc274f0758cdf387a97cdb6606c73a.stex"
|
||||
path="res://.godot/imported/spinbox.png-f2cc274f0758cdf387a97cdb6606c73a.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://UI/themes/zbasu/Icons/spinbox.png"
|
||||
dest_files=["res://.godot/imported/spinbox.png-f2cc274f0758cdf387a97cdb6606c73a.stex"]
|
||||
dest_files=["res://.godot/imported/spinbox.png-f2cc274f0758cdf387a97cdb6606c73a.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bnlc0wuajd5be"
|
||||
path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
|
||||
path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://icon.png"
|
||||
dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"]
|
||||
dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -90,7 +90,7 @@ void vertex()
|
|||
float time = TIME * wave_speed;
|
||||
|
||||
vec4 vertex = vec4(VERTEX, 1.0);
|
||||
vec3 vertex_position = (WORLD_MATRIX * vertex).xyz;
|
||||
vec3 vertex_position = (MODEL_MATRIX * vertex).xyz;
|
||||
|
||||
vec3 tang = vec3(0.0, 0.0, 0.0);
|
||||
vec3 bin = vec3(0.0, 0.0, 0.0);
|
||||
|
|
@ -176,4 +176,4 @@ void fragment()
|
|||
SPECULAR = 0.2 + depth_blend_pow * 0.4;
|
||||
NORMAL_MAP = normalmap;
|
||||
NORMAL_MAP_DEPTH = 1.25;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dktq7grvqd28t"
|
||||
path.s3tc="res://.godot/imported/base_ground_aa_01_basecolor.png-700262e05c3d1d33f43a3abf3320a3a6.s3tc.stex"
|
||||
path.etc2="res://.godot/imported/base_ground_aa_01_basecolor.png-700262e05c3d1d33f43a3abf3320a3a6.etc2.stex"
|
||||
path.s3tc="res://.godot/imported/base_ground_aa_01_basecolor.png-700262e05c3d1d33f43a3abf3320a3a6.s3tc.ctex"
|
||||
path.etc2="res://.godot/imported/base_ground_aa_01_basecolor.png-700262e05c3d1d33f43a3abf3320a3a6.etc2.ctex"
|
||||
metadata={
|
||||
"imported_formats": ["s3tc", "etc2"],
|
||||
"vram_texture": true
|
||||
|
|
@ -13,7 +13,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://maps/textures/base_ground_aa_01/base_ground_aa_01_basecolor.png"
|
||||
dest_files=["res://.godot/imported/base_ground_aa_01_basecolor.png-700262e05c3d1d33f43a3abf3320a3a6.s3tc.stex", "res://.godot/imported/base_ground_aa_01_basecolor.png-700262e05c3d1d33f43a3abf3320a3a6.etc2.stex"]
|
||||
dest_files=["res://.godot/imported/base_ground_aa_01_basecolor.png-700262e05c3d1d33f43a3abf3320a3a6.s3tc.ctex", "res://.godot/imported/base_ground_aa_01_basecolor.png-700262e05c3d1d33f43a3abf3320a3a6.etc2.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bepui0ewq3y3g"
|
||||
path.s3tc="res://.godot/imported/base_ground_aa_01_height.png-eace249d3bdc366ea146f8e88448da4e.s3tc.stex"
|
||||
path.etc2="res://.godot/imported/base_ground_aa_01_height.png-eace249d3bdc366ea146f8e88448da4e.etc2.stex"
|
||||
path.s3tc="res://.godot/imported/base_ground_aa_01_height.png-eace249d3bdc366ea146f8e88448da4e.s3tc.ctex"
|
||||
path.etc2="res://.godot/imported/base_ground_aa_01_height.png-eace249d3bdc366ea146f8e88448da4e.etc2.ctex"
|
||||
metadata={
|
||||
"imported_formats": ["s3tc", "etc2"],
|
||||
"vram_texture": true
|
||||
|
|
@ -13,7 +13,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://maps/textures/base_ground_aa_01/base_ground_aa_01_height.png"
|
||||
dest_files=["res://.godot/imported/base_ground_aa_01_height.png-eace249d3bdc366ea146f8e88448da4e.s3tc.stex", "res://.godot/imported/base_ground_aa_01_height.png-eace249d3bdc366ea146f8e88448da4e.etc2.stex"]
|
||||
dest_files=["res://.godot/imported/base_ground_aa_01_height.png-eace249d3bdc366ea146f8e88448da4e.s3tc.ctex", "res://.godot/imported/base_ground_aa_01_height.png-eace249d3bdc366ea146f8e88448da4e.etc2.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://cr8lfe63y14j5"
|
||||
path.s3tc="res://.godot/imported/base_ground_aa_01_normal.png-e110b0f1da08b52053b5a642b218118e.s3tc.stex"
|
||||
path.etc2="res://.godot/imported/base_ground_aa_01_normal.png-e110b0f1da08b52053b5a642b218118e.etc2.stex"
|
||||
path.s3tc="res://.godot/imported/base_ground_aa_01_normal.png-e110b0f1da08b52053b5a642b218118e.s3tc.ctex"
|
||||
path.etc2="res://.godot/imported/base_ground_aa_01_normal.png-e110b0f1da08b52053b5a642b218118e.etc2.ctex"
|
||||
metadata={
|
||||
"imported_formats": ["s3tc", "etc2"],
|
||||
"vram_texture": true
|
||||
|
|
@ -13,7 +13,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://maps/textures/base_ground_aa_01/base_ground_aa_01_normal.png"
|
||||
dest_files=["res://.godot/imported/base_ground_aa_01_normal.png-e110b0f1da08b52053b5a642b218118e.s3tc.stex", "res://.godot/imported/base_ground_aa_01_normal.png-e110b0f1da08b52053b5a642b218118e.etc2.stex"]
|
||||
dest_files=["res://.godot/imported/base_ground_aa_01_normal.png-e110b0f1da08b52053b5a642b218118e.s3tc.ctex", "res://.godot/imported/base_ground_aa_01_normal.png-e110b0f1da08b52053b5a642b218118e.etc2.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://cp7yn3820dfkl"
|
||||
path.s3tc="res://.godot/imported/base_ground_aa_01_roughness.png-16acb5789d8e4b63beb68501d1ac4560.s3tc.stex"
|
||||
path.etc2="res://.godot/imported/base_ground_aa_01_roughness.png-16acb5789d8e4b63beb68501d1ac4560.etc2.stex"
|
||||
path.s3tc="res://.godot/imported/base_ground_aa_01_roughness.png-16acb5789d8e4b63beb68501d1ac4560.s3tc.ctex"
|
||||
path.etc2="res://.godot/imported/base_ground_aa_01_roughness.png-16acb5789d8e4b63beb68501d1ac4560.etc2.ctex"
|
||||
metadata={
|
||||
"imported_formats": ["s3tc", "etc2"],
|
||||
"vram_texture": true
|
||||
|
|
@ -13,7 +13,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://maps/textures/base_ground_aa_01/base_ground_aa_01_roughness.png"
|
||||
dest_files=["res://.godot/imported/base_ground_aa_01_roughness.png-16acb5789d8e4b63beb68501d1ac4560.s3tc.stex", "res://.godot/imported/base_ground_aa_01_roughness.png-16acb5789d8e4b63beb68501d1ac4560.etc2.stex"]
|
||||
dest_files=["res://.godot/imported/base_ground_aa_01_roughness.png-16acb5789d8e4b63beb68501d1ac4560.s3tc.ctex", "res://.godot/imported/base_ground_aa_01_roughness.png-16acb5789d8e4b63beb68501d1ac4560.etc2.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bdygfoyj1jnlr"
|
||||
path.s3tc="res://.godot/imported/simple_grid.png-7d8153fbf2d0f206ba3d8a2f275451e2.s3tc.stex"
|
||||
path.etc2="res://.godot/imported/simple_grid.png-7d8153fbf2d0f206ba3d8a2f275451e2.etc2.stex"
|
||||
path.s3tc="res://.godot/imported/simple_grid.png-7d8153fbf2d0f206ba3d8a2f275451e2.s3tc.ctex"
|
||||
path.etc2="res://.godot/imported/simple_grid.png-7d8153fbf2d0f206ba3d8a2f275451e2.etc2.ctex"
|
||||
metadata={
|
||||
"imported_formats": ["s3tc", "etc2"],
|
||||
"vram_texture": true
|
||||
|
|
@ -13,7 +13,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://maps/textures/simple_grid.png"
|
||||
dest_files=["res://.godot/imported/simple_grid.png-7d8153fbf2d0f206ba3d8a2f275451e2.s3tc.stex", "res://.godot/imported/simple_grid.png-7d8153fbf2d0f206ba3d8a2f275451e2.etc2.stex"]
|
||||
dest_files=["res://.godot/imported/simple_grid.png-7d8153fbf2d0f206ba3d8a2f275451e2.s3tc.ctex", "res://.godot/imported/simple_grid.png-7d8153fbf2d0f206ba3d8a2f275451e2.etc2.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://cs1ay0dxlxycu"
|
||||
path="res://.godot/imported/simple_grid.svg-c365526d4e5132d3659551b7d89ae633.stex"
|
||||
path="res://.godot/imported/simple_grid.svg-c365526d4e5132d3659551b7d89ae633.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://maps/textures/simple_grid.svg"
|
||||
dest_files=["res://.godot/imported/simple_grid.svg-c365526d4e5132d3659551b7d89ae633.stex"]
|
||||
dest_files=["res://.godot/imported/simple_grid.svg-c365526d4e5132d3659551b7d89ae633.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dx1xu6pew37xq"
|
||||
path="res://.godot/imported/water_caustic.png-4cad4ce05cc7b20c0a2eb631b90b6d07.stex"
|
||||
path="res://.godot/imported/water_caustic.png-4cad4ce05cc7b20c0a2eb631b90b6d07.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://maps/textures/water_caustic.png"
|
||||
dest_files=["res://.godot/imported/water_caustic.png-4cad4ce05cc7b20c0a2eb631b90b6d07.stex"]
|
||||
dest_files=["res://.godot/imported/water_caustic.png-4cad4ce05cc7b20c0a2eb631b90b6d07.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dkqexyv18bwqc"
|
||||
path.s3tc="res://.godot/imported/water_foam.png-6b1f502fe303c2477cb81267b27b6e00.s3tc.stex"
|
||||
path.etc2="res://.godot/imported/water_foam.png-6b1f502fe303c2477cb81267b27b6e00.etc2.stex"
|
||||
path.s3tc="res://.godot/imported/water_foam.png-6b1f502fe303c2477cb81267b27b6e00.s3tc.ctex"
|
||||
path.etc2="res://.godot/imported/water_foam.png-6b1f502fe303c2477cb81267b27b6e00.etc2.ctex"
|
||||
metadata={
|
||||
"imported_formats": ["s3tc", "etc2"],
|
||||
"vram_texture": true
|
||||
|
|
@ -13,7 +13,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://maps/textures/water_foam.png"
|
||||
dest_files=["res://.godot/imported/water_foam.png-6b1f502fe303c2477cb81267b27b6e00.s3tc.stex", "res://.godot/imported/water_foam.png-6b1f502fe303c2477cb81267b27b6e00.etc2.stex"]
|
||||
dest_files=["res://.godot/imported/water_foam.png-6b1f502fe303c2477cb81267b27b6e00.s3tc.ctex", "res://.godot/imported/water_foam.png-6b1f502fe303c2477cb81267b27b6e00.etc2.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dppjl2jpko3lx"
|
||||
path.s3tc="res://.godot/imported/water_normal_a.png-f8392e7241b4457edef8eb41d370c6bc.s3tc.stex"
|
||||
path.etc2="res://.godot/imported/water_normal_a.png-f8392e7241b4457edef8eb41d370c6bc.etc2.stex"
|
||||
path.s3tc="res://.godot/imported/water_normal_a.png-f8392e7241b4457edef8eb41d370c6bc.s3tc.ctex"
|
||||
path.etc2="res://.godot/imported/water_normal_a.png-f8392e7241b4457edef8eb41d370c6bc.etc2.ctex"
|
||||
metadata={
|
||||
"imported_formats": ["s3tc", "etc2"],
|
||||
"vram_texture": true
|
||||
|
|
@ -13,7 +13,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://maps/textures/water_normal_a.png"
|
||||
dest_files=["res://.godot/imported/water_normal_a.png-f8392e7241b4457edef8eb41d370c6bc.s3tc.stex", "res://.godot/imported/water_normal_a.png-f8392e7241b4457edef8eb41d370c6bc.etc2.stex"]
|
||||
dest_files=["res://.godot/imported/water_normal_a.png-f8392e7241b4457edef8eb41d370c6bc.s3tc.ctex", "res://.godot/imported/water_normal_a.png-f8392e7241b4457edef8eb41d370c6bc.etc2.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://b8tu2ncerig3r"
|
||||
path.s3tc="res://.godot/imported/water_normal_b.png-2afe52f69ae1e28d9f412da7baa0728c.s3tc.stex"
|
||||
path.etc2="res://.godot/imported/water_normal_b.png-2afe52f69ae1e28d9f412da7baa0728c.etc2.stex"
|
||||
path.s3tc="res://.godot/imported/water_normal_b.png-2afe52f69ae1e28d9f412da7baa0728c.s3tc.ctex"
|
||||
path.etc2="res://.godot/imported/water_normal_b.png-2afe52f69ae1e28d9f412da7baa0728c.etc2.ctex"
|
||||
metadata={
|
||||
"imported_formats": ["s3tc", "etc2"],
|
||||
"vram_texture": true
|
||||
|
|
@ -13,7 +13,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://maps/textures/water_normal_b.png"
|
||||
dest_files=["res://.godot/imported/water_normal_b.png-2afe52f69ae1e28d9f412da7baa0728c.s3tc.stex", "res://.godot/imported/water_normal_b.png-2afe52f69ae1e28d9f412da7baa0728c.etc2.stex"]
|
||||
dest_files=["res://.godot/imported/water_normal_b.png-2afe52f69ae1e28d9f412da7baa0728c.s3tc.ctex", "res://.godot/imported/water_normal_b.png-2afe52f69ae1e28d9f412da7baa0728c.etc2.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dv1ywlb7inqyu"
|
||||
path.s3tc="res://.godot/imported/water_uv_sampler.png-1234005b9123911cbbb44a36de4682fe.s3tc.stex"
|
||||
path.etc2="res://.godot/imported/water_uv_sampler.png-1234005b9123911cbbb44a36de4682fe.etc2.stex"
|
||||
path.s3tc="res://.godot/imported/water_uv_sampler.png-1234005b9123911cbbb44a36de4682fe.s3tc.ctex"
|
||||
path.etc2="res://.godot/imported/water_uv_sampler.png-1234005b9123911cbbb44a36de4682fe.etc2.ctex"
|
||||
metadata={
|
||||
"imported_formats": ["s3tc", "etc2"],
|
||||
"vram_texture": true
|
||||
|
|
@ -13,7 +13,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://maps/textures/water_uv_sampler.png"
|
||||
dest_files=["res://.godot/imported/water_uv_sampler.png-1234005b9123911cbbb44a36de4682fe.s3tc.stex", "res://.godot/imported/water_uv_sampler.png-1234005b9123911cbbb44a36de4682fe.etc2.stex"]
|
||||
dest_files=["res://.godot/imported/water_uv_sampler.png-1234005b9123911cbbb44a36de4682fe.s3tc.ctex", "res://.godot/imported/water_uv_sampler.png-1234005b9123911cbbb44a36de4682fe.etc2.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ func _process(_delta):
|
|||
if not sticky:
|
||||
# For non-sticky waypoints, we don't need to clamp and calculate
|
||||
# the position if the waypoint goes off screen.
|
||||
rect_position = unprojected_position
|
||||
position = unprojected_position
|
||||
visible = not is_behind
|
||||
return
|
||||
|
||||
|
|
@ -83,36 +83,36 @@ func _process(_delta):
|
|||
var diff = angle_diff(look.basis.get_euler().x, camera_transform.basis.get_euler().x)
|
||||
unprojected_position.y = viewport_base_size.y * (0.5 + (diff / deg2rad(camera.fov)))
|
||||
|
||||
rect_position = Vector2(
|
||||
position = Vector2(
|
||||
clamp(unprojected_position.x, MARGIN, viewport_base_size.x - MARGIN),
|
||||
clamp(unprojected_position.y, MARGIN, viewport_base_size.y - MARGIN)
|
||||
)
|
||||
|
||||
label.visible = true
|
||||
rect_rotation = 0
|
||||
rotation = 0
|
||||
# Used to display a diagonal arrow when the waypoint is displayed in
|
||||
# one of the screen corners.
|
||||
var overflow = 0
|
||||
|
||||
if rect_position.x <= MARGIN:
|
||||
if position.x <= MARGIN:
|
||||
# Left overflow.
|
||||
overflow = -45
|
||||
label.visible = false
|
||||
rect_rotation = 90
|
||||
elif rect_position.x >= viewport_base_size.x - MARGIN:
|
||||
rotation = 90
|
||||
elif position.x >= viewport_base_size.x - MARGIN:
|
||||
# Right overflow.
|
||||
overflow = 45
|
||||
label.visible = false
|
||||
rect_rotation = 270
|
||||
rotation = 270
|
||||
|
||||
if rect_position.y <= MARGIN:
|
||||
if position.y <= MARGIN:
|
||||
# Top overflow.
|
||||
label.visible = false
|
||||
rect_rotation = 180 + overflow
|
||||
elif rect_position.y >= viewport_base_size.y - MARGIN:
|
||||
rotation = 180 + overflow
|
||||
elif position.y >= viewport_base_size.y - MARGIN:
|
||||
# Bottom overflow.
|
||||
label.visible = false
|
||||
rect_rotation = -overflow
|
||||
rotation = -overflow
|
||||
|
||||
|
||||
static func angle_diff(from, to):
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://ltyiyj3v77cn"
|
||||
path="res://.godot/imported/waypoint.svg-cce94092b899bcae1a4b555f72b67ac0.stex"
|
||||
path="res://.godot/imported/waypoint.svg-cce94092b899bcae1a4b555f72b67ac0.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://maps/waypoint/waypoint.svg"
|
||||
dest_files=["res://.godot/imported/waypoint.svg-cce94092b899bcae1a4b555f72b67ac0.stex"]
|
||||
dest_files=["res://.godot/imported/waypoint.svg-cce94092b899bcae1a4b555f72b67ac0.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -23,14 +23,16 @@ __meta__ = {
|
|||
}
|
||||
|
||||
[node name="Marker" type="TextureRect" parent="."]
|
||||
offset_left = -7.3
|
||||
offset_left = -7.0
|
||||
offset_top = -23.0
|
||||
offset_right = 202.7
|
||||
offset_bottom = 274.0
|
||||
rect_scale = Vector2(0.07, 0.08)
|
||||
offset_right = 9.0
|
||||
offset_bottom = -7.0
|
||||
size_flags_horizontal = 0
|
||||
size_flags_vertical = 0
|
||||
texture = ExtResource( "2_hvndi" )
|
||||
ignore_texture_size = true
|
||||
__meta__ = {
|
||||
"_edit_use_anchors_": false
|
||||
"_edit_layout_mode": 0,
|
||||
"_edit_use_anchors_": false,
|
||||
"_edit_use_custom_anchors": false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://bli3t3o0odrn0"
|
||||
path="res://.godot/imported/DevScene.png-ef8845163812bf06c89566f218646cad.stex"
|
||||
path="res://.godot/imported/DevScene.png-ef8845163812bf06c89566f218646cad.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://player/DevScene.png"
|
||||
dest_files=["res://.godot/imported/DevScene.png-ef8845163812bf06c89566f218646cad.stex"]
|
||||
dest_files=["res://.godot/imported/DevScene.png-ef8845163812bf06c89566f218646cad.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -788,7 +788,7 @@ func move_camera_y_one_step(delta_y:float, step_y:float):
|
|||
|
||||
func _physics_process(delta):
|
||||
if (state_player == StatePlayer.WALK or state_player == StatePlayer.WALK_WATER) and (not is_on_floor()):
|
||||
motion_velocity.y -= gravity * delta
|
||||
velocity.y -= gravity * delta
|
||||
if tps:
|
||||
var camx = (Input.get_action_strength("INPUT_VIEW_CAMERA_UP", true) - Input.get_action_strength("INPUT_VIEW_CAMERA_DOWN", true)) * CAMERA_TPS_ROTATE_STEP_X * delta
|
||||
var camy = (Input.get_action_strength("INPUT_VIEW_CAMERA_LEFT", true) - Input.get_action_strength("INPUT_VIEW_CAMERA_RIGHT", true)) * CAMERA_TPS_ROTATE_STEP_Y * delta
|
||||
|
|
@ -1002,7 +1002,7 @@ func _process( delta ):
|
|||
#Common.msg_debug("get_position.y:" + str(get_position().y) + " > [heigh_underwater_walk] " + str( level_water - heigh_underwater_walk))
|
||||
mulstep = FACTOR_WALK_WATER
|
||||
if not is_on_floor():
|
||||
motion_velocity.y -= gravity * delta
|
||||
velocity.y -= gravity * delta
|
||||
else:
|
||||
switch_state(StatePlayer.SWIM)
|
||||
mulstep = FACTOR_SWIM
|
||||
|
|
@ -1010,7 +1010,7 @@ func _process( delta ):
|
|||
Common.msg_debug("WALK")
|
||||
mulstep = FACTOR_WALK
|
||||
if not is_on_floor():
|
||||
motion_velocity.y -= gravity * delta
|
||||
velocity.y -= gravity * delta
|
||||
StatePlayer.FLY:
|
||||
#Common.msg_debug("FLY")
|
||||
mulstep = FACTOR_FLY
|
||||
|
|
@ -1026,16 +1026,16 @@ func _process( delta ):
|
|||
|
||||
var direction = (transform.basis * Vector3(input_x, input_z, input_y)).normalized()
|
||||
if direction:
|
||||
motion_velocity.x = direction.x * speed * mulstep
|
||||
motion_velocity.z = direction.z * speed * mulstep
|
||||
velocity.x = direction.x * speed * mulstep
|
||||
velocity.z = direction.z * speed * mulstep
|
||||
if not (state_player == StatePlayer.WALK_WATER or state_player == StatePlayer.WALK):
|
||||
motion_velocity.y = direction.y * speed * mulstep
|
||||
velocity.y = direction.y * speed * mulstep
|
||||
else:
|
||||
motion_velocity.x = move_toward(motion_velocity.x, 0, speed * mulstep)
|
||||
motion_velocity.z = move_toward(motion_velocity.z, 0, speed * mulstep)
|
||||
velocity.x = move_toward(velocity.x, 0, speed * mulstep)
|
||||
velocity.z = move_toward(velocity.z, 0, speed * mulstep)
|
||||
if not (state_player == StatePlayer.WALK_WATER or state_player == StatePlayer.WALK):
|
||||
motion_velocity.y = move_toward(motion_velocity.y, 0, speed * mulstep)
|
||||
var save_motion_velocity:Vector3 = motion_velocity
|
||||
velocity.y = move_toward(velocity.y, 0, speed * mulstep)
|
||||
var save_velocity:Vector3 = velocity
|
||||
var collided = move_and_slide()
|
||||
if state_player == StatePlayer.SWIM:
|
||||
if collided == false and level_water <= get_position().y:
|
||||
|
|
@ -1048,7 +1048,7 @@ func _process( delta ):
|
|||
Common.msg_debug("get_position.y:" + str(get_position().y) + " >= [heigh_underwater_swim] " + str( level_water - heigh_underwater_swim))
|
||||
switch_state(StatePlayer.WALK_WATER)
|
||||
if not is_on_floor():
|
||||
motion_velocity.y -= gravity * delta
|
||||
velocity.y -= gravity * delta
|
||||
elif state_player == StatePlayer.WALK:
|
||||
if collided and is_on_floor() and (input_x != 0.0 or input_y != 0.0) and !$RayCastStep.is_colliding():
|
||||
var delta_1:Vector3 = get_position_delta()
|
||||
|
|
@ -1056,11 +1056,11 @@ func _process( delta ):
|
|||
if (areawalk * 10.0 < max_collided_speed) or (is_run and (areawalk * 10.0 < max_collided_speed * DIFF_RUN_WALK )):
|
||||
var jump_step:Vector3 = height_step
|
||||
translate(jump_step)
|
||||
motion_velocity = save_motion_velocity - delta_1 # (save_motion_velocity - delta_1) * MUL_SPEED_STEP
|
||||
velocity = save_velocity - delta_1 # (save_velocity - delta_1) * MUL_SPEED_STEP
|
||||
move_and_slide()
|
||||
motion_velocity.x = 0.0
|
||||
motion_velocity.y = -STEP_FORCE
|
||||
motion_velocity.z = 0.0
|
||||
velocity.x = 0.0
|
||||
velocity.y = -STEP_FORCE
|
||||
velocity.z = 0.0
|
||||
collided = move_and_slide()
|
||||
else:
|
||||
var delta_1:Vector3 = get_position_delta()
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://dhme55udo3chx"
|
||||
path="res://.godot/imported/add.png-857c1c6e0729b01483785eee8bf67941.stex"
|
||||
path="res://.godot/imported/add.png-857c1c6e0729b01483785eee8bf67941.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://scenes/controls/add.png"
|
||||
dest_files=["res://.godot/imported/add.png-857c1c6e0729b01483785eee8bf67941.stex"]
|
||||
dest_files=["res://.godot/imported/add.png-857c1c6e0729b01483785eee8bf67941.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://24bvysta5tma"
|
||||
path="res://.godot/imported/add.svg-26b0305e6798499dcda78ea163b6ef1d.stex"
|
||||
path="res://.godot/imported/add.svg-26b0305e6798499dcda78ea163b6ef1d.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://scenes/controls/add.svg"
|
||||
dest_files=["res://.godot/imported/add.svg-26b0305e6798499dcda78ea163b6ef1d.stex"]
|
||||
dest_files=["res://.godot/imported/add.svg-26b0305e6798499dcda78ea163b6ef1d.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://js4s65teoql3"
|
||||
path="res://.godot/imported/trash.png-da4a5f49ff87a6019cdc4d92eedfccfb.stex"
|
||||
path="res://.godot/imported/trash.png-da4a5f49ff87a6019cdc4d92eedfccfb.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://scenes/controls/trash.png"
|
||||
dest_files=["res://.godot/imported/trash.png-da4a5f49ff87a6019cdc4d92eedfccfb.stex"]
|
||||
dest_files=["res://.godot/imported/trash.png-da4a5f49ff87a6019cdc4d92eedfccfb.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="StreamTexture2D"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://c7xor1oxx72h4"
|
||||
path="res://.godot/imported/trash.svg-f0ab7922f4cdf12c78a96422c95706d8.stex"
|
||||
path="res://.godot/imported/trash.svg-f0ab7922f4cdf12c78a96422c95706d8.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
|
@ -11,7 +11,7 @@ metadata={
|
|||
[deps]
|
||||
|
||||
source_file="res://scenes/controls/trash.svg"
|
||||
dest_files=["res://.godot/imported/trash.svg-f0ab7922f4cdf12c78a96422c95706d8.stex"]
|
||||
dest_files=["res://.godot/imported/trash.svg-f0ab7922f4cdf12c78a96422c95706d8.ctex"]
|
||||
|
||||
[params]
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ declare EDITOR=0
|
|||
declare FORCE=0
|
||||
declare IMPORT=0
|
||||
declare WORKDIR="$(dirname $(readlink -f $0))"
|
||||
declare GODOT_SRC="https://downloads.tuxfamily.org/godotengine/4.0/alpha3/Godot_v4.0-alpha3_linux.64.zip"
|
||||
declare GODOT_SRC="https://downloads.tuxfamily.org/godotengine/4.0/alpha5/Godot_v4.0-alpha5_linux.64.zip"
|
||||
declare OUTZIP="$WORKDIR/$(basename $GODOT_SRC)"
|
||||
declare OPTION=""
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue