Skip to content

Improvements#2086

Open
JeessonYman wants to merge 42 commits intoendlessm:mainfrom
Game-Lab-5-0-UTP-Group-6-Team-2:improvements
Open

Improvements#2086
JeessonYman wants to merge 42 commits intoendlessm:mainfrom
Game-Lab-5-0-UTP-Group-6-Team-2:improvements

Conversation

@JeessonYman
Copy link
Copy Markdown

deseo eliminar esta rama y pues crear otra nueva con nuevas mejoras

JeessonYman and others added 30 commits October 20, 2025 17:14
…-and-rename-template-grupo2

Duplicacion y creacion de la carpeta Grupal
…folder-grupo-2-ecos-de-media-noche

Template folder grupo 2 ecos de media noche
…folder-grupo-2-ecos-de-media-noche

Template folder grupo 2 ecos de media noche
…folder-grupo-2-estation-echo-9

Update the folder names to match the updates in the GDD
…re-quests-location

Revert: Move lore_quests back to correct location
Mejora en la luz dnimaica en el minijuego y posiciones estrategicas p…
…cion-del-minijuego-2

se actualizo el minijuego 2
Mejora de Tilesets en minijuego 1 e inclusion del personaje
…cion-del-minijuego-1

se agrego carpeta combat
@JeessonYman JeessonYman requested review from a team as code owners March 25, 2026 22:30
Copilot AI review requested due to automatic review settings March 25, 2026 22:30
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR introduces new quest content/assets for estation _echo_9 (scenes, dialogues, spriteframes, textures/imports, shader) and updates several existing Godot resource headers/project settings.

Changes:

  • Added a new story quest set (estation _echo_9) including stealth/combat/puzzle/outro scenes, dialogue scripts, spriteframes, and supporting assets/import files.
  • Updated the global tileset to include additional atlas sources/resources.
  • Updated project.godot settings (notably config/features) and adjusted an Autoload entry.

Reviewed changes

