Commit 6ebd5731 authored by Gerard Gascón's avatar Gerard Gascón
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	scenes/main.tscn
parents 2952591b ee9a569e

assets/animations/decor/escut.tres

0 → 100644
+119 −0
Original line number Diff line number Diff line 
[gd_resource type="SpriteFrames" load_steps=16 format=3 uid="uid://d02qrwmwvxvw2"]



[ext_resource type="Texture2D" uid="uid://c7nmelv0lx3i3" path="res://assets/sprites/decor/DP_acc_escut_Anim.png" id="1_p6fb4"]



[sub_resource type="AtlasTexture" id="AtlasTexture_mq26c"]

atlas = ExtResource("1_p6fb4")

region = Rect2(0, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_p6fb4"]

atlas = ExtResource("1_p6fb4")

region = Rect2(108, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_fwa0p"]

atlas = ExtResource("1_p6fb4")

region = Rect2(216, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_n1vju"]

atlas = ExtResource("1_p6fb4")

region = Rect2(324, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_m1nfd"]

atlas = ExtResource("1_p6fb4")

region = Rect2(0, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_3fnsk"]

atlas = ExtResource("1_p6fb4")

region = Rect2(108, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_njuvk"]

atlas = ExtResource("1_p6fb4")

region = Rect2(216, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_26ptf"]

atlas = ExtResource("1_p6fb4")

region = Rect2(324, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_amy8y"]

atlas = ExtResource("1_p6fb4")

region = Rect2(432, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_knwp6"]

atlas = ExtResource("1_p6fb4")

region = Rect2(540, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_yfy00"]

atlas = ExtResource("1_p6fb4")

region = Rect2(0, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_bnccx"]

atlas = ExtResource("1_p6fb4")

region = Rect2(108, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_hc8ch"]

atlas = ExtResource("1_p6fb4")

region = Rect2(216, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_0nuxw"]

atlas = ExtResource("1_p6fb4")

region = Rect2(324, 108, 108, 108)



[resource]

animations = [{

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_mq26c")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_p6fb4")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_fwa0p")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_n1vju")

}],

"loop": true,

"name": &"fly",

"speed": 5.0

}, {

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_m1nfd")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_3fnsk")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_njuvk")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_26ptf")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_amy8y")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_knwp6")

}],

"loop": true,

"name": &"idle",

"speed": 5.0

}, {

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_yfy00")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_bnccx")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_hc8ch")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_0nuxw")

}],

"loop": true,

"name": &"walk",

"speed": 5.0

}]

assets/animations/decor/espasa.tres

0 → 100644
+119 −0
Original line number Diff line number Diff line 
[gd_resource type="SpriteFrames" load_steps=16 format=3 uid="uid://ghqhbf88d1j8"]



[ext_resource type="Texture2D" uid="uid://drnel2cjwf5dr" path="res://assets/sprites/decor/DP_acc_espasa_Anim.png" id="1_qqvla"]



[sub_resource type="AtlasTexture" id="AtlasTexture_qqvla"]

atlas = ExtResource("1_qqvla")

region = Rect2(0, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_qwppa"]

atlas = ExtResource("1_qqvla")

region = Rect2(108, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_1uixo"]

atlas = ExtResource("1_qqvla")

region = Rect2(216, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_xccp0"]

atlas = ExtResource("1_qqvla")

region = Rect2(324, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_nyede"]

atlas = ExtResource("1_qqvla")

region = Rect2(0, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_cxse4"]

atlas = ExtResource("1_qqvla")

region = Rect2(108, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_edjcl"]

atlas = ExtResource("1_qqvla")

region = Rect2(216, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_jhak8"]

atlas = ExtResource("1_qqvla")

region = Rect2(324, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_t2351"]

atlas = ExtResource("1_qqvla")

region = Rect2(432, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_uw07h"]

atlas = ExtResource("1_qqvla")

region = Rect2(540, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_xcrai"]

atlas = ExtResource("1_qqvla")

region = Rect2(0, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_tywya"]

atlas = ExtResource("1_qqvla")

region = Rect2(108, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_7pu4u"]

atlas = ExtResource("1_qqvla")

region = Rect2(216, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_i1w1o"]

atlas = ExtResource("1_qqvla")

region = Rect2(324, 108, 108, 108)



[resource]

animations = [{

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_qqvla")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_qwppa")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_1uixo")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_xccp0")

}],

"loop": true,

"name": &"fly",

"speed": 5.0

}, {

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_nyede")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_cxse4")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_edjcl")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_jhak8")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_t2351")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_uw07h")

}],

"loop": true,

"name": &"idle",

"speed": 5.0

}, {

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_xcrai")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_tywya")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_7pu4u")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_i1w1o")

}],

"loop": true,

"name": &"walk",

"speed": 5.0

}]

