Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
ff26893
Duplicate and rename template and all files
PaoloPelaezVillanueva May 25, 2026
2e08fa1
Merge pull request #43 from GameLab6-UTP-Grupo5-Equipo3/copy-rename-t…
PaoloPelaezVillanueva May 25, 2026
0dde410
cambios de paolo
PaoloPelaezVillanueva Jun 5, 2026
ded5893
Merge pull request #44 from GameLab6-UTP-Grupo5-Equipo3/paolo
PaoloPelaezVillanueva Jun 5, 2026
108658b
termino-el-intro-avance-minijuego1
PaoloPelaezVillanueva Jun 6, 2026
d49560e
Merge pull request #45 from GameLab6-UTP-Grupo5-Equipo3/paolo2
PaoloPelaezVillanueva Jun 6, 2026
5c1fef7
avance-juego-de-memorio-falta
PaoloPelaezVillanueva Jun 7, 2026
c86c346
Merge pull request #46 from GameLab6-UTP-Grupo5-Equipo3/paolo2
PaoloPelaezVillanueva Jun 7, 2026
1aeb555
seguimos avanzando este commit se continuo con el mini juego 2 pero q…
PaoloPelaezVillanueva Jun 8, 2026
d69d7de
Merge pull request #47 from GameLab6-UTP-Grupo5-Equipo3/paolo2
PaoloPelaezVillanueva Jun 8, 2026
0440972
avance con los guardianes del mini juego 1
PaoloPelaezVillanueva Jun 8, 2026
13501ab
Merge pull request #48 from GameLab6-UTP-Grupo5-Equipo3/paolo2
PaoloPelaezVillanueva Jun 8, 2026
e66abc6
feat: guard + stealth lacasadelachina
rafsan0629 Jun 12, 2026
62bbe69
diseño minijuego 3
rafsan0629 Jun 15, 2026
1fc0b3f
Actualización de mi rama minijuego3
rafsan0629 Jun 15, 2026
26df5ea
Descripción de mis cambios
Jun 18, 2026
c6ae5ec
Merge con cambios de compañero
Jun 18, 2026
12a5eac
Merge pull request #50 from GameLab6-UTP-Grupo5-Equipo3/paolo2
PaoloPelaezVillanueva Jun 18, 2026
c878cfc
Probando
emilysaavedra1781-pixel Jun 22, 2026
53b32f7
arreglado 4
Jun 22, 2026
d19f4d6
falta un error
Jun 22, 2026
d26d5e3
Merge pull request #52 from GameLab6-UTP-Grupo5-Equipo3/paolo5
PaoloPelaezVillanueva Jun 22, 2026
e4826e4
cambios
Jun 22, 2026
0e5f247
Merge pull request #53 from GameLab6-UTP-Grupo5-Equipo3/emily
PaoloPelaezVillanueva Jun 22, 2026
4385922
Merge branch 'main' of https://github.com/GameLab6-UTP-Grupo5-Equipo3…
Jun 22, 2026
7ecfb11
error solucionado
Jun 22, 2026
0463ad3
errores resueltos
Jun 22, 2026
a75dc51
Merge pull request #54 from GameLab6-UTP-Grupo5-Equipo3/paolo6
PaoloPelaezVillanueva Jun 22, 2026
c85860b
errores resueltos definitivo
Jun 22, 2026
ae9b67a
Merge pull request #55 from GameLab6-UTP-Grupo5-Equipo3/paolo7
PaoloPelaezVillanueva Jun 22, 2026
bebbe49
escena principal listo
Jun 22, 2026
14d1997
Merge pull request #56 from GameLab6-UTP-Grupo5-Equipo3/paolo7
PaoloPelaezVillanueva Jun 22, 2026
ae76678
Puliendo el minijuego3
emilysaavedra1781-pixel Jun 23, 2026
f9a4814
Merge pull request #57 from GameLab6-UTP-Grupo5-Equipo3/merliarous
emilysaavedra1781-pixel Jun 23, 2026
de53a28
Logicaprimerminujuego
emilysaavedra1781-pixel Jun 23, 2026
798c3d6
Merge pull request #58 from GameLab6-UTP-Grupo5-Equipo3/merliarous
emilysaavedra1781-pixel Jun 23, 2026
2ce72db
Avance
emilysaavedra1781-pixel Jun 24, 2026
0166a7c
Merge pull request #59 from GameLab6-UTP-Grupo5-Equipo3/merliarous
emilysaavedra1781-pixel Jun 24, 2026
7c9fc12
fix llave cambio de escena
emilysaavedra1781-pixel Jun 24, 2026
a8a3b3a
modificacion
emilysaavedra1781-pixel Jun 24, 2026
f2c002e
Proyecto al 80%
Jun 25, 2026
9119fa8
Merge pull request #60 from GameLab6-UTP-Grupo5-Equipo3/paolo7
PaoloPelaezVillanueva Jun 25, 2026
bc4b894
Merge: resolver conflictos lacasadelachina
emilysaavedra1781-pixel Jun 25, 2026
ab6c615
Merge pull request #61 from GameLab6-UTP-Grupo5-Equipo3/merliarous
emilysaavedra1781-pixel Jun 25, 2026
85cc64b
Agregando personajes
emilysaavedra1781-pixel Jun 26, 2026
5844a95
Merge pull request #62 from GameLab6-UTP-Grupo5-Equipo3/merliarous
emilysaavedra1781-pixel Jun 26, 2026
b979522
Muchos cambiios dialogos y colisiones
PaoloPelaezVillanueva Jun 26, 2026
c7b1889
Merge pull request #63 from GameLab6-UTP-Grupo5-Equipo3/paolo8
PaoloPelaezVillanueva Jun 26, 2026
d4c9c22
Ultimos puntos
emilysaavedra1781-pixel Jun 26, 2026
bbd5d79
Merge pull request #64 from GameLab6-UTP-Grupo5-Equipo3/merliarous
emilysaavedra1781-pixel Jun 26, 2026
252ff96
salvando la llave
emilysaavedra1781-pixel Jun 26, 2026
eeaa41b
Merge pull request #65 from GameLab6-UTP-Grupo5-Equipo3/merliarous
emilysaavedra1781-pixel Jun 26, 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
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ animations = [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_q0vud")
}],
"loop": true,
"loop": 1,
"name": &"default",
"speed": 10.0
}]
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ animations = [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_1qkrb")
}],
"loop": true,
"loop": 1,
"name": &"default",
"speed": 10.0
}]
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ animations = [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_sjlh1")
}],
"loop": true,
"loop": 1,
"name": &"default",
"speed": 10.0
}]
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ animations = [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_340eh")
}],
"loop": true,
"loop": 1,
"name": &"default",
"speed": 10.0
}]
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ animations = [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_m4cn6")
}],
"loop": true,
"loop": 1,
"name": &"default",
"speed": 10.0
}]
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ animations = [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_81ky2")
}],
"loop": true,
"loop": 1,
"name": &"default",
"speed": 10.0
}]
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ animations = [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_4c5hl")
}],
"loop": true,
"loop": 1,
"name": &"default",
"speed": 10.0
}]
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ animations = [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_hbtjl")
}],
"loop": true,
"loop": 1,
"name": &"default",
"speed": 10.0
}]
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ animations = [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_c0l84")
}],
"loop": true,
"loop": 1,
"name": &"default",
"speed": 10.0
}]
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# SPDX-FileCopyrightText: The Threadbare Authors
# SPDX-License-Identifier: MPL-2.0
extends AudioStreamPlayer