Copilot reviewed 126 out of 128 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
tiles/water.tres Removes load_steps metadata from TileSet resource header.
tiles/void_chromakey.tres Removes load_steps metadata from TileSet resource header.
tiles/foam.tres Removes load_steps metadata from TileSet resource header.
tiles/exterior_floors.tres Removes load_steps metadata from TileSet resource header.
tiles/elevation.tres Removes load_steps metadata from TileSet resource header.
tiles/bridges.tres Removes load_steps metadata from TileSet resource header.
scenes/ui_elements/components/theme.tres Removes load_steps metadata from Theme resource header.
scenes/tileset.tres Adds new ext/sub-resources (atlas sources), collision tweak, removes load_steps header metadata.
scenes/quests/story_quests/shjourney/Angel/components/angel.tres Removes load_steps metadata from SpriteFrames header.
scenes/quests/story_quests/estation _echo_9/player_components/estation _echo_9_player_walk.png.import Adds import metadata for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/estation _echo_9_player_walk.png Adds LFS pointer for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/estation _echo_9_player_idle.png.import Adds import metadata for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/estation _echo_9_player_idle.png Adds LFS pointer for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/estation _echo_9_player_defeated.png.import Adds import metadata for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/estation _echo_9_player_defeated.png Adds LFS pointer for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/estation _echo_9_player_attack_02.png.import Adds import metadata for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/estation _echo_9_player_attack_02.png Adds LFS pointer for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/estation _echo_9_player_attack_01.png.import Adds import metadata for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/estation _echo_9_player_attack_01.png Adds LFS pointer for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/estation _echo_9_player.tres Adds new SpriteFrames resource for quest-specific player animations.
scenes/quests/story_quests/estation _echo_9/player_components/Gemini_Generated_Image_v37xk6v37xk6v37x.png.import Adds import metadata for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/Gemini_Generated_Image_v37xk6v37xk6v37x.png Adds LFS pointer for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/DrEla_idle 2.png.import Adds import metadata for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/DrEla_idle 2.png Adds LFS pointer for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/DrEla_idle (3).png.import Adds import metadata for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/DrEla_idle (3).png Adds LFS pointer for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/DrEla_Walk1.png.import Adds import metadata for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/DrEla_Walk1.png Adds LFS pointer for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/DrEla_Walk.png.import Adds import metadata for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/DrEla_Walk.png Adds LFS pointer for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/DrEla_Die.png.import Adds import metadata for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/DrEla_Die.png Adds LFS pointer for new texture asset.
scenes/quests/story_quests/estation _echo_9/player_components/Dr _echo_9_player.tres Adds an alternate SpriteFrames resource (player) for the quest.
scenes/quests/story_quests/estation _echo_9/Tiles/warped_top_down_tech_lab_extension.png.import Adds import metadata for new tiles texture.
scenes/quests/story_quests/estation _echo_9/Tiles/warped_top_down_tech_lab_extension.png Adds LFS pointer for new tiles texture.
scenes/quests/story_quests/estation _echo_9/Tiles/Grass_And_Sand_Tiles-export.png.import Adds import metadata for new tiles texture export.
scenes/quests/story_quests/estation _echo_9/Tiles/Grass_And_Sand_Tiles-export.png Adds LFS pointer for new tiles texture export.
scenes/quests/story_quests/estation _echo_9/Tiles/Cliff_Tiles-export.png.import Adds import metadata for new tiles texture export.
scenes/quests/story_quests/estation _echo_9/Tiles/Cliff_Tiles-export.png Adds LFS pointer for new tiles texture export.
scenes/quests/story_quests/estation _echo_9/Tiles/Bridge_All-export.png.import Adds import metadata for new bridge tiles texture export.
scenes/quests/story_quests/estation _echo_9/Tiles/Bridge_All-export.png Adds LFS pointer for new bridge tiles texture export.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_throwing_enemy_walk.png.import Adds import metadata for new combat enemy walk spritesheet.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_throwing_enemy_walk.png Adds LFS pointer for new combat enemy walk spritesheet.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_throwing_enemy_idle.png.import Adds import metadata for new combat enemy idle spritesheet.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_throwing_enemy_idle.png Adds LFS pointer for new combat enemy idle spritesheet.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_throwing_enemy_defeated.png.import Adds import metadata for new combat enemy defeated spritesheet.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_throwing_enemy_defeated.png Adds LFS pointer for new combat enemy defeated spritesheet.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_throwing_enemy_attack.png.import Adds import metadata for new combat enemy attack spritesheet.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_throwing_enemy_attack.png Adds LFS pointer for new combat enemy attack spritesheet.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_throwing_enemy.tres Adds quest combat enemy SpriteFrames resource.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_target_spriteframes.tres Adds quest combat target SpriteFrames resource.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_target.png.import Adds import metadata for quest combat target texture.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_target.png Adds LFS pointer for quest combat target texture.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_projectile_spriteframes.tres Adds quest combat projectile SpriteFrames resource.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_projectile.png.import Adds import metadata for quest combat projectile texture.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat_projectile.png Adds LFS pointer for quest combat projectile texture.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat.dialogue.import Adds Dialogue Manager import metadata.
scenes/quests/story_quests/estation _echo_9/5_combat/estation _echo_9_combat_components/estation _echo_9_combat.dialogue Adds combat dialogue script.
scenes/quests/story_quests/estation _echo_9/4_outro/outro_components/estation _echo_9_outro.dialogue.import Adds Dialogue Manager import metadata.
scenes/quests/story_quests/estation _echo_9/4_outro/outro_components/estation _echo_9_outro.dialogue Adds outro dialogue script.
scenes/quests/story_quests/estation _echo_9/4_outro/estation _echo_9_outro.tscn Adds quest outro scene setup (tilemaps, character, cinematic, shader overlay).
scenes/quests/story_quests/estation _echo_9/3_sequence_puzzle/estation _echo_9_sign_2.tres Adds additional SpriteFrames for puzzle sign.
scenes/quests/story_quests/estation _echo_9/3_sequence_puzzle/estation _echo_9_sign.tres Adds SpriteFrames for puzzle sign.
scenes/quests/story_quests/estation _echo_9/3_sequence_puzzle/estation _echo_9_sign.png.import Adds import metadata for puzzle sign texture.
scenes/quests/story_quests/estation _echo_9/3_sequence_puzzle/estation _echo_9_sign.png Adds LFS pointer for puzzle sign texture.
scenes/quests/story_quests/estation _echo_9/3_sequence_puzzle/estation _echo_9_sequence_puzzle.dialogue.import Adds Dialogue Manager import metadata.
scenes/quests/story_quests/estation _echo_9/3_sequence_puzzle/estation _echo_9_sequence_puzzle.dialogue Adds puzzle dialogue script.
scenes/quests/story_quests/estation _echo_9/3_sequence_puzzle/estation _echo_9_object.tres Adds SpriteFrames for puzzle object.
scenes/quests/story_quests/estation _echo_9/3_sequence_puzzle/estation _echo_9_object.png.import Adds import metadata for puzzle object texture.
scenes/quests/story_quests/estation _echo_9/3_sequence_puzzle/estation _echo_9_object.png Adds LFS pointer for puzzle object texture.
scenes/quests/story_quests/estation _echo_9/3_sequence_puzzle/canvas_modulate.gd.uid Adds UID mapping for new script.
scenes/quests/story_quests/estation _echo_9/3_sequence_puzzle/canvas_modulate.gd Adds CanvasModulate transition script.
scenes/quests/story_quests/estation _echo_9/3_sequence_puzzle/C1.png.import Adds import metadata for puzzle asset texture.
scenes/quests/story_quests/estation _echo_9/3_sequence_puzzle/C1.png Adds LFS pointer for puzzle asset texture.
scenes/quests/story_quests/estation _echo_9/2_containment_passages/containment_passages_components/estation _echo_9_guard_enemy_walk.png.import Adds import metadata for containment guard walk spritesheet.
scenes/quests/story_quests/estation _echo_9/2_containment_passages/containment_passages_components/estation _echo_9_guard_enemy_walk.png Adds LFS pointer for containment guard walk spritesheet.
scenes/quests/story_quests/estation _echo_9/2_containment_passages/containment_passages_components/estation _echo_9_guard_enemy_idle.png.import Adds import metadata for containment guard idle spritesheet.
scenes/quests/story_quests/estation _echo_9/2_containment_passages/containment_passages_components/estation _echo_9_guard_enemy_idle.png Adds LFS pointer for containment guard idle spritesheet.
scenes/quests/story_quests/estation _echo_9/2_containment_passages/containment_passages_components/estation _echo_9_guard_enemy_alerted.png.import Adds import metadata for containment guard alerted spritesheet.
scenes/quests/story_quests/estation _echo_9/2_containment_passages/containment_passages_components/estation _echo_9_guard_enemy_alerted.png Adds LFS pointer for containment guard alerted spritesheet.
scenes/quests/story_quests/estation _echo_9/2_containment_passages/containment_passages_components/estation _echo_9_guard_enemy.tres Adds SpriteFrames for containment guard.
scenes/quests/story_quests/estation _echo_9/2_containment_passages/containment_passages_components/estation _echo_9_containment_passages.dialogue.import Adds Dialogue Manager import metadata.
scenes/quests/story_quests/estation _echo_9/2_containment_passages/containment_passages_components/estation _echo_9_containment_passages.dialogue Adds containment passages dialogue script.
scenes/quests/story_quests/estation _echo_9/2_containment_passages/containment_passages_components/estation _echo_9_collected.dialogue.import Adds Dialogue Manager import metadata.
scenes/quests/story_quests/estation _echo_9/2_containment_passages/containment_passages_components/estation _echo_9_collected.dialogue Adds “collected” dialogue script for this quest step.
scenes/quests/story_quests/estation _echo_9/2_containment_passages/containment_passages_components/estation _echo_9_checkpoint.dialogue.import Adds Dialogue Manager import metadata.
scenes/quests/story_quests/estation _echo_9/2_containment_passages/containment_passages_components/estation _echo_9_checkpoint.dialogue Adds checkpoint dialogue script for this quest step.
scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_stealth.dialogue.import Adds Dialogue Manager import metadata.
scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_stealth.dialogue Adds stealth dialogue script.
scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_guard_enemy_walk.png.import Adds import metadata for stealth guard walk spritesheet.
scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_guard_enemy_walk.png Adds LFS pointer for stealth guard walk spritesheet.
scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_guard_enemy_idle.png.import Adds import metadata for stealth guard idle spritesheet.
scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_guard_enemy_idle.png Adds LFS pointer for stealth guard idle spritesheet.
scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_guard_enemy_alerted.png.import Adds import metadata for stealth guard alerted spritesheet.
scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_guard_enemy_alerted.png Adds LFS pointer for stealth guard alerted spritesheet.
scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_guard_enemy.tres Adds SpriteFrames for stealth guard.
scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_collected.dialogue.import Adds Dialogue Manager import metadata.
scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_collected.dialogue Adds collected dialogue for stealth segment.
scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_checkpoint.dialogue.import Adds Dialogue Manager import metadata.
scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_checkpoint.dialogue Adds checkpoint dialogue for stealth segment.
scenes/quests/story_quests/estation _echo_9/1_stealth/estation _echo_9_stealth.tscn Adds quest stealth scene wiring (player, guards, collectible, cinematic dialogues).
scenes/quests/story_quests/estation _echo_9/0_intro/intro_components/estation _echo_9_intro_image.png.import Adds import metadata for intro image.
scenes/quests/story_quests/estation _echo_9/0_intro/intro_components/estation _echo_9_intro_image.png Adds LFS pointer for intro image.
scenes/quests/story_quests/estation _echo_9/0_intro/intro_components/estation _echo_9_intro.dialogue.import Adds Dialogue Manager import metadata.
scenes/quests/story_quests/estation _echo_9/0_intro/intro_components/estation _echo_9_intro.dialogue Adds intro dialogue script.
scenes/quests/story_quests/estation _echo_9/0_intro/Shader/estation _echo_9_shader.gdshader.uid Adds UID mapping for new shader.
scenes/quests/story_quests/estation _echo_9/0_intro/Shader/estation _echo_9_shader.gdshader Adds a VHS-like screen distortion shader for cinematics.
scenes/quests/story_quests/NO_EDIT/NO_EDIT_player_components/NO_EDIT_player.tres Removes load_steps metadata from SpriteFrames header.
scenes/quests/story_quests/NO_EDIT/3_NO_EDIT_sequence_puzzle/NO_EDIT_sign.tres Removes load_steps metadata from SpriteFrames header.
scenes/quests/story_quests/NO_EDIT/3_NO_EDIT_sequence_puzzle/NO_EDIT_object.tres Removes load_steps metadata from SpriteFrames header.
scenes/quests/story_quests/NO_EDIT/2_NO_EDIT_combat/NO_EDIT_combat_components/NO_EDIT_throwing_enemy.tres Removes load_steps metadata from SpriteFrames header.
scenes/quests/story_quests/NO_EDIT/2_NO_EDIT_combat/NO_EDIT_combat_components/NO_EDIT_projectile_spriteframes.tres Removes load_steps metadata from SpriteFrames header.
scenes/quests/story_quests/NO_EDIT/1_NO_EDIT_stealth/NO_EDIT_stealth_components/NO_EDIT_guard_enemy.tres Removes load_steps metadata from SpriteFrames header.
scenes/quest.tres Adds a Quest resource definition (title/description/first scene).
scenes/menus/storybook/components/storybook_animation.tres Removes load_steps metadata from SpriteFrames header.
scenes/game_elements/props/tree/components/tree_spriteframes_green.tres Removes load_steps metadata from SpriteFrames header.
scenes/game_elements/props/projectile/components/inkblob_spriteframes.tres Removes load_steps metadata from SpriteFrames header.
scenes/game_elements/props/filling_barrel/components/filling_barrel_sprite_frames.tres Removes load_steps metadata from SpriteFrames header.
scenes/game_elements/props/decoration/bush/components/bush_spriteframes_green_large.tres Removes load_steps metadata from SpriteFrames header.
scenes/game_elements/props/checkpoint/components/knitwitch_frames_purple.tres Removes load_steps metadata from SpriteFrames header.
scenes/game_elements/props/checkpoint/components/knitwitch_frames_blue.tres Removes load_steps metadata from SpriteFrames header.
scenes/game_elements/characters/npcs/npc_prop/sprite_frames/fray_idle_purple.tres Removes load_steps metadata from SpriteFrames header.
project.godot Updates project settings (features/version, splash, autoload entry).
Comments suppressed due to low confidence (2)

scenes/quests/story_quests/estation _echo_9/1_stealth/stealth_components/estation _echo_9_stealth.dialogue:1

  • This dialogue content reads like template/editor instructions (“remove or replace this text!”) and will likely surface to players if the cinematic/dialogue is triggered. Replace these lines with in-universe quest dialogue (or remove the dialogue trigger for this scene) to avoid shipping placeholder text.
    scenes/tileset.tres:1
  • The quest folder name includes a space (estation _echo_9), which tends to cause avoidable friction (shell/scripts, tooling, asset pipelines, URL encoding) and makes paths harder to work with. Consider renaming the directory to a space-free convention (e.g., estation_echo_9) and updating the resource references accordingly.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@wjt
Copy link
Copy Markdown
Member

wjt commented Mar 26, 2026

Did you mean to send this pull request to https://github.com/Game-Lab-5-0-UTP-Group-6-Team-2/threadbare?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants