Implementação de 3 jogos, ajeitado sem dar conflito by MateusCitric · Pull Request #319 · moraguma/GamutoWare

MateusCitric · 2026-02-10T21:23:31Z

tive que refazer pois não tinha mudado apenas a pasta dos microjogos

ayudaV

Show! Fiz uma limpeza de assets e tb ajustei um pouco o jogo da comp

ayudaV · 2026-02-11T15:36:33Z

Copilot · 2026-02-11T15:36:43Z

@ayudaV I've opened a new pull request, #321, to work on those changes. Once the pull request is ready, I'll request review from you.

Copilot

Pull request overview

Este PR adiciona novos microjogos do pack Class of 2025 (2025S1) e atualiza o recurso do pack para incluí-los no fluxo do jogo.

Changes:

Atualiza class_of_2025.tres para incluir 3 novos microjogos (Gamuto Snap, ChangeFast, Músicas da Comp).
Adiciona cenas, scripts, shaders e assets (imagens/sons/fonts) para os microjogos musicas_da_comp, gamuto_snap e changefast.
Inclui arquivos de import do Godot (*.import) e recursos auxiliares (*.tres, *.uid) necessários para rodar os microjogos.

Reviewed changes

Copilot reviewed 79 out of 119 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
principal/recursos/data/packs/class_of_2025.tres	Inclui novos microjogos no pack
microjogos/2025S1/musicas_da_comp/recursos/sons/sons.txt	Placeholder de pasta de sons
microjogos/2025S1/musicas_da_comp/recursos/sons/Renata.ogg.import	Import de áudio
microjogos/2025S1/musicas_da_comp/recursos/sons/Ragatanga.ogg.import	Import de áudio
microjogos/2025S1/musicas_da_comp/recursos/sons/Madagascar.ogg.import	Import de áudio
microjogos/2025S1/musicas_da_comp/recursos/sons/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA.ogg.import	Import de áudio
microjogos/2025S1/musicas_da_comp/recursos/new_theme.tres	Theme do microjogo
microjogos/2025S1/musicas_da_comp/recursos/new_style_box_flat.tres	StyleBox do UI
microjogos/2025S1/musicas_da_comp/recursos/imagens/imagens.txt	Placeholder de pasta de imagens
microjogos/2025S1/musicas_da_comp/recursos/imagens/VDC_triste.png.import	Import de textura
microjogos/2025S1/musicas_da_comp/recursos/imagens/VDC_TE_PERDOA.png.import	Import de textura
microjogos/2025S1/musicas_da_comp/recursos/imagens/VDC_ORGULHOSO.png.import	Import de textura
microjogos/2025S1/musicas_da_comp/recursos/imagens/100NOSSAO.png.import	Import de textura
microjogos/2025S1/musicas_da_comp/microgame.tres	Registro do microjogo (asset)
microjogos/2025S1/musicas_da_comp/cenas/socorro.tscn	Cena extra (Node2D)
microjogos/2025S1/musicas_da_comp/cenas/scripts/scripts.txt	Placeholder de scripts
microjogos/2025S1/musicas_da_comp/cenas/scripts/main.gd.uid	UID do script
microjogos/2025S1/musicas_da_comp/cenas/scripts/main.gd	Lógica do microjogo (quiz musical)
microjogos/2025S1/musicas_da_comp/cenas/main.tscn	Cena principal do microjogo
microjogos/2025S1/musicas_da_comp/cenas/cenas.txt	Placeholder de cenas
microjogos/2025S1/musicas_da_comp/Ldfcomicsans-jj7l.ttf.import	Import da fonte
microjogos/2025S1/gamuto_snap/recursos/sons/photo_sound.ogg.import	Import de áudio
microjogos/2025S1/gamuto_snap/recursos/sons/music.mp3.import	Import de áudio
microjogos/2025S1/gamuto_snap/recursos/imagens/gamuto_sleep.png.import	Import de textura
microjogos/2025S1/gamuto_snap/recursos/imagens/gamuto_sleep.png	Textura (binário)
microjogos/2025S1/gamuto_snap/recursos/imagens/gamuto_flashed.png.import	Import de textura
microjogos/2025S1/gamuto_snap/recursos/imagens/gamuto_flashed.png	Textura (binário)
microjogos/2025S1/gamuto_snap/recursos/imagens/cave_foreground.png.import	Import de textura
microjogos/2025S1/gamuto_snap/recursos/imagens/cave_background.png.import	Import de textura
microjogos/2025S1/gamuto_snap/recursos/imagens/cam_overlay_sheet.png.import	Import de textura
microjogos/2025S1/gamuto_snap/microgame.tres	Registro do microjogo (asset)
microjogos/2025S1/gamuto_snap/cenas/shaders/gamutos.gdshader.uid	UID do shader
microjogos/2025S1/gamuto_snap/cenas/shaders/gamutos.gdshader	Shader de outline
microjogos/2025S1/gamuto_snap/cenas/shaders/cameraPlayer.gdshader.uid	UID do shader
microjogos/2025S1/gamuto_snap/cenas/shaders/cameraPlayer.gdshader	Shader do flash
microjogos/2025S1/gamuto_snap/cenas/scripts/main.gd.uid	UID do script
microjogos/2025S1/gamuto_snap/cenas/scripts/main.gd	Lógica principal (vitória por 2 fotos)
microjogos/2025S1/gamuto_snap/cenas/scripts/gamuto_physics.gd.uid	UID do script
microjogos/2025S1/gamuto_snap/cenas/scripts/gamuto_physics.gd	Física do gamuto “caindo”
microjogos/2025S1/gamuto_snap/cenas/scripts/gamuto_area.gd.uid	UID do script
microjogos/2025S1/gamuto_snap/cenas/scripts/gamuto_area.gd	Focus/outline via shader param
microjogos/2025S1/gamuto_snap/cenas/scripts/gamutinhos_physics.gd.uid	UID do script
microjogos/2025S1/gamuto_snap/cenas/scripts/gamutinhos_physics.gd	Spawna versão física após snap
microjogos/2025S1/gamuto_snap/cenas/scripts/gamutinhos.gd.uid	UID do script
microjogos/2025S1/gamuto_snap/cenas/scripts/gamutinhos.gd	Gerencia remoção/emissão de sinais
microjogos/2025S1/gamuto_snap/cenas/scripts/camera_player.gd.uid	UID do script
microjogos/2025S1/gamuto_snap/cenas/scripts/camera_player.gd	Movimento/ação de tirar foto
microjogos/2025S1/gamuto_snap/cenas/main.tscn	Cena principal do microjogo
microjogos/2025S1/gamuto_snap/cenas/gamutos.tscn	Prefab do gamuto (Area2D)
microjogos/2025S1/gamuto_snap/cenas/gamutoPhysics.tscn	Prefab do gamuto com física
microjogos/2025S1/gamuto_snap/cenas/cameraPlayer.tscn	Cena do player/câmera
microjogos/2025S1/gamuto_snap/cenas/barriers.tscn	Colisores de borda
microjogos/2025S1/gamuto_snap/capa.png.import	Import da capa
microjogos/2025S1/changefast/recursos/sons/sons.txt	Placeholder de sons
microjogos/2025S1/changefast/recursos/sons/fight(ADAPTADO).wav.import	Import de áudio
microjogos/2025S1/changefast/recursos/imagens/imagens.txt	Placeholder de imagens
microjogos/2025S1/changefast/recursos/imagens/SetaEsquerda.png.import	Import de textura
microjogos/2025S1/changefast/recursos/imagens/SetaEsquerda.png	Textura (binário)
microjogos/2025S1/changefast/recursos/imagens/SetaDireita.png.import	Import de textura
microjogos/2025S1/changefast/recursos/imagens/SetaDireita.png	Textura (binário)
microjogos/2025S1/changefast/recursos/imagens/SetaCIMA(1).png.import	Import de textura
microjogos/2025S1/changefast/recursos/imagens/SetaCIMA(1).png	Textura (binário)
microjogos/2025S1/changefast/recursos/imagens/SetaBaixo.png.import	Import de textura
microjogos/2025S1/changefast/recursos/imagens/SetaBaixo.png	Textura (binário)
microjogos/2025S1/changefast/recursos/imagens/Gamutobem.png.import	Import de textura
microjogos/2025S1/changefast/recursos/imagens/GAMUTOMAL.png.import	Import de textura
microjogos/2025S1/changefast/recursos/imagens/FRAME_comp.png.import	Import de textura
microjogos/2025S1/changefast/recursos/imagens/FRAME_comp.png	Textura (binário)
microjogos/2025S1/changefast/recursos/imagens/ComputadorBugado.png.import	Import de textura
microjogos/2025S1/changefast/recursos/imagens/ComputadorBugado.png	Textura (binário)
microjogos/2025S1/changefast/recursos/imagens/ABA.pixelada.png.import	Import de textura
microjogos/2025S1/changefast/recursos/imagens/ABA.pixelada.png	Textura (binário)
microjogos/2025S1/changefast/microgame.tres	Registro do microjogo (asset)
microjogos/2025S1/changefast/cenas/scripts/scripts.txt	Placeholder de scripts
microjogos/2025S1/changefast/cenas/scripts/main.gd.uid	UID do script
microjogos/2025S1/changefast/cenas/scripts/main.gd	Lógica do microjogo (ordem alfabética)
microjogos/2025S1/changefast/cenas/main.tscn	Cena principal do microjogo
microjogos/2025S1/changefast/cenas/cenas.txt	Placeholder de cenas
microjogos/2025S1/changefast/capa.png.import	Import da capa

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

