-
Notifications
You must be signed in to change notification settings - Fork 258
Add Laberinto del fauno StoryQuest #1661
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
andree-git
wants to merge
40
commits into
endlessm:main
Choose a base branch
from
Game-Lab-5-0-UTP-Grupo-2-Equipo-5:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 37 commits
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
f776f0e
Duplicate and rename template and all files
a-flores-industrial f2dc5ad
equipo5
a-flores-industrial 03ccd33
Merge pull request #44 from Game-Lab-5-0-UTP-Grupo-2-Equipo-5/copy-re…
Uriel-20-07 3fd85f9
Duplicate and rename template and all files
a-flores-industrial 9cae231
Merge pull request #45 from Game-Lab-5-0-UTP-Grupo-2-Equipo-5/copy-re…
a-flores-industrial ff2ca88
Renombre la carpeta
a-flores-industrial 977b01c
Borre la carpeta anterior
a-flores-industrial 3c486bf
Implementación de los marcos narrativos
Lyonbp f78d38c
Mecanica de Correr, Estamina y Antorchas
andree-git 84c343c
Merge pull request #46 from Game-Lab-5-0-UTP-Grupo-2-Equipo-5/intro-o…
Lyonbp 2594873
Prototipo del 1er minijuego
andree-git a65ebb0
Correcion de errores
andree-git d27ecc6
Añadir sprites
andree-git 5c60118
No se que cambie
Uriel-20-07 6c3dffb
Revert unintended changes to Dialogue Manager addon
Uriel-20-07 cb928a7
Se subieron las imagenes
Uriel-20-07 3c1baf6
SOLUCIoN DE LA ESCENA yo lo hize
Uriel-20-07 d0d5713
Se borraron archivos que pueden generar conflictos
Uriel-20-07 251740f
Se cambio el mapa creo
Uriel-20-07 46978d2
resolviendo laberinto
aa0946a
Merge pull request #47 from Game-Lab-5-0-UTP-Grupo-2-Equipo-5/programar
JuaniCargnel 62d03e4
solucion a que no se puede abrir primer mapa
7998d8e
moviendo archivos creados aparte andre
326cc85
Minigame1 en un 70%
andree-git a4cd634
todas las mecanicas hechas: Falta dialogos y colocar al jefe
andree-git 970f1cc
Contorno del minijuego1
Uriel-20-07 84c9401
Merge branch 'programar' of https://github.com/Game-Lab-5-0-UTP-Grupo…
Uriel-20-07 a540edf
Laberinto del Fauno Colisiones
Uriel-20-07 0c9c7c1
Knockback ativado: sigue faltando el jefe. Me olvide por segunda vez
andree-git 4a532c0
Por fin esta el vendito sapo
andree-git 0af1dc6
Dialogos de Inicio y Agregar llave
Uriel-20-07 7358aea
Tengo sueño
andree-git 11feeb4
Merge pull request #49 from Game-Lab-5-0-UTP-Grupo-2-Equipo-5/programar
andree-git 882ee66
Añadí carpeta Avance del Juego e Historia
Cryster27 565aaa8
Mis cambios sobre la version 11feeb40
andree-git 3dfe74e
Merge pull request #50 from Game-Lab-5-0-UTP-Grupo-2-Equipo-5/version…
andree-git f98d447
Delete Avance del Juego e Historia - Cristopher Cabrera directory
andree-git c474dde
Revert changes to .pre-commit-config.yaml
andree-git b1f424f
Revert changes to project.godot
andree-git 4abcd0b
Ultimos arreglos
andree-git File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wjt marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
.../quests/story_quests/laberinto_del_fauno/0_intro/intro_components/casxa (2).png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions
40
scenes/quests/story_quests/laberinto_del_fauno/0_intro/intro_components/casxa (2).png.import
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| [remap] | ||
|
|
||
| importer="texture" | ||
| type="CompressedTexture2D" | ||
| uid="uid://cg7vonk4o3ae1" | ||
| path="res://.godot/imported/casxa (2).png-6740c5e255ba9a0183170b19acf96a09.ctex" | ||
| metadata={ | ||
| "vram_texture": false | ||
| } | ||
|
|
||
| [deps] | ||
|
|
||
| source_file="res://scenes/quests/story_quests/laberinto_del_fauno/0_intro/intro_components/casxa (2).png" | ||
| dest_files=["res://.godot/imported/casxa (2).png-6740c5e255ba9a0183170b19acf96a09.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 |
3 changes: 3 additions & 0 deletions
3
...s/laberinto_del_fauno/0_intro/intro_components/fausto_1 (2) - copia - copia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions
40
...ests/laberinto_del_fauno/0_intro/intro_components/fausto_1 (2) - copia - copia.png.import
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| [remap] | ||
|
|
||
| importer="texture" | ||
| type="CompressedTexture2D" | ||
| uid="uid://ds5brj6lt7kjk" | ||
| path="res://.godot/imported/fausto_1 (2) - copia - copia.png-d94e72d1532d2b79b70fcf2da65ecdf9.ctex" | ||
| metadata={ | ||
| "vram_texture": false | ||
| } | ||
|
|
||
| [deps] | ||
|
|
||
| source_file="res://scenes/quests/story_quests/laberinto_del_fauno/0_intro/intro_components/fausto_1 (2) - copia - copia.png" | ||
| dest_files=["res://.godot/imported/fausto_1 (2) - copia - copia.png-d94e72d1532d2b79b70fcf2da65ecdf9.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 |
3 changes: 3 additions & 0 deletions
3
...ry_quests/laberinto_del_fauno/0_intro/intro_components/fausto_1 (2) - copia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions
40
...story_quests/laberinto_del_fauno/0_intro/intro_components/fausto_1 (2) - copia.png.import
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| [remap] | ||
|
|
||
| importer="texture" | ||
| type="CompressedTexture2D" | ||
| uid="uid://l2qkveqg63l7" | ||
| path="res://.godot/imported/fausto_1 (2) - copia.png-2df949ff75ba987eecf259300e18833a.ctex" | ||
| metadata={ | ||
| "vram_texture": false | ||
| } | ||
|
|
||
| [deps] | ||
|
|
||
| source_file="res://scenes/quests/story_quests/laberinto_del_fauno/0_intro/intro_components/fausto_1 (2) - copia.png" | ||
| dest_files=["res://.godot/imported/fausto_1 (2) - copia.png-2df949ff75ba987eecf259300e18833a.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 |
38 changes: 38 additions & 0 deletions
38
...ry_quests/laberinto_del_fauno/0_intro/intro_components/laberinto_del_fauno_intro.dialogue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| #SPDX-FileCopyrightText: The Threadbare Authors | ||
| #SPDX-License-Identifier: MPL-2.0 | ||
|
|
||
| ~ start | ||
| do animation_player.play(&"Faded_in") | ||
| do animation_player.animation_finished | ||
|
|
||
| El Laberinto del Fauno: En un tiempo marcado por el miedo y el estruendo de las guerras… | ||
| Cuando los hogares eran cenizas y los caminos solo traían malas noticias… | ||
| Una niña buscaba refugio en la única luz que aún le quedaba, su imaginación 🥀. | ||
|
|
||
| Ofelia no había tenido un buen momento desde hacía mucho. Cada día era una batalla contra la tristeza y cada noche deseaba olvidar, aunque fuera solo por un instante, el ruido de la guerra y el peso de la soledad | ||
|
|
||
| Un día, mientras Ofelia caminaba por el bosque, buscando escapar del ruido del mundo… | ||
| Algo extraño ocurrió... | ||
| do animation_player.play(&"walk_on") | ||
| do animation_player.animation_finished | ||
|
|
||
| do animation_player.play(&"walk_fausto_on") | ||
| do animation_player.animation_finished | ||
| Ente: No tengas miedo, Ofelia. | ||
| Ofelia: ¿Quién eres? ¿Qué quieres de mí? | ||
| Ente: Mi nombre es Fausto, el guardian del bosque. Te he observado desde hace mucho. Sé cuánto has sufrido, pero falta muy poco para que eso acabe. | ||
| Ente: Tus antepasados fueron personas muy valientes, y aunque todo estuviese acabado, ellos nunca se rendían, ellos te necesitan. Tu nombre esta en las escrituras de las piedras mágicas, tu destino es ayudarlos, para que de esa forma ellos te concedan un deseo... | ||
| Ofelia: ¿Un deseo?, ¡¿El deseo puede conceder cualquier cosa?! | ||
| Ente: Sí, puede volver todo a como era antes o puede mejorar todo. Además si te llegase a pasar algo en ese mundo mágico, no te pasaría nada en el mundo real. | ||
| Ofelia: Pero, ¿Por qué yo?, parece una tarea dificíl, ¿Podría ir otra persona? | ||
| Ente: No, tu eres la última heredera, solo tu puedes ingresar. Porque incluso en medio de la guerra… tu corazón aún brilla como las estrellas en la noche mas oscura. | ||
| Ofelia: Esta bien, lo intentaré. | ||
| Ente: Hay llaves ocultas en los rincones más peligrosos de esta tierra. Cada una custodiada por un gigante Sapo Guardián. Solo quien lleva la sangre de los Custodios puede acercase a esos Sapos Guardian, y reclamarlas sin recibir daño por ellos, pero eso si, los protectores de los sapos si pueden intentar hacerte daño. Ofelia, ten mucho cuidado... | ||
|
|
||
| Ente: Ven, Ofelia. Tenemos un largo camino por delante. | ||
|
|
||
| do animation_player.play(&"walk_fausto_off") | ||
| do animation_player.animation_finished | ||
| do animation_player.play(&"walk_off") | ||
|
|
||
| => END |
16 changes: 16 additions & 0 deletions
16
...ts/laberinto_del_fauno/0_intro/intro_components/laberinto_del_fauno_intro.dialogue.import
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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://dgm6axxulwi3a" | ||
| path="res://.godot/imported/laberinto_del_fauno_intro.dialogue-1c0a710ca3d024f47d94fc3c652552db.tres" | ||
|
|
||
| [deps] | ||
|
|
||
| source_file="res://scenes/quests/story_quests/laberinto_del_fauno/0_intro/intro_components/laberinto_del_fauno_intro.dialogue" | ||
| dest_files=["res://.godot/imported/laberinto_del_fauno_intro.dialogue-1c0a710ca3d024f47d94fc3c652552db.tres"] | ||
|
|
||
| [params] | ||
|
|
||
| defaults=true |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.