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.

Sign up for GitHub

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 engine with upstream changes 2024-05-31 #191

Merged
merged 4 commits into from
Jun 4, 2024
Merged

Update engine with upstream changes 2024-05-31 #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b99e9f1
Update engine with upstream changes 2024-05-31
aaronfranke Jun 2, 2024
a88889f
fix endless scroll flow container race condition
RevoluPowered Jun 4, 2024
c840eeb
Update engine with Android Jolt fixes
aaronfranke Jun 4, 2024
9142953
Fix broken scroll container quantity of tiles
RevoluPowered Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion godot-engine
Open in desktop
Submodule godot-engine updated 3093 files
1 change: 1 addition & 0 deletions mirror-godot-app/addons/gut/fonts/AnonymousPro-Bold.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/AnonymousPro-Bold.ttf-9d8fef4d357af5b52cd60af
Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
Expand Down
1 change: 1 addition & 0 deletions mirror-godot-app/addons/gut/fonts/AnonymousPro-BoldItalic.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/AnonymousPro-BoldItalic.ttf-4274bf704d3d6b9cd
Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
Expand Down
1 change: 1 addition & 0 deletions mirror-godot-app/addons/gut/fonts/AnonymousPro-Italic.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/AnonymousPro-Italic.ttf-9989590b02137b799e13d
Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
Expand Down
1 change: 1 addition & 0 deletions mirror-godot-app/addons/gut/fonts/AnonymousPro-Regular.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/AnonymousPro-Regular.ttf-856c843fd6f89964d2ca
Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
Expand Down
1 change: 1 addition & 0 deletions mirror-godot-app/addons/gut/fonts/CourierPrime-Bold.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/CourierPrime-Bold.ttf-1f003c66d63ebed70964e77
Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
Expand Down
1 change: 1 addition & 0 deletions mirror-godot-app/addons/gut/fonts/CourierPrime-BoldItalic.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/CourierPrime-BoldItalic.ttf-65ebcc61dd5e1dfa8
Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
Expand Down
1 change: 1 addition & 0 deletions mirror-godot-app/addons/gut/fonts/CourierPrime-Italic.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/CourierPrime-Italic.ttf-baa9156a73770735a0f72
Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
Expand Down
1 change: 1 addition & 0 deletions mirror-godot-app/addons/gut/fonts/CourierPrime-Regular.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/CourierPrime-Regular.ttf-3babe7e4a7a588dfc9a8
Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
Expand Down
1 change: 1 addition & 0 deletions mirror-godot-app/addons/gut/fonts/LobsterTwo-Bold.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/LobsterTwo-Bold.ttf-7c7f734103b58a32491a47881
Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
Expand Down
1 change: 1 addition & 0 deletions mirror-godot-app/addons/gut/fonts/LobsterTwo-BoldItalic.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/LobsterTwo-BoldItalic.ttf-227406a33e84448e6aa
Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
Expand Down
1 change: 1 addition & 0 deletions mirror-godot-app/addons/gut/fonts/LobsterTwo-Italic.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/LobsterTwo-Italic.ttf-f93abf6c25390c85ad5fb6c
Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
Expand Down
1 change: 1 addition & 0 deletions mirror-godot-app/addons/gut/fonts/LobsterTwo-Regular.ttf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/LobsterTwo-Regular.ttf-f3fcfa01cd671c8da433dd
Rendering=null
antialiasing=1
generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false
msdf_pixel_range=8
msdf_size=48
Expand Down
1 change: 1 addition & 0 deletions mirror-godot-app/gameplay/space_object/placeholder/error/error_recreation.gltf.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={
"materials": {
Expand Down
1 change: 1 addition & 0 deletions mirror-godot-app/player/animations/humanoid/humanoid_animations.glb.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ animation/import=true
animation/fps=30
animation/trimming=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={
"animations": {
Expand Down
2 changes: 1 addition & 1 deletion mirror-godot-app/player/animations/humanoid/rifle_hip_running_forward.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ tracks/48/enabled = true
tracks/48/path = NodePath("Armature/Skeleton3D:LeftToeBase")
tracks/48/interp = 1
tracks/48/loop_wrap = true
tracks/48/keys = PackedFloat32Array(0, 1, 0.377063, -0.0928583, -0.00260248, 0.921517, 0.0333333, 1, 0.377063, -0.0928583, -0.00260248, 0.921517, 0.0666667, 1, 0.326463, -0.0769484, 0.00502321, 0.942059, 0.1, 1, 0.248203, -0.0788253, 0.00231859, 0.965493, 0.133333, 1, 0.232453, -0.0972994, -0.00598173, 0.96771, 0.166667, 1, 0.222252, -0.16507, -0.0268306, 0.96054, 0.2, 1, 0.287049, -0.168713, -0.024834, 0.942614, 0.233333, 1, 0.296801, -0.114995, -0.00493449, 0.947977, 0.266667, 1, 0.282065, -0.0713982, 0.00544318, 0.95672, 0.366667, 1, 0.282097, -0.0713935, 0.00544969, 0.95671, 0.4, 1, 0.581845, 0.00720247, 0.0756187, 0.809745, 0.433333, 1, 0.449409, -0.034424, 0.0561659, 0.890894, 0.466667, 1, 0.282023, -0.0975051, -0.00318849, 0.954435, 0.5, 1, 0.274092, -0.0981293, -0.00288162, 0.95668, 0.533333, 1, 0.377064, -0.0928584, -0.00260233, 0.921517)
tracks/48/keys = PackedFloat32Array(0, 1, 0.377063, -0.0928583, -0.00260248, 0.921517, 0.0333333, 1, 0.377063, -0.0928583, -0.00260248, 0.921517, 0.0666667, 1, 0.326463, -0.0769484, 0.00502321, 0.942059, 0.1, 1, 0.248203, -0.0788253, 0.00231859, 0.965493, 0.133333, 1, 0.232453, -0.0972994, -0.00598173, 0.96771, 0.166667, 1, 0.222252, -0.16507, -0.0268306, 0.96054, 0.2, 1, 0.287049, -0.168713, -0.024834, 0.942614, 0.233333, 1, 0.296801, -0.114995, -0.00493449, 0.947977, 0.266667, 1, 0.282065, -0.0713982, 0.00544318, 0.95672, 0.366667, 1, 0.282097, -0.0713935, 0.00544969, 0.95671, 0.4, 1, 0.581845, 0.00720247, 0.0756187, 0.809745, 0.433333, 1, 0.44941, -0.034424, 0.0561659, 0.890894, 0.466667, 1, 0.282023, -0.0975051, -0.00318849, 0.954435, 0.5, 1, 0.274092, -0.0981293, -0.00288162, 0.95668, 0.533333, 1, 0.377064, -0.0928584, -0.00260233, 0.921517)
tracks/49/type = "rotation_3d"
tracks/49/imported = true
tracks/49/enabled = true
Expand Down
Loading
Loading