Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update project to Godot 4 beta 17 (animations still not fully updated) #13

Merged
merged 11 commits into from
Feb 6, 2023
4 changes: 3 additions & 1 deletion Box/BoxVisuals/BoxModel.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://cdtq6fyl7hhgm"
uid="uid://cqekaooy1ktfl"
path="res://.godot/imported/BoxModel.glb-89778339d2ef0e8a7be350006bb3d63b.scn"

[deps]
Expand All @@ -26,5 +26,7 @@ skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/embedded_image_handling=3
4 changes: 3 additions & 1 deletion Box/BoxVisuals/DestroyedBox.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://c57hyrm4d3n3o"
uid="uid://ciohp0157xfv3"
path="res://.godot/imported/DestroyedBox.glb-b8c8ecac1aae2fab01445422a4d452cf.scn"

[deps]
Expand All @@ -26,5 +26,7 @@ skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/embedded_image_handling=3
6 changes: 4 additions & 2 deletions DemoPage/Assets/BlurShader.gdshader
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ shader_type canvas_item;
uniform vec4 modulate: source_color;
uniform float blur_amount : hint_range(0, 5);

uniform sampler2D screen_texture : hint_screen_texture, repeat_disable, filter_linear_mipmap;

void fragment() {
vec4 col = textureLod(SCREEN_TEXTURE, SCREEN_UV, blur_amount);
COLOR = textureLod(SCREEN_TEXTURE, SCREEN_UV, blur_amount) * modulate;
vec4 col = textureLod(screen_texture, SCREEN_UV, blur_amount);
COLOR = textureLod(screen_texture, SCREEN_UV, blur_amount) * modulate;
}
2 changes: 1 addition & 1 deletion DemoPage/Assets/DemoPageBackground.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/DemoPageBackground.png-fe5c4d7b5270d53df4a33c
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/Assets/RoundedRectangle.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/RoundedRectangle.png-367c8fe3793a3b7b239ed567
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/Assets/discord-icon.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/discord-icon.png-7e73321edb194b96633ef6920211
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/Assets/gdquest_logo_white.svg.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/gdquest_logo_white.svg-e648f77fdefa5b54d79f6a
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/Assets/itch-icon.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/itch-icon.png-efbe69a4c90bc05782582d2eeb8a505
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/Assets/twitter-icon.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/twitter-icon.png-b6e20038143212bbbf99d38fea1f
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/buttonStart.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/buttonStart.png-20ffd5741a19e61212fd09acb6ba4
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/down_button.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/down_button.png-a138812ff538b428189fab3aea7ad
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/esc.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/esc.png-39a7666a4ba74269f39f945779f1fa64.ctex
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/gamepad.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/gamepad.png-cda47e9a1204a07ea93249858c69aa30.
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/joystickL_side.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/joystickL_side.png-d33ff6ba2e65193296d53a4642
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/joystickR_side.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/joystickR_side.png-85d3d6a119122699dac820a558
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/keyboard.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/keyboard.png-1684e7cb7cb3aad441d7b01188f044fb
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/l2_button.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/l2_button.png-b973bf70167ab047253bfc841790878
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/left_button.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/left_button.png-ad924212c4cef02f5a11eb8d6fcad
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/minus.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/minus.png-9e3b4c4e8b5cd2d4f083b0bf37336c73.ct
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/mouse.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/mouse.png-358b67a17dfef801c7b785667827ca5d.ct
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/mouseLeft.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/mouseLeft.png-62422c0f8665357fb6bc68083d2d9f8
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/mouseRight.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/mouseRight.png-29963af6b02b81cce9095032752a9e
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/r2_button.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/r2_button.png-036d3b6670c614bd49b417989517fda
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/right_button.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/right_button.png-1f25e74dcaa394528c2559afd55b
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/spacebar.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/spacebar.png-304d897e46c2c60af518837db20813ee
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/spacebar2.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/spacebar2.png-cb2b6de14ecd805bfd2933cea8c526b
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/tab.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/tab.png-f49dd08f3f6380ca0c30c2657cb6f948.ctex
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/up_button.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/up_button.png-228f43893c85207931a1a3a14ae6095
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion DemoPage/ControllerIcons/wasd.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/wasd.png-cfddefaff5353a6bba5415161946d5f7.cte
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
4 changes: 3 additions & 1 deletion Enemies/BeeBot/bee_bot.glb.import
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://bk3d0okgrcn35"
uid="uid://f0vfmhexafmx"
path="res://.godot/imported/bee_bot.glb-b483cd2c5f5e8b200b27b393ad75c051.scn"

[deps]
Expand All @@ -26,6 +26,7 @@ skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={
"animations": {
Expand Down Expand Up @@ -1830,3 +1831,4 @@ _subresources={
}
}
}
gltf/embedded_image_handling=3
2 changes: 1 addition & 1 deletion Enemies/BeeBot/bee_root.gd
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ func _ready():
play_idle()

func play_idle():
state_machine.travel("play_idle")
state_machine.travel("idle")

func play_spit_attack():
state_machine.travel("spit_attack")
Expand Down
7 changes: 3 additions & 4 deletions Enemies/BeeBot/wing_pattern.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,22 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://c4mdnjycm0yse"
path.s3tc="res://.godot/imported/wing_pattern.png-e92b2efb572a3f9859c2bee431e14a55.s3tc.ctex"
path.etc2="res://.godot/imported/wing_pattern.png-e92b2efb572a3f9859c2bee431e14a55.etc2.ctex"
metadata={
"imported_formats": ["s3tc", "etc2"],
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}

[deps]

source_file="res://Enemies/BeeBot/wing_pattern.png"
dest_files=["res://.godot/imported/wing_pattern.png-e92b2efb572a3f9859c2bee431e14a55.s3tc.ctex", "res://.godot/imported/wing_pattern.png-e92b2efb572a3f9859c2bee431e14a55.etc2.ctex"]
dest_files=["res://.godot/imported/wing_pattern.png-e92b2efb572a3f9859c2bee431e14a55.s3tc.ctex"]

[params]

compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
Expand Down
Loading