func _ready() -> void:
play()
finished.connect(_on_finished)


func _on_finished() -> void:
play()
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://cf38uveovvxol
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://ckxqmtcgs6uva"
path="res://.godot/imported/amaru.png-a87430e7ae92ea6c0ec05ba96b757d85.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/quests/story_quests/lacasadelachina/0_intro/img/amaru.png"
dest_files=["res://.godot/imported/amaru.png-a87430e7ae92ea6c0ec05ba96b757d85.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://734ndxt0cy0a"
path="res://.godot/imported/amaru_atac (1).png-1e0a270eecced9709fa5228dca42ec5d.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/quests/story_quests/lacasadelachina/0_intro/img/amaru_atac (1).png"
dest_files=["res://.godot/imported/amaru_atac (1).png-1e0a270eecced9709fa5228dca42ec5d.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://bb6fqlqjflqiu"
path="res://.godot/imported/amaru_atac(2).png-eefcdc8e8ae298174e2757665d16c94b.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/quests/story_quests/lacasadelachina/0_intro/img/amaru_atac(2).png"
dest_files=["res://.godot/imported/amaru_atac(2).png-eefcdc8e8ae298174e2757665d16c94b.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://p0foetj57kwm"
path="res://.godot/imported/amaru_dead(1).png-2cf4e2e54683629b4f804e3dcb3431f7.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/quests/story_quests/lacasadelachina/0_intro/img/amaru_dead(1).png"
dest_files=["res://.godot/imported/amaru_dead(1).png-2cf4e2e54683629b4f804e3dcb3431f7.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://de4lmh8tka87m"
path="res://.godot/imported/amaru_dead(2).png-133ec0e55138267e4f25bd3b70f11118.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/quests/story_quests/lacasadelachina/0_intro/img/amaru_dead(2).png"
dest_files=["res://.godot/imported/amaru_dead(2).png-133ec0e55138267e4f25bd3b70f11118.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://b523pv0h5kviq"
path="res://.godot/imported/amaru_walk (1).png-f88249436880e2afef796d8e3ce72bbd.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/quests/story_quests/lacasadelachina/0_intro/img/amaru_walk (1).png"
dest_files=["res://.godot/imported/amaru_walk (1).png-f88249436880e2afef796d8e3ce72bbd.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.
Loading