Skip to content

mejoras#2033

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

mejoras#2033
JeessonYman wants to merge 43 commits intoendlessm:mainfrom
Game-Lab-5-0-UTP-Group-6-Team-2:main

Conversation

@JeessonYman
Copy link

No description provided.

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
Copilot AI review requested due to automatic review settings March 7, 2026 02:25
@JeessonYman JeessonYman requested review from a team as code owners March 7, 2026 02:25
Copy link

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 appears to be a Godot project re-save/upgrade that updates serialized .tres resources and project settings, adds a new Quest resource, and extends the shared tileset with additional atlas sources for a story quest.

Changes:

  • Update many .tres headers (removing load_steps) consistent with a Godot re-save.
  • Update project.godot settings (including config/features bump to 4.6, splash settings, and an animation compatibility flag).
  • Add a new scenes/quest.tres Quest resource and extend scenes/tileset.tres with new external textures + atlas sources and an extra physics polygon entry.

Reviewed changes

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

Show a summary per file
File Description
tiles/water.tres TileSet resource header updated (re-saved serialization).
tiles/void_chromakey.tres TileSet resource header updated (re-saved serialization).
tiles/foam.tres TileSet resource header updated (re-saved serialization).
tiles/exterior_floors.tres TileSet resource header updated (re-saved serialization).
tiles/elevation.tres TileSet resource header updated (re-saved serialization).
tiles/bridges.tres TileSet resource header updated (re-saved serialization).
scenes/ui_elements/components/theme.tres Theme resource header updated (re-saved serialization).
scenes/tileset.tres Add quest-specific textures as ext_resources, add 2 new TileSet atlas sources, and add one physics layer polygon entry.
scenes/quests/story_quests/shjourney/Angel/components/angel.tres SpriteFrames resource header updated (re-saved serialization).
scenes/quests/story_quests/NO_EDIT/NO_EDIT_player_components/NO_EDIT_player.tres SpriteFrames resource header updated (re-saved serialization).
scenes/quests/story_quests/NO_EDIT/3_NO_EDIT_sequence_puzzle/NO_EDIT_sign.tres SpriteFrames resource header updated (re-saved serialization).
scenes/quests/story_quests/NO_EDIT/3_NO_EDIT_sequence_puzzle/NO_EDIT_object.tres SpriteFrames resource header updated (re-saved serialization).
scenes/quests/story_quests/NO_EDIT/2_NO_EDIT_combat/NO_EDIT_combat_components/NO_EDIT_throwing_enemy.tres SpriteFrames resource header updated (re-saved serialization).
scenes/quests/story_quests/NO_EDIT/2_NO_EDIT_combat/NO_EDIT_combat_components/NO_EDIT_projectile_spriteframes.tres SpriteFrames resource header updated (re-saved serialization).
scenes/quests/story_quests/NO_EDIT/1_NO_EDIT_stealth/NO_EDIT_stealth_components/NO_EDIT_guard_enemy.tres SpriteFrames resource header updated (re-saved serialization).
scenes/quest.tres New Quest resource instance pointing at quest.gd, with title/description/first scene set.
scenes/menus/storybook/components/storybook_animation.tres SpriteFrames resource header updated (re-saved serialization).
scenes/game_elements/props/tree/components/tree_spriteframes_green.tres SpriteFrames resource header updated (re-saved serialization).
scenes/game_elements/props/projectile/components/inkblob_spriteframes.tres SpriteFrames resource header updated (re-saved serialization).
scenes/game_elements/props/filling_barrel/components/filling_barrel_sprite_frames.tres SpriteFrames resource header updated (re-saved serialization).
scenes/game_elements/props/decoration/bush/components/bush_spriteframes_green_large.tres SpriteFrames resource header updated (re-saved serialization).
scenes/game_elements/props/checkpoint/components/knitwitch_frames_purple.tres SpriteFrames resource header updated (re-saved serialization).
scenes/game_elements/props/checkpoint/components/knitwitch_frames_blue.tres SpriteFrames resource header updated (re-saved serialization).
scenes/game_elements/characters/npcs/npc_prop/sprite_frames/fray_idle_purple.tres SpriteFrames resource header updated (re-saved serialization).
project.godot Bump project feature version to 4.6, tweak splash settings, switch one autoload to UID, and add animation compatibility setting.

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

Comment on lines +21 to +22
config/features=PackedStringArray("4.6", "GL Compatibility")
boot_splash/stretch_mode=0
Copy link

Copilot AI Mar 7, 2026

Choose a reason for hiding this comment

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

config/features is bumped to 4.6, but the repo’s build/export tooling is still pinned to Godot 4.5 (e.g. .github/workflows/export.yml sets GODOT_VERSION: 4.5, and linux/org.endlessaccess.threadbare.yml uses base-version: '4.5'). This mismatch is likely to break CI/exports (and 4.5 may not understand newer project settings like boot_splash/stretch_mode). Either update the build/packaging configs to 4.6 as part of this PR, or keep the project features/settings at 4.5.

Suggested change
config/features=PackedStringArray("4.6", "GL Compatibility")
boot_splash/stretch_mode=0
config/features=PackedStringArray("4.5", "GL Compatibility")

Copilot uses AI. Check for mistakes.
[resource]
script = ExtResource("1_r0o2e")
title = "night Station beta-7"
description = "proyecto juego 5 noches en la estacion beta 7 "
Copy link

Copilot AI Mar 7, 2026

Choose a reason for hiding this comment

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

The quest title/description values include trailing and duplicated whitespace (e.g. double spaces in "proyecto juego 5 noches..."). Since these strings likely render directly in UI and may be used for sorting/search, consider trimming/normalizing whitespace.

Suggested change
description = "proyecto juego 5 noches en la estacion beta 7 "
description = "proyecto juego 5 noches en la estacion beta 7"

Copilot uses AI. Check for mistakes.
@wjt
Copy link
Member

wjt commented Mar 9, 2026

Hi @JeessonYman - are you intentionally submitting your storyquest upstream, or did you mean to open a PR to your fork?

If you're intentionally submitting the StoryQuest upstream, please make sure you have followed the steps in https://github.com/endlessm/threadbare/wiki/StoryQuest-submission

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