Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
92e695c
duplicate folder
EduGAH21 May 25, 2026
d9a62b2
duplicate folder
EduGAH21 May 25, 2026
ddcbb22
Merge pull request #43 from GameLab6-UTP-Grupo5-Equipo2/createfolder
LauraGomezLinares May 29, 2026
0583fe3
<agrege al personaje y pasto en la introduccion y cierre>
KarmDK Jun 2, 2026
8bd7ec9
cambios jade
KarmDK Jun 3, 2026
2ba63de
Revert "cambios jade"
KarmDK Jun 3, 2026
2019b9a
Revert "<agrege al personaje y pasto en la introduccion y cierre>"
KarmDK Jun 3, 2026
96d9bac
animacion y grass
KarmDK Jun 3, 2026
c8a6c16
Merge pull request #44 from GameLab6-UTP-Grupo5-Equipo2/jade
KarmDK Jun 3, 2026
f257e9f
diseño minigame2 falta logica y algunas cosas mas
LauraGomezLinares Jun 8, 2026
0a737f2
Programación: Crear character del personaje
JSobero Jun 8, 2026
7cb33c3
Merge pull request #45 from GameLab6-UTP-Grupo5-Equipo2/droxgame2
LauraGomezLinares Jun 8, 2026
b4338a8
mapa 1
KarmDK Jun 8, 2026
9d82f69
Merge branch 'main' into jade
KarmDK Jun 8, 2026
fcc086e
Intro narracion y escena
DafneIncio Jun 8, 2026
be3a49d
Merge pull request #46 from GameLab6-UTP-Grupo5-Equipo2/dafne
DafneIncio Jun 8, 2026
f7285ef
avance intro y mapa nivel 1
KarmDK Jun 9, 2026
ad1a811
Merge branch 'main' into jade
KarmDK Jun 9, 2026
ab96b5e
Merge pull request #48 from GameLab6-UTP-Grupo5-Equipo2/jade
KarmDK Jun 9, 2026
5566c24
arreglo mapa1
KarmDK Jun 9, 2026
018a28b
Merge branch 'jade' of https://github.com/GameLab6-UTP-Grupo5-Equipo2…
KarmDK Jun 9, 2026
1f05f31
Fix: Corregir archivos en conflictos
JSobero Jun 9, 2026
d33e0fb
animaciones_nuevas_enemigos
KarmDK Jun 12, 2026
b01129a
Merge pull request #49 from GameLab6-UTP-Grupo5-Equipo2/jade
KarmDK Jun 12, 2026
a360664
Merge branch 'main' of https://github.com/GameLab6-UTP-Grupo5-Equipo2…
JSobero Jun 12, 2026
e9df4fb
logica de juego finalizado, falta coso pequeño del agua
LauraGomezLinares Jun 12, 2026
8e18d96
Merge branch 'main' into droxgame2
LauraGomezLinares Jun 12, 2026
b3bdf04
Merge pull request #50 from GameLab6-UTP-Grupo5-Equipo2/droxgame2
LauraGomezLinares Jun 12, 2026
65c8ce2
Minijuego3
EduGAH21 Jun 12, 2026
085c36c
Minijuego3
EduGAH21 Jun 12, 2026
f07057c
make: minijuego 1 (mécanicas y programación)
JSobero Jun 12, 2026
72df1b8
Merge pull request #51 from GameLab6-UTP-Grupo5-Equipo2/joaquin
JSobero Jun 12, 2026
43186c0
arreglo de error
EduGAH21 Jun 12, 2026
2402b5c
Merge pull request #52 from GameLab6-UTP-Grupo5-Equipo2/eduardogah
EduGAH21 Jun 12, 2026
f0a90e4
mapa de minijuego 1 y 3 actualizado
KarmDK Jun 14, 2026
fd39d08
Merge pull request #53 from GameLab6-UTP-Grupo5-Equipo2/jade
KarmDK Jun 14, 2026
1022e90
animacion defeated usada para el minijuego 2, el agua y las baldosas …
LauraGomezLinares Jun 15, 2026
b41ef39
Merge branch 'main' into droxgame2
LauraGomezLinares Jun 15, 2026
4386d3d
Merge pull request #54 from GameLab6-UTP-Grupo5-Equipo2/droxgame2
LauraGomezLinares Jun 15, 2026
91f1c0c
animaciones
KarmDK Jun 15, 2026
2576d54
Merge branch 'main' into jade
JSobero Jun 15, 2026
dc9bc36
Merge pull request #55 from GameLab6-UTP-Grupo5-Equipo2/jade
KarmDK Jun 16, 2026
8a7f78e
decripcion juego 3
DafneIncio Jun 16, 2026
cd5d08d
Merge pull request #56 from GameLab6-UTP-Grupo5-Equipo2/dafne
DafneIncio Jun 17, 2026
8f3e5e3
main reparado
KarmDK Jun 19, 2026
806f639
Merge pull request #57 from GameLab6-UTP-Grupo5-Equipo2/main_reparada
KarmDK Jun 19, 2026
fa273ef
Minijuego2 arreglado mostly, preguntar por la parte de arriba y el au…
LauraGomezLinares Jun 20, 2026
abd9654
Merge pull request #58 from GameLab6-UTP-Grupo5-Equipo2/droxrama2
LauraGomezLinares Jun 20, 2026
d2dc4bc
arreglo de player, enemigo nvl1, enemigo nvl2, piso nivel 3
KarmDK Jun 20, 2026
6f0a428
Merge branch 'main' of https://github.com/GameLab6-UTP-Grupo5-Equipo2…
KarmDK Jun 20, 2026
44ecc48
Merge pull request #59 from GameLab6-UTP-Grupo5-Equipo2/jade2
KarmDK Jun 20, 2026
b07d9a5
player
KarmDK Jun 20, 2026
f7b67c9
Merge pull request #60 from GameLab6-UTP-Grupo5-Equipo2/jade2
KarmDK Jun 20, 2026
96face4
agregado el dialogo y mejora en secuencia de una escena a otra
KarmDK Jun 21, 2026
55f0e08
Merge pull request #61 from GameLab6-UTP-Grupo5-Equipo2/jade2
KarmDK Jun 21, 2026
6e36c6d
actu nvl2
KarmDK Jun 21, 2026
d6fc7a2
Merge pull request #62 from GameLab6-UTP-Grupo5-Equipo2/jade2
KarmDK Jun 21, 2026
6813176
programación: primer juego
JSobero Jun 22, 2026
5b9f00f
Merge pull request #63 from GameLab6-UTP-Grupo5-Equipo2/rama-joaquin
JSobero Jun 22, 2026
a3b563f
cambios iniciales de luces sokoban
LauraGomezLinares Jun 22, 2026
25fe154
tiles
KarmDK Jun 22, 2026
5fc6d27
Merge pull request #64 from GameLab6-UTP-Grupo5-Equipo2/jade2
KarmDK Jun 22, 2026
a23cdff
Merge branch 'main' of https://github.com/GameLab6-UTP-Grupo5-Equipo2…
LauraGomezLinares Jun 23, 2026
90e39f8
luces version 1 añadidas, falta agregar las de los lados, luego ver q…
LauraGomezLinares Jun 23, 2026
2fe43fa
Merge pull request #65 from GameLab6-UTP-Grupo5-Equipo2/plswork
LauraGomezLinares Jun 23, 2026
4564a71
minijuego 2 asset
KarmDK Jun 23, 2026
0ea3016
resol
KarmDK Jun 23, 2026
b6ccb71
arreglos
KarmDK Jun 23, 2026
353e336
Merge pull request #66 from GameLab6-UTP-Grupo5-Equipo2/jade2
KarmDK Jun 23, 2026
8e3a98c
nvl3 movilidad
KarmDK Jun 23, 2026
83a0ba8
Merge pull request #67 from GameLab6-UTP-Grupo5-Equipo2/jade2
KarmDK Jun 23, 2026
884e91f
agregado outro y añadi cosas nvl 2
KarmDK Jun 23, 2026
fbd9a03
Merge pull request #68 from GameLab6-UTP-Grupo5-Equipo2/jade2
KarmDK Jun 23, 2026
0137a0b
lvl3 iluminacion hecha
LauraGomezLinares Jun 24, 2026
c7635d1
Merge pull request #69 from GameLab6-UTP-Grupo5-Equipo2/iluminaciondrox
LauraGomezLinares Jun 24, 2026
f0f83df
parte 2 iluminacion, lvl3 terminado
LauraGomezLinares Jun 24, 2026
7f4acb0
Merge pull request #70 from GameLab6-UTP-Grupo5-Equipo2/iluminacion2drox
LauraGomezLinares Jun 24, 2026
0062321
tiles nvl2
KarmDK Jun 24, 2026
2fa9d59
Merge pull request #71 from GameLab6-UTP-Grupo5-Equipo2/jade2
KarmDK Jun 24, 2026
920f334
outro
KarmDK Jun 24, 2026
5daf4ae
Merge pull request #72 from GameLab6-UTP-Grupo5-Equipo2/jade2
KarmDK Jun 24, 2026
80d2444
Merge pull request #73 from GameLab6-UTP-Grupo5-Equipo2/iluminacion2drox
KarmDK Jun 25, 2026
603ed39
iluminacion nivel1
LauraGomezLinares Jun 25, 2026
4e58307
Merge pull request #74 from GameLab6-UTP-Grupo5-Equipo2/ok
LauraGomezLinares Jun 25, 2026
1de0209
Dialogo minijuego 2
DafneIncio Jun 25, 2026
e74aa60
Merge pull request #75 from GameLab6-UTP-Grupo5-Equipo2/dialogo
DafneIncio Jun 25, 2026
c701adb
nvl2
KarmDK Jun 25, 2026
e592e34
Merge branch 'main' into jade2
KarmDK Jun 25, 2026
d31f0e6
revision de dialogos
KarmDK Jun 25, 2026
9d303e1
dialogos revision
KarmDK Jun 25, 2026
a13b672
Merge pull request #76 from GameLab6-UTP-Grupo5-Equipo2/jade2
KarmDK Jun 25, 2026
4e48c8d
los barriles rebotaban despues de reiniciar
LauraGomezLinares Jun 25, 2026
7a382c6
Merge pull request #77 from GameLab6-UTP-Grupo5-Equipo2/ok
LauraGomezLinares Jun 25, 2026
b369d4b
modifique quest.tres
KarmDK Jun 29, 2026
ac437c0
Merge pull request #78 from GameLab6-UTP-Grupo5-Equipo2/jade2
KarmDK Jun 29, 2026
3cea094
corregi el nobre del juego en quest.tres
KarmDK Jun 29, 2026
a7946c8
Merge pull request #79 from GameLab6-UTP-Grupo5-Equipo2/jade2
KarmDK Jun 29, 2026
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://c7jd3g3ecgltl"
path="res://.godot/imported/aea-rock.png-057a1da628b6dea5940c7ef514730505.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/quests/story_quests/legends_without_name/0_intro/imagen/aea-rock.png"
dest_files=["res://.godot/imported/aea-rock.png-057a1da628b6dea5940c7ef514730505.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://c1x60p6wnw26w"
path="res://.godot/imported/aea-tree.png-7061624b5c0886be70d6786d683dfcee.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/quests/story_quests/legends_without_name/0_intro/imagen/aea-tree.png"
dest_files=["res://.godot/imported/aea-tree.png-7061624b5c0886be70d6786d683dfcee.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# SPDX-FileCopyrightText: The Threadbare Authors
# SPDX-License-Identifier: MPL-2.0

~ start
Narrador: Sobre el reino se está alzando la oscuridad.
Narrador: Desde un antiguo castillo, un malvado mago utiliza su poder para aterrorizar las tierras cercanas.
Narrador: Tal vez hoy aparezca alguien que pueda cambiarlo.


do animation_player.play(&"walk_on")
do animation_player.animation_finished
Narrador: Dígame usted, honorable caballerito, ¿estaría dispuesto a aceptar este desafío?
Caballerito: No sé si soy el héroe que el reino espera, pero no me quedaré de brazos cruzados mientras la gente sufre.
do animation_player.play(&"walk_off")

=> END
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[remap]

importer="dialogue_manager"
importer_version=15
type="Resource"
uid="uid://fcfjwudr112g"
path="res://.godot/imported/legends_without_name_intro.dialogue-45115e96023c4fa85bec0b9f9aec9c68.tres"

[deps]

source_file="res://scenes/quests/story_quests/legends_without_name/0_intro/intro_components/legends_without_name_intro.dialogue"
dest_files=["res://.godot/imported/legends_without_name_intro.dialogue-45115e96023c4fa85bec0b9f9aec9c68.tres"]

[params]

defaults=true

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[gd_scene format=3 uid="uid://dg1fpkm17n6xx"]

[ext_resource type="Texture2D" uid="uid://cjw5ilwa2o55d" path="res://scenes/quests/story_quests/legends_without_name/agregadoJade/antorchas_2.png" id="1_817oq"]

[sub_resource type="Gradient" id="Gradient_p7xgw"]
interpolation_color_space = 2
offsets = PackedFloat32Array(0.14397906, 0.22774869, 0.35078534, 0.58638746, 0.7408377, 1)
colors = PackedColorArray(0.25436097, 0.81617206, 0.4696772, 1, 0.22476119, 0.694575, 0.34330177, 1, 0.15114713, 0.4741559, 0.23215806, 1, 0.14562306, 0.45857182, 0.22398634, 1, 0.07866899, 0.28016356, 0.12730488, 1, 0, 0, 0, 1)

[sub_resource type="GradientTexture2D" id="GradientTexture2D_vd6bu"]
gradient = SubResource("Gradient_p7xgw")
width = 65
height = 65
use_hdr = true
fill = 1
fill_from = Vector2(0.4957265, 0.525641)
fill_to = Vector2(0.15384616, 0.12820514)

[node name="Antorchas2" type="Sprite2D" unique_id=722026995]
texture = ExtResource("1_817oq")

[node name="PointLight2D" type="PointLight2D" parent="." unique_id=1520786628]
position = Vector2(0, 29)
color = Color(0, 0.6509804, 0.3254902, 0.8980392)
energy = 1.4
shadow_enabled = true
shadow_color = Color(0, 0.53333336, 0, 0.58431375)
texture = SubResource("GradientTexture2D_vd6bu")
texture_scale = 2.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[gd_scene format=3 uid="uid://bekyv1lwurkdn"]

[ext_resource type="Texture2D" uid="uid://cjw5ilwa2o55d" path="res://scenes/quests/story_quests/legends_without_name/agregadoJade/antorchas_2.png" id="1_nwaan"]
[ext_resource type="Texture2D" uid="uid://c61d4x21m4gbf" path="res://scenes/quests/story_quests/legends_without_name/agregadoJade/Luz_circulo.png" id="2_8sb5h"]

[node name="Antorchas2" type="Sprite2D" unique_id=649859331]
rotation = -1.5707964
scale = Vector2(1, 0.349)
texture = ExtResource("1_nwaan")

[node name="PointLight2D" type="PointLight2D" parent="." unique_id=2006027172]
position = Vector2(1.7484558e-07, -11.461319)
rotation = 1.5707964
scale = Vector2(1.9, 1)
color = Color(0, 0.6509804, 0.3254902, 0.8980392)
energy = 1.4
shadow_enabled = true
shadow_color = Color(0.1254902, 0.53333336, 0, 0.58431375)
texture = ExtResource("2_8sb5h")
texture_scale = 0.35
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[gd_scene format=3 uid="uid://cxyhs8xhgrgo4"]

[ext_resource type="Texture2D" uid="uid://dmxdeph40d2e4" path="res://scenes/quests/story_quests/legends_without_name/agregadoJade/antorchas_3.png" id="1_6kthq"]

[sub_resource type="Gradient" id="Gradient_vd6bu"]
interpolation_color_space = 2
offsets = PackedFloat32Array(0.06806283, 0.2303665, 0.35340315, 0.58900523, 0.7408377, 0.9947644)
colors = PackedColorArray(0.14509805, 0.13725491, 0.8509804, 1, 0.3882353, 0.5647059, 0.9529412, 1, 0.18444058, 0.29261717, 0.7669307, 1, 0.12525225, 0.20627114, 0.5863486, 1, 0.10044872, 0.17292097, 0.5066322, 1, 0, 0, 0, 1)

[sub_resource type="GradientTexture2D" id="GradientTexture2D_pxvy8"]
gradient = SubResource("Gradient_vd6bu")
width = 65
height = 65
use_hdr = true
fill = 1
fill_from = Vector2(0.50427353, 0.53418803)
fill_to = Vector2(0.16666667, 0.10683761)

[node name="Antorchasblue3" type="Sprite2D" unique_id=171169395]
texture = ExtResource("1_6kthq")

[node name="PointLight2D" type="PointLight2D" parent="." unique_id=661762884]
position = Vector2(0, 32)
color = Color(0, 0.57254905, 0.80784315, 0.74509805)
energy = 1.4
shadow_enabled = true
shadow_color = Color(0, 0.8627451, 0.91764706, 0.58431375)
texture = SubResource("GradientTexture2D_pxvy8")
texture_scale = 2.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[gd_scene format=3 uid="uid://nuky1a5qko1u"]

[ext_resource type="Texture2D" uid="uid://dmxdeph40d2e4" path="res://scenes/quests/story_quests/legends_without_name/agregadoJade/antorchas_3.png" id="1_y7hm8"]
[ext_resource type="Texture2D" uid="uid://c61d4x21m4gbf" path="res://scenes/quests/story_quests/legends_without_name/agregadoJade/Luz_circulo.png" id="2_gio0h"]

[node name="Antorchasblueside" type="Sprite2D" unique_id=1438941047]
rotation = -1.5707964
scale = Vector2(1, 0.349)
texture = ExtResource("1_y7hm8")

[node name="PointLight2D" type="PointLight2D" parent="." unique_id=1975559255]
position = Vector2(-8, -14.326649)
rotation = 1.5707964
scale = Vector2(1.9, 1)
color = Color(0.07450981, 0.28627452, 0.8862745, 0.84313726)
energy = 1.4
shadow_enabled = true
shadow_color = Color(0.1254902, 0.53333336, 0.9490196, 0.58431375)
texture = ExtResource("2_gio0h")
texture_scale = 0.35
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[gd_scene format=3 uid="uid://6tm16fl2f3xh"]

[ext_resource type="Texture2D" uid="uid://52ed6kgyuvhj" path="res://scenes/quests/story_quests/legends_without_name/agregadoJade/minijuego_2/Lampara_Nvl2.png" id="1_nto6g"]

[sub_resource type="Gradient" id="Gradient_6ikwx"]

[sub_resource type="GradientTexture2D" id="GradientTexture2D_jpnnp"]
gradient = SubResource("Gradient_6ikwx")

[node name="LamparaNvl2" type="Sprite2D" unique_id=1751500493]
texture = ExtResource("1_nto6g")

[node name="PointLight2D" type="PointLight2D" parent="." unique_id=904088152]
position = Vector2(-10, 22)
texture = SubResource("GradientTexture2D_jpnnp")
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[gd_scene format=3 uid="uid://c48ldov3ptcx"]

[ext_resource type="Texture2D" uid="uid://52ed6kgyuvhj" path="res://scenes/quests/story_quests/legends_without_name/agregadoJade/minijuego_2/Lampara_Nvl2.png" id="1_h431f"]

[sub_resource type="Gradient" id="Gradient_6ikwx"]
interpolation_mode = 1
offsets = PackedFloat32Array(0.32304037, 0.43942994, 0.58194774, 0.72684085, 0.9097387, 0.9928741)
colors = PackedColorArray(0.9529412, 0.74509805, 0.24705882, 0.7921569, 0.89027613, 0.5722289, 0.11092438, 0.90668267, 0.8392157, 0.43137255, 0, 1, 0.65882355, 0.28235295, 0, 1, 0.41973218, 0.12456212, 0, 1, 0.118446045, 0.01660777, 0, 1)

[sub_resource type="GradientTexture2D" id="GradientTexture2D_jpnnp"]
gradient = SubResource("Gradient_6ikwx")
fill = 1
fill_from = Vector2(0.52991456, 0.51282054)
fill_to = Vector2(0.025641026, 0.52136755)

[node name="LamparaNvl2" type="Sprite2D" unique_id=1692636314]
texture = ExtResource("1_h431f")

[node name="PointLight2D" type="PointLight2D" parent="." unique_id=147496107]
position = Vector2(53, 26)
color = Color(1, 0.56078434, 0.27058825, 0.69803923)
energy = 1.85
shadow_enabled = true
texture = SubResource("GradientTexture2D_jpnnp")
texture_scale = 3.9

Large diffs are not rendered by default.

Loading
Loading