-
Notifications
You must be signed in to change notification settings - Fork 203
Pull Request Confirmacion #1433
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
Open
andree-git
wants to merge
9
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.
Open
Changes from all commits
Commits
Show all changes
9 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 84c343c
Merge pull request #46 from Game-Lab-5-0-UTP-Grupo-2-Equipo-5/intro-o…
Lyonbp 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
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
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
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
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
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
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
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
29 changes: 29 additions & 0 deletions
29
...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,29 @@ | ||
| # SPDX-FileCopyrightText: The Threadbare Authors | ||
| # SPDX-License-Identifier: MPL-2.0 | ||
|
|
||
| # Diálogo: Ofelia llega al cuartel militar. | ||
| ~ start | ||
| do animation_player.play(&"Fade_In_Slow") | ||
| España. 1944. El aire huele a pólvora y tierra húmeda. | ||
| Hemos llegado. | ||
| Mamá está muy enferma. Y aquí... él es el único que importa. | ||
| Aquí todo es gris. Incluso el sol parece rendirse ante él. | ||
|
|
||
| do animation_player.play(&"Wait_Short") | ||
| Ese es el Capitán Vidal. Mi nuevo padrastro. | ||
| do animation_player.play(&"Vidal_Glance") | ||
| Sé que mi padre no fue él. Mi verdadero padre fue un sastre. Me lo prometió. | ||
| Y si él es mi padre, ¿por qué siento tanto miedo? | ||
| do animation_player.play(&"Walk_To_Window") | ||
| Miro a través de la ventana. Nada me pertenece en este lugar. | ||
| Pero... espera. ¿Qué es eso? | ||
|
|
||
| do animation_player.play(&"Insect_Appears") | ||
| Un insecto. Es un insecto palo, pero lo conozco. Está en mis libros. | ||
| do animation_player.play(&"Insect_Transform") | ||
| No es un insecto. Es un hada. Es mi hada. | ||
| Me mira. Parece querer decirme algo. Señala al bosque. | ||
| No puedo quedarme aquí. El Capitán Vidal me ahogará. | ||
| do animation_player.play(&"Walk_Off_Fast") | ||
| Sí. Te seguiré. Necesito irme. | ||
| => 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://x46dptk7qqsi" | ||
| 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 |
3 changes: 3 additions & 0 deletions
3
...aberinto_del_fauno/0_intro/intro_components/laberinto_del_fauno_intro_image.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
...s/laberinto_del_fauno/0_intro/intro_components/laberinto_del_fauno_intro_image.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://cxhhictegqdf7" | ||
| path="res://.godot/imported/laberinto_del_fauno_intro_image.png-b07ae87043b56d3019b018b7e1b38f0a.ctex" | ||
| metadata={ | ||
| "vram_texture": false | ||
| } | ||
|
|
||
| [deps] | ||
|
|
||
| source_file="res://scenes/quests/story_quests/laberinto_del_fauno/0_intro/intro_components/laberinto_del_fauno_intro_image.png" | ||
| dest_files=["res://.godot/imported/laberinto_del_fauno_intro_image.png-b07ae87043b56d3019b018b7e1b38f0a.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 |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess you didn't intend to change all these files in
addons/dialogue_manager. You should revert them:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This still needs to be addressed before we can merge this!