Merge branch 'master' of gitlab.com:MaddoScientisto/cirnogodot

This commit is contained in:
MaddoScientisto 2024-12-30 09:10:07 +01:00
commit ce2d4231bf
20 changed files with 1804 additions and 54 deletions

View file

@ -1,7 +1,6 @@
[gd_scene load_steps=19 format=4 uid="uid://bv451a8wgty4u"]
[gd_scene load_steps=18 format=4 uid="uid://bv451a8wgty4u"]
[ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_8mh54"]
[ext_resource type="PackedScene" uid="uid://cxmcqehjjy82j" path="res://Scenes/reisen.tscn" id="3_8k37m"]
[ext_resource type="PackedScene" uid="uid://rp4jhx0tuh24" path="res://Scenes/fragola.tscn" id="4_s7wq6"]
[ext_resource type="PackedScene" uid="uid://bj28qiai2x2ar" path="res://Scenes/Barrel.tscn" id="5_3uba3"]
[ext_resource type="PackedScene" uid="uid://uaf5r6cd71hu" path="res://Scenes/Furniture/LargeTank.tscn" id="6_nkauc"]
@ -280,6 +279,7 @@ position = Vector2(-766, -74)
[node name="CameraController" type="Camera2D" parent="."]
script = ExtResource("6_t8ide")
pixel_snap = false
[node name="Player" parent="." instance=ExtResource("2_8mh54")]
position = Vector2(-790, -165)
@ -301,9 +301,6 @@ polygon = PackedVector2Array(95, 57, 46, 58, -83, 61, -91, -37, 88, -37, 114, -1
[node name="Fragola" parent="." instance=ExtResource("4_s7wq6")]
position = Vector2(-743, -117)
[node name="CharacterBody2D" parent="." instance=ExtResource("3_8k37m")]
position = Vector2(78, -15)
[node name="Enemy" parent="." instance=ExtResource("18_ixcwn")]
position = Vector2(-687, -10)