assets/animations/decor/rosa.tres

0 → 100644
+119 −0
Original line number Diff line number Diff line 
[gd_resource type="SpriteFrames" load_steps=16 format=3 uid="uid://c5rqqy7b5ihi5"]



[ext_resource type="Texture2D" uid="uid://dbbcv076jh4ep" path="res://assets/sprites/decor/DP_acc_rosa_Anim.png" id="1_ewn65"]



[sub_resource type="AtlasTexture" id="AtlasTexture_ewn65"]

atlas = ExtResource("1_ewn65")

region = Rect2(0, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_ifv4k"]

atlas = ExtResource("1_ewn65")

region = Rect2(108, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_uera2"]

atlas = ExtResource("1_ewn65")

region = Rect2(216, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_0q8tn"]

atlas = ExtResource("1_ewn65")

region = Rect2(324, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_f2bes"]

atlas = ExtResource("1_ewn65")

region = Rect2(0, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_albls"]

atlas = ExtResource("1_ewn65")

region = Rect2(108, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_mlrdx"]

atlas = ExtResource("1_ewn65")

region = Rect2(216, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_dipuj"]

atlas = ExtResource("1_ewn65")

region = Rect2(324, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_d0xss"]

atlas = ExtResource("1_ewn65")

region = Rect2(432, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_mpdbr"]

atlas = ExtResource("1_ewn65")

region = Rect2(540, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_dy3ut"]

atlas = ExtResource("1_ewn65")

region = Rect2(0, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_gi66g"]

atlas = ExtResource("1_ewn65")

region = Rect2(108, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_am77p"]

atlas = ExtResource("1_ewn65")

region = Rect2(216, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_asxml"]

atlas = ExtResource("1_ewn65")

region = Rect2(324, 108, 108, 108)



[resource]

animations = [{

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_ewn65")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_ifv4k")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_uera2")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_0q8tn")

}],

"loop": true,

"name": &"fly",

"speed": 5.0

}, {

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_f2bes")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_albls")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_mlrdx")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_dipuj")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_d0xss")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_mpdbr")

}],

"loop": true,

"name": &"idle",

"speed": 5.0

}, {

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_dy3ut")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_gi66g")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_am77p")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_asxml")

}],

"loop": true,

"name": &"walk",

"speed": 5.0

}]

assets/animations/dragons/blau.tres

0 → 100644
+119 −0
Original line number Diff line number Diff line 
[gd_resource type="SpriteFrames" load_steps=16 format=3 uid="uid://bfviwc5qcl6fj"]



[ext_resource type="Texture2D" uid="uid://clp02nlyac2g8" path="res://assets/sprites/dragons/DP_drac02_Anim.png" id="1_yijd7"]



[sub_resource type="AtlasTexture" id="AtlasTexture_fl06t"]

atlas = ExtResource("1_yijd7")