Copilot · 2026-02-11T15:41:52Z

+
+[deps]
+
+source_file="res://microjogos/2025S1/musicas_da_comp/recursos/imagens/VDC_triste.png"
+dest_files=["res://.godot/imported/VDC_triste.png-14454a263ee12dbedcc3f999d18c1397.ctex"]


Este arquivo .import aponta para source_file=".../VDC_triste.png", mas o arquivo VDC_triste.png não existe na pasta (apenas o .import). Isso costuma gerar erros/avisos de importação no Godot. Ou adicione o PNG faltante ou remova este .import se ele não for usado.

…png.import

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

grandeisa

Needs changes in the credits files of the microgames.
For future implementations, each microgame has to have its own PR.
Other than that, LGTM.

good job 👍

grandeisa · 2026-03-07T18:12:20Z

Microgame author name missing

grandeisa · 2026-03-07T20:20:09Z

Missing credits for the following files:

ABA.pixelada.png

BARRAESPAÇO.png

Fala Bugada.png

FRAME_comp.png

TELA 1.png

grandeisa · 2026-03-07T20:22:09Z

Missing credits for the original songs that were made into 8-bit versions

Mateus Pinheiro Carioca added 3 commits February 7, 2026 18:59

resolving merge

0349138

resolving

2081bf1

resolving

843ec44

MateusCitric added Complete minigame Minigame is ready to be implemented Minigame Implementation Makes modifications to a complete minigame so it can be implemented into Gamutoware labels Feb 10, 2026

mini-fix

230c648

ayudaV assigned MateusCitric Feb 11, 2026

ayudaV requested review from ayudaV and Copilot February 11, 2026 15:33

Copilot started reviewing on behalf of ayudaV February 11, 2026 15:34 View session

ayudaV approved these changes Feb 11, 2026

View reviewed changes

Copilot AI mentioned this pull request Feb 11, 2026

Code review: Fix critical bugs and remove duplicate assets #321

Closed

Copilot AI reviewed Feb 11, 2026

View reviewed changes

ayudaV and others added 3 commits February 11, 2026 14:24

remove-untrack-files-and-resize-big-files

12c2f21

Delete microjogos/2025S1/musicas_da_comp/recursos/imagens/VDC_triste.…

5981248

…png.import

Apply suggestions from code review

77ffae9

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

ayudaV approved these changes Feb 11, 2026

View reviewed changes

grandeisa requested changes Mar 7, 2026

View reviewed changes

grandeisa added this to the Class of 2025 milestone Mar 8, 2026

grandeisa changed the base branch from master to class-of-2025 March 13, 2026 08:34

ayudaV removed the Complete minigame Minigame is ready to be implemented label Mar 14, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implementação de 3 jogos, ajeitado sem dar conflito#319

Implementação de 3 jogos, ajeitado sem dar conflito#319
MateusCitric wants to merge 7 commits intoclass-of-2025from
resolving_impl

MateusCitric commented Feb 10, 2026

Uh oh!

ayudaV left a comment

Uh oh!

ayudaV commented Feb 11, 2026

Uh oh!

Copilot AI commented Feb 11, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Feb 11, 2026

Uh oh!

Uh oh!

grandeisa left a comment

Uh oh!

grandeisa Mar 7, 2026

Uh oh!

grandeisa Mar 7, 2026

Uh oh!

grandeisa Mar 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

MateusCitric commented Feb 10, 2026

Uh oh!

ayudaV left a comment

Choose a reason for hiding this comment

Uh oh!

ayudaV commented Feb 11, 2026

Uh oh!

Copilot AI commented Feb 11, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

grandeisa left a comment

Choose a reason for hiding this comment

Uh oh!

grandeisa Mar 7, 2026

Choose a reason for hiding this comment

Uh oh!

grandeisa Mar 7, 2026

Choose a reason for hiding this comment

Uh oh!

grandeisa Mar 7, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants