Update to 4.4

This commit is contained in:
Lucas Peter 2025-02-10 19:16:34 +01:00
parent 2da91253a7
commit 298e3a0875
No known key found for this signature in database
39 changed files with 54 additions and 28 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://bie1xn8v1kd66"] [gd_scene load_steps=2 format=3 uid="uid://bie1xn8v1kd66"]
[ext_resource type="Script" path="res://addons/Todo_Manager/ColourPicker.gd" id="1"] [ext_resource type="Script" uid="uid://df541g6d1m0h7" path="res://addons/Todo_Manager/ColourPicker.gd" id="1"]
[node name="TODOColour" type="HBoxContainer"] [node name="TODOColour" type="HBoxContainer"]
offset_right = 105.0 offset_right = 105.0

View file

@ -1,8 +1,8 @@
[gd_scene load_steps=6 format=3 uid="uid://b6k0dtftankcx"] [gd_scene load_steps=6 format=3 uid="uid://b6k0dtftankcx"]
[ext_resource type="Script" path="res://addons/Todo_Manager/Dock.gd" id="1"] [ext_resource type="Script" uid="uid://dxfum2rfbgiyh" path="res://addons/Todo_Manager/Dock.gd" id="1"]
[ext_resource type="Script" path="res://addons/Todo_Manager/Project.gd" id="2"] [ext_resource type="Script" uid="uid://b87jrs2b80ppa" path="res://addons/Todo_Manager/Project.gd" id="2"]
[ext_resource type="Script" path="res://addons/Todo_Manager/Current.gd" id="3"] [ext_resource type="Script" uid="uid://vmuu35t03wbp" path="res://addons/Todo_Manager/Current.gd" id="3"]
[sub_resource type="ButtonGroup" id="ButtonGroup_kqxcu"] [sub_resource type="ButtonGroup" id="ButtonGroup_kqxcu"]

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://bx11sel2q5wli"] [gd_scene load_steps=2 format=3 uid="uid://bx11sel2q5wli"]
[ext_resource type="Script" path="res://addons/Todo_Manager/Pattern.gd" id="1"] [ext_resource type="Script" uid="uid://cst7jwbhlxns6" path="res://addons/Todo_Manager/Pattern.gd" id="1"]
[node name="Pattern" type="HBoxContainer"] [node name="Pattern" type="HBoxContainer"]
script = ExtResource("1") script = ExtResource("1")

View file

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

View file

@ -0,0 +1 @@
uid://56d5mb4w3y36

View file

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

1
core/Cursor.gd.uid Normal file
View file

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

View file

@ -1,7 +1,7 @@
[gd_scene load_steps=8 format=3 uid="uid://524sv8spw6go"] [gd_scene load_steps=8 format=3 uid="uid://524sv8spw6go"]
[ext_resource type="Texture2D" uid="uid://q1rdbr8uh78r" path="res://textures/cursor_default.tres" id="1_50ts1"] [ext_resource type="Texture2D" uid="uid://q1rdbr8uh78r" path="res://textures/cursor_default.tres" id="1_50ts1"]
[ext_resource type="Script" path="res://core/Cursor.gd" id="1_b5uuj"] [ext_resource type="Script" uid="uid://0wbh0tf7pnti" path="res://core/Cursor.gd" id="1_b5uuj"]
[ext_resource type="Texture2D" uid="uid://bdstohvc7pvot" path="res://textures/cursor_click.tres" id="1_h0do2"] [ext_resource type="Texture2D" uid="uid://bdstohvc7pvot" path="res://textures/cursor_click.tres" id="1_h0do2"]
[ext_resource type="Texture2D" uid="uid://buxws7r3kn0d7" path="res://textures/cursor_grab_01.tres" id="3_fj3w4"] [ext_resource type="Texture2D" uid="uid://buxws7r3kn0d7" path="res://textures/cursor_grab_01.tres" id="3_fj3w4"]
[ext_resource type="Texture2D" uid="uid://pbahcjllgjjq" path="res://textures/cursor_grab_02.tres" id="4_153q8"] [ext_resource type="Texture2D" uid="uid://pbahcjllgjjq" path="res://textures/cursor_grab_02.tres" id="4_153q8"]

1
core/Door.gd.uid Normal file
View file

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

View file

@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=3 uid="uid://do65rgg0p2plt"] [gd_scene load_steps=5 format=3 uid="uid://do65rgg0p2plt"]
[ext_resource type="Texture2D" uid="uid://cxharyv0ajr37" path="res://textures/atlas/DioramaEntrance_All_01_SPRT.png" id="1_4vclu"] [ext_resource type="Texture2D" uid="uid://cxharyv0ajr37" path="res://textures/atlas/DioramaEntrance_All_01_SPRT.png" id="1_4vclu"]
[ext_resource type="Script" path="res://core/Door.gd" id="2_8a3ug"] [ext_resource type="Script" uid="uid://cw8e21uwdhung" path="res://core/Door.gd" id="2_8a3ug"]
[sub_resource type="AtlasTexture" id="AtlasTexture_wi524"] [sub_resource type="AtlasTexture" id="AtlasTexture_wi524"]
atlas = ExtResource("1_4vclu") atlas = ExtResource("1_4vclu")

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://clqvgh6qmglue"] [gd_scene load_steps=2 format=3 uid="uid://clqvgh6qmglue"]
[ext_resource type="Script" path="res://core/bridgenode.tres.gd" id="1_tp7pv"] [ext_resource type="Script" uid="uid://c3fo67161sh1i" path="res://core/bridgenode.tres.gd" id="1_tp7pv"]
[node name="Bridge" type="Area2D"] [node name="Bridge" type="Area2D"]
collision_layer = 4 collision_layer = 4

View file

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

1
core/global.gd.uid Normal file
View file

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

1
core/player.gd.uid Normal file
View file

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

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=23 format=3 uid="uid://0m1hk2nu4bps"] [gd_scene load_steps=23 format=3 uid="uid://0m1hk2nu4bps"]
[ext_resource type="Script" path="res://core/player.gd" id="1_whhfc"] [ext_resource type="Script" uid="uid://xdgkpnyfumni" path="res://core/player.gd" id="1_whhfc"]
[ext_resource type="Texture2D" uid="uid://5pmqr3y62guu" path="res://textures/player/currentCloth.tres" id="2_w1l4c"] [ext_resource type="Texture2D" uid="uid://5pmqr3y62guu" path="res://textures/player/currentCloth.tres" id="2_w1l4c"]
[ext_resource type="Texture2D" uid="uid://5qixrbrclydr" path="res://textures/player/currentHat.tres" id="3_ybl0v"] [ext_resource type="Texture2D" uid="uid://5qixrbrclydr" path="res://textures/player/currentHat.tres" id="3_ybl0v"]
[ext_resource type="Animation" uid="uid://bd0mi2x4pkf70" path="res://animations/player/Walk.res" id="4_56ghs"] [ext_resource type="Animation" uid="uid://bd0mi2x4pkf70" path="res://animations/player/Walk.res" id="4_56ghs"]
@ -437,9 +437,9 @@ tracks/37/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_4k813"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_4k813"]
_data = { _data = {
"RESET": SubResource("Animation_oktsg"), &"RESET": SubResource("Animation_oktsg"),
"Walk": ExtResource("4_56ghs"), &"Walk": ExtResource("4_56ghs"),
"idle": ExtResource("5_uweie") &"idle": ExtResource("5_uweie")
} }
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_paj7q"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_paj7q"]

View file

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

1
core/stickernode.gd.uid Normal file
View file

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

View file

@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/Bangers.ttf-4f11207bb3b9f35b34fda7975f1924fb.
Rendering=null Rendering=null
antialiasing=1 antialiasing=1
generate_mipmaps=false generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false multichannel_signed_distance_field=false
msdf_pixel_range=8 msdf_pixel_range=8
msdf_size=48 msdf_size=48
@ -22,6 +23,7 @@ allow_system_fallback=true
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1 subpixel_positioning=1
keep_rounding_remainders=true
oversampling=0.0 oversampling=0.0
Fallbacks=null Fallbacks=null
fallbacks=[] fallbacks=[]

View file

@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/Oswald-Bold.ttf-79f2e9d28b36fff7a79ee35d9b486
Rendering=null Rendering=null
antialiasing=1 antialiasing=1
generate_mipmaps=false generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false multichannel_signed_distance_field=false
msdf_pixel_range=8 msdf_pixel_range=8
msdf_size=48 msdf_size=48
@ -22,6 +23,7 @@ allow_system_fallback=true
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1 subpixel_positioning=1
keep_rounding_remainders=true
oversampling=0.0 oversampling=0.0
Fallbacks=null Fallbacks=null
fallbacks=[] fallbacks=[]

View file