region = Rect2(0, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_14fve"]

atlas = ExtResource("1_yijd7")

region = Rect2(108, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_ce0w3"]

atlas = ExtResource("1_yijd7")

region = Rect2(216, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_x5531"]

atlas = ExtResource("1_yijd7")

region = Rect2(324, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_gxug3"]

atlas = ExtResource("1_yijd7")

region = Rect2(0, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_dfjkg"]

atlas = ExtResource("1_yijd7")

region = Rect2(108, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_fq5di"]

atlas = ExtResource("1_yijd7")

region = Rect2(216, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_l5odh"]

atlas = ExtResource("1_yijd7")

region = Rect2(324, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_qcp1n"]

atlas = ExtResource("1_yijd7")

region = Rect2(432, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_0h0gq"]

atlas = ExtResource("1_yijd7")

region = Rect2(540, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_m6iqp"]

atlas = ExtResource("1_yijd7")

region = Rect2(0, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_hvha6"]

atlas = ExtResource("1_yijd7")

region = Rect2(108, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_2mhj3"]

atlas = ExtResource("1_yijd7")

region = Rect2(216, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_qwnnt"]

atlas = ExtResource("1_yijd7")

region = Rect2(324, 108, 108, 108)



[resource]

animations = [{

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_fl06t")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_14fve")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_ce0w3")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_x5531")

}],

"loop": true,

"name": &"fly",

"speed": 5.0

}, {

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_gxug3")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_dfjkg")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_fq5di")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_l5odh")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_qcp1n")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_0h0gq")

}],

"loop": true,

"name": &"idle",

"speed": 5.0

}, {

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_m6iqp")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_hvha6")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_2mhj3")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_qwnnt")

}],

"loop": true,

"name": &"walk",

"speed": 5.0

}]

assets/animations/dragons/gris.tres

0 → 100644
+119 −0
Original line number Diff line number Diff line 
[gd_resource type="SpriteFrames" load_steps=16 format=3 uid="uid://8ooldj4ypfj2"]



[ext_resource type="Texture2D" uid="uid://c0ix7r57l1swx" path="res://assets/sprites/dragons/DP_drac06_Anim.png" id="1_2went"]



[sub_resource type="AtlasTexture" id="AtlasTexture_waewi"]

atlas = ExtResource("1_2went")

region = Rect2(0, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_bqp3r"]

atlas = ExtResource("1_2went")

region = Rect2(108, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_to3q2"]

atlas = ExtResource("1_2went")

region = Rect2(216, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_akaea"]

atlas = ExtResource("1_2went")

region = Rect2(324, 216, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_xbxev"]

atlas = ExtResource("1_2went")

region = Rect2(0, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_e4f2w"]

atlas = ExtResource("1_2went")

region = Rect2(108, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_1h3nn"]

atlas = ExtResource("1_2went")

region = Rect2(216, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_680yn"]

atlas = ExtResource("1_2went")

region = Rect2(324, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_s56j0"]

atlas = ExtResource("1_2went")

region = Rect2(432, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_iaqbq"]

atlas = ExtResource("1_2went")

region = Rect2(540, 0, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_ny8vc"]

atlas = ExtResource("1_2went")

region = Rect2(0, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_s1wsx"]

atlas = ExtResource("1_2went")

region = Rect2(108, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_dy35q"]

atlas = ExtResource("1_2went")

region = Rect2(216, 108, 108, 108)



[sub_resource type="AtlasTexture" id="AtlasTexture_nlpvo"]

atlas = ExtResource("1_2went")

region = Rect2(324, 108, 108, 108)



[resource]

animations = [{

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_waewi")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_bqp3r")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_to3q2")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_akaea")

}],

"loop": true,

"name": &"fly",

"speed": 5.0

}, {

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_xbxev")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_e4f2w")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_1h3nn")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_680yn")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_s56j0")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_iaqbq")

}],

"loop": true,

"name": &"idle",

"speed": 5.0

}, {

"frames": [{

"duration": 1.0,

"texture": SubResource("AtlasTexture_ny8vc")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_s1wsx")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_dy35q")

}, {

"duration": 1.0,

"texture": SubResource("AtlasTexture_nlpvo")

}],

"loop": true,

"name": &"walk",

"speed": 5.0

}]