@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/PerfectDOSVGA437.ttf-71796ab40d4e073302c462ce
Rendering=null Rendering=null
antialiasing=1 antialiasing=1
generate_mipmaps=false generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false multichannel_signed_distance_field=false
msdf_pixel_range=8 msdf_pixel_range=8
msdf_size=48 msdf_size=48
@ -22,6 +23,7 @@ allow_system_fallback=true
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1 subpixel_positioning=1
keep_rounding_remainders=true
oversampling=0.0 oversampling=0.0
Fallbacks=null Fallbacks=null
fallbacks=[] fallbacks=[]

View file

@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/ShortStack-Regular.ttf-b8f792f00bec9790ac69e5
Rendering=null Rendering=null
antialiasing=1 antialiasing=1
generate_mipmaps=false generate_mipmaps=false
disable_embedded_bitmaps=true
multichannel_signed_distance_field=false multichannel_signed_distance_field=false
msdf_pixel_range=8 msdf_pixel_range=8
msdf_size=48 msdf_size=48
@ -22,6 +23,7 @@ allow_system_fallback=true
force_autohinter=false force_autohinter=false
hinting=1 hinting=1
subpixel_positioning=1 subpixel_positioning=1
keep_rounding_remainders=true
oversampling=0.0 oversampling=0.0
Fallbacks=null Fallbacks=null
fallbacks=[] fallbacks=[]

View file

@ -2,13 +2,13 @@
[ext_resource type="Texture2D" uid="uid://cacwy4tka88k1" path="res://maps/map1.tres" id="1_pt5vq"] [ext_resource type="Texture2D" uid="uid://cacwy4tka88k1" path="res://maps/map1.tres" id="1_pt5vq"]
[ext_resource type="Texture2D" uid="uid://bm2nsrfle5nsd" path="res://textures/sprites/floor_door_grass_right1.tres" id="2_0jvyl"] [ext_resource type="Texture2D" uid="uid://bm2nsrfle5nsd" path="res://textures/sprites/floor_door_grass_right1.tres" id="2_0jvyl"]
[ext_resource type="Script" path="res://core/Door.gd" id="3_384sx"] [ext_resource type="Script" uid="uid://cw8e21uwdhung" path="res://core/Door.gd" id="3_384sx"]
[ext_resource type="Texture2D" uid="uid://bfnbnuclg8ab0" path="res://textures/sprites/props_wood_bridge1.tres" id="3_k46hy"] [ext_resource type="Texture2D" uid="uid://bfnbnuclg8ab0" path="res://textures/sprites/props_wood_bridge1.tres" id="3_k46hy"]
[ext_resource type="Texture2D" uid="uid://dggavne4ueche" path="res://textures/sprites/Tree_Field_01_SPRT.png" id="4_74dki"] [ext_resource type="Texture2D" uid="uid://dggavne4ueche" path="res://textures/sprites/Tree_Field_01_SPRT.png" id="4_74dki"]
[ext_resource type="Texture2D" uid="uid://b2nhenx3l2uww" path="res://textures/sprites/floor_door_grass_up1.tres" id="4_f0vha"] [ext_resource type="Texture2D" uid="uid://b2nhenx3l2uww" path="res://textures/sprites/floor_door_grass_up1.tres" id="4_f0vha"]
[ext_resource type="PackedScene" uid="uid://do65rgg0p2plt" path="res://core/Door.tscn" id="4_lwk0u"] [ext_resource type="PackedScene" uid="uid://do65rgg0p2plt" path="res://core/Door.tscn" id="4_lwk0u"]
[ext_resource type="PackedScene" uid="uid://bddcriwo55x8k" path="res://prefab/prefab_woddenbridge.tscn" id="4_okpsn"] [ext_resource type="PackedScene" uid="uid://bddcriwo55x8k" path="res://prefab/prefab_woddenbridge.tscn" id="4_okpsn"]
[ext_resource type="Script" path="res://core/stickernode.gd" id="5_ek34p"] [ext_resource type="Script" uid="uid://b6blosn6modfc" path="res://core/stickernode.gd" id="5_ek34p"]
[ext_resource type="Texture2D" uid="uid://ciyh3rnoo4uk" path="res://textures/atlas/SimpleParticles_All_01_SPRT.png" id="6_0dctx"] [ext_resource type="Texture2D" uid="uid://ciyh3rnoo4uk" path="res://textures/atlas/SimpleParticles_All_01_SPRT.png" id="6_0dctx"]
[ext_resource type="Texture2D" uid="uid://1qfjbuyf5aq5" path="res://textures/sprites/props_log1.tres" id="6_8yowd"] [ext_resource type="Texture2D" uid="uid://1qfjbuyf5aq5" path="res://textures/sprites/props_log1.tres" id="6_8yowd"]
[ext_resource type="Texture2D" uid="uid://dcgjlblm2rpy4" path="res://textures/2d_lights_and_shadows_neutral_point_light.webp" id="7_4swoj"] [ext_resource type="Texture2D" uid="uid://dcgjlblm2rpy4" path="res://textures/2d_lights_and_shadows_neutral_point_light.webp" id="7_4swoj"]

View file

@ -8,7 +8,7 @@
[ext_resource type="Texture2D" uid="uid://dggavne4ueche" path="res://textures/sprites/Tree_Field_01_SPRT.png" id="5_lwnej"] [ext_resource type="Texture2D" uid="uid://dggavne4ueche" path="res://textures/sprites/Tree_Field_01_SPRT.png" id="5_lwnej"]
[ext_resource type="Texture2D" uid="uid://chuv25pm2vqen" path="res://textures/atlas/Rocks_All_01_SPRT.png" id="7_pykf8"] [ext_resource type="Texture2D" uid="uid://chuv25pm2vqen" path="res://textures/atlas/Rocks_All_01_SPRT.png" id="7_pykf8"]
[ext_resource type="Texture2D" uid="uid://b366mcexlko72" path="res://textures/atlas/LogsAndWood_All_01_SPRT.png" id="8_ugxkt"] [ext_resource type="Texture2D" uid="uid://b366mcexlko72" path="res://textures/atlas/LogsAndWood_All_01_SPRT.png" id="8_ugxkt"]
[ext_resource type="Script" path="res://core/stickernode.gd" id="9_ap7ts"] [ext_resource type="Script" uid="uid://b6blosn6modfc" path="res://core/stickernode.gd" id="9_ap7ts"]
[ext_resource type="PackedScene" uid="uid://kvjctagkwivk" path="res://prefab/prefab_bush1.tscn" id="10_hc0vj"] [ext_resource type="PackedScene" uid="uid://kvjctagkwivk" path="res://prefab/prefab_bush1.tscn" id="10_hc0vj"]
[ext_resource type="PackedScene" uid="uid://cdurdoebbnau7" path="res://prefab/prefab_bush2.tscn" id="11_hypxn"] [ext_resource type="PackedScene" uid="uid://cdurdoebbnau7" path="res://prefab/prefab_bush2.tscn" id="11_hypxn"]

View file

@ -1,6 +1,6 @@
[gd_scene load_steps=11 format=3 uid="uid://d382cexpr4075"] [gd_scene load_steps=11 format=3 uid="uid://d382cexpr4075"]
[ext_resource type="Script" path="res://core/sceneInstance.gd" id="1_p0vo1"] [ext_resource type="Script" uid="uid://ca64tp2asqllb" path="res://core/sceneInstance.gd" id="1_p0vo1"]
[ext_resource type="PackedScene" uid="uid://0m1hk2nu4bps" path="res://core/player.tscn" id="2_fyjh8"] [ext_resource type="PackedScene" uid="uid://0m1hk2nu4bps" path="res://core/player.tscn" id="2_fyjh8"]
[ext_resource type="PackedScene" uid="uid://wlqsvbqpcbh" path="res://maps/map1.tscn" id="2_qgqfi"] [ext_resource type="PackedScene" uid="uid://wlqsvbqpcbh" path="res://maps/map1.tscn" id="2_qgqfi"]
[ext_resource type="PackedScene" uid="uid://bxin06eifwhb5" path="res://core/Background.tscn" id="4_81gsq"] [ext_resource type="PackedScene" uid="uid://bxin06eifwhb5" path="res://core/Background.tscn" id="4_81gsq"]
@ -196,10 +196,10 @@ tracks/3/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_q5lfn"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_q5lfn"]
_data = { _data = {
"RESET": SubResource("Animation_gjtj4"), &"RESET": SubResource("Animation_gjtj4"),
"travel_down": SubResource("Animation_w8b25"), &"travel_down": SubResource("Animation_w8b25"),
"travel_left": SubResource("Animation_pd367"), &"travel_left": SubResource("Animation_pd367"),
"travel_up": SubResource("Animation_c7s7o") &"travel_up": SubResource("Animation_c7s7o")
} }
[node name="MapManager" type="Node2D"] [node name="MapManager" type="Node2D"]

View file

@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=3 uid="uid://kvjctagkwivk"] [gd_scene load_steps=5 format=3 uid="uid://kvjctagkwivk"]
[ext_resource type="Texture2D" uid="uid://ddajgcwn5ip4c" path="res://textures/sprites/plants_bush1.tres" id="1_gcxqk"] [ext_resource type="Texture2D" uid="uid://ddajgcwn5ip4c" path="res://textures/sprites/plants_bush1.tres" id="1_gcxqk"]
[ext_resource type="Script" path="res://core/stickernode.gd" id="2_aj8js"] [ext_resource type="Script" uid="uid://b6blosn6modfc" path="res://core/stickernode.gd" id="2_aj8js"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_lfx7b"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_lfx7b"]
resource_name = "bush1_sticker_zone" resource_name = "bush1_sticker_zone"

View file

@ -1,7 +1,7 @@
[gd_scene load_steps=5 format=3 uid="uid://cdurdoebbnau7"] [gd_scene load_steps=5 format=3 uid="uid://cdurdoebbnau7"]
[ext_resource type="Texture2D" uid="uid://qsse8uwt06ns" path="res://textures/sprites/plants_bush2.tres" id="1_thd4i"] [ext_resource type="Texture2D" uid="uid://qsse8uwt06ns" path="res://textures/sprites/plants_bush2.tres" id="1_thd4i"]
[ext_resource type="Script" path="res://core/stickernode.gd" id="2_f0erb"] [ext_resource type="Script" uid="uid://b6blosn6modfc" path="res://core/stickernode.gd" id="2_f0erb"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_b3366"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_b3366"]
radius = 56.13 radius = 56.13

View file

@ -13,7 +13,7 @@ config_version=5
config/name="StickerClone" config/name="StickerClone"
config/version="0.1" config/version="0.1"
run/main_scene="res://maps/mainMenu.tscn" run/main_scene="res://maps/mainMenu.tscn"
config/features=PackedStringArray("4.3", "Mobile") config/features=PackedStringArray("4.4", "Mobile")
[autoload] [autoload]

View file

@ -59,7 +59,7 @@ void fragment() {
// Calculate sprite's position relative to the mouse // Calculate sprite's position relative to the mouse
vec2 pPos = uv / TEXTURE_PIXEL_SIZE * trueScale; vec2 pPos = uv / TEXTURE_PIXEL_SIZE * trueScale;
// Only process if the mouse position is valid // Only process if the mouse position is valid
if (normalized_mouse.x > -0.0001) { if (normalized_mouse.x > -0.0001) {
vec2 left_bottom = vec2(0.0, uv_max.y / TEXTURE_PIXEL_SIZE.y * trueScale); vec2 left_bottom = vec2(0.0, uv_max.y / TEXTURE_PIXEL_SIZE.y * trueScale);
@ -140,6 +140,6 @@ void fragment() {
COLOR = finalColor; COLOR = finalColor;
} }
else{ else{
} }
} }

View file

@ -7,6 +7,5 @@ render_mode blend_mix;
" "
graph_offset = Vector2(-44.3781, -104.923)
mode = 1 mode = 1
flags/light_only = false flags/light_only = false

View file

@ -1,6 +1,6 @@
[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://d311puikrpgel"] [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://d311puikrpgel"]
[ext_resource type="Shader" path="res://shaders/shader_outline3.gdshader" id="1_4ciqw"] [ext_resource type="Shader" uid="uid://cdj8qc2oip667" path="res://shaders/shader_outline3.gdshader" id="1_4ciqw"]
[resource] [resource]
shader = ExtResource("1_4ciqw") shader = ExtResource("1_4ciqw")
@ -11,5 +11,5 @@ shader_parameter/outline_color = Color(1, 1, 1, 1)
shader_parameter/border_clipping_fix = true shader_parameter/border_clipping_fix = true
shader_parameter/aspect_ratio = 1.0 shader_parameter/aspect_ratio = 1.0
shader_parameter/square_border = false shader_parameter/square_border = false
shader_parameter/offset = null shader_parameter/offset = Vector2(0, 0)
shader_parameter/max_or_add = true shader_parameter/max_or_add = true

View file

@ -0,0 +1 @@
uid://3yqh0gv1l0ca

View file

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

View file

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

View file

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