-
Notifications
You must be signed in to change notification settings - Fork 289
Improvements #2086
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
Closed
JeessonYman
wants to merge
42
commits into
endlessm:main
from
Game-Lab-5-0-UTP-Group-6-Team-2:improvements
Closed
Improvements #2086
Changes from all commits
Commits
Show all changes
42 commits
Select commit
Hold shift + click to select a range
f333b04
Duplicacion y creacion de la carpeta Grupal
JeessonYman c10902a
Merge pull request #43 from Game-Lab-5-0-UTP-Group-6-Team-2/duplicate…
Arebuayon 720b768
template-folder-para-grupo-2-ecos-de-media-noche
JeessonYman 2a47e18
borre carpeta anterior
JeessonYman 6e80917
Merge pull request #44 from Game-Lab-5-0-UTP-Group-6-Team-2/template-…
JeessonYman 69effc5
Feature: añadir escena Intro y ajustar transiciones y Outro
jhanp12 744d089
Merge branch 'endlessm:main' into Intro
JeessonYman 92059e0
Merge pull request #45 from Game-Lab-5-0-UTP-Group-6-Team-2/Intro
JeessonYman 8c86f8b
Merge pull request #46 from Game-Lab-5-0-UTP-Group-6-Team-2/template-…
JeessonYman 102ee89
Update the folder names to match the updates in the GDD
0c9fa80
Merge pull request #47 from Game-Lab-5-0-UTP-Group-6-Team-2/template-…
JeessonYman 58ba08b
Minigame 2 Advance
5cb410a
Merge pull request #48 from Game-Lab-5-0-UTP-Group-6-Team-2/game-2
JeessonYman c6de717
Revert: Move lore_quests back to correct location
Arebuayon c348510
Merge pull request #49 from Game-Lab-5-0-UTP-Group-6-Team-2/revert-lo…
Arebuayon a458b4d
minigame preview 2
31a80c5
Merge pull request #50 from Game-Lab-5-0-UTP-Group-6-Team-2/minigame-…
JeessonYman 8fa3a81
Actualizacion de la Intro Version 1
jhanp12 58dc391
Merge pull request #51 from Game-Lab-5-0-UTP-Group-6-Team-2/Level1
jhanp12 5d66f40
Creación del nivel 1
jhanp12 3ee6639
Merge pull request #52 from Game-Lab-5-0-UTP-Group-6-Team-2/Minijuego1
JeessonYman cc26c92
Mejora en la luz dnimaica en el minijuego y posiciones estrategicas p…
jhanp12 2b453ce
Merge pull request #53 from Game-Lab-5-0-UTP-Group-6-Team-2/Minijuego1
JeessonYman 6d12e8c
se actualizo el minijuego 2
7068fc4
Merge pull request #54 from Game-Lab-5-0-UTP-Group-6-Team-2/actualiza…
JeessonYman ad17ba1
Mejora de Tilesets en minijuego 1 e inclusion del personaje
jhanp12 15cd6da
Merge pull request #55 from Game-Lab-5-0-UTP-Group-6-Team-2/Minijuego1
JeessonYman 1441639
se agrego carpeta combat
2ee5e58
Merge pull request #56 from Game-Lab-5-0-UTP-Group-6-Team-2/actualiza…
JeessonYman 477dde0
Actualizacion de muerte personaje y tailset
jhanp12 624bbcc
Merge pull request #57 from Game-Lab-5-0-UTP-Group-6-Team-2/Minijuego1
JeessonYman 326943f
se actualizo los estilos del minijuego 2
7e3a187
Merge pull request #58 from Game-Lab-5-0-UTP-Group-6-Team-2/actualiza…
JeessonYman 0033c71
se actualizo el minijuego 3
dae15b6
Merge pull request #59 from Game-Lab-5-0-UTP-Group-6-Team-2/actualiza…
JeessonYman c0d32ca
se mejoraron los juegos
c843033
Merge pull request #60 from Game-Lab-5-0-UTP-Group-6-Team-2/actualiza…
JeessonYman 438b724
se mejoraron los juegos en las visualisaciones
3d625b6
Merge pull request #61 from Game-Lab-5-0-UTP-Group-6-Team-2/actualiza…
JeessonYman 45b54ca
se mejoraron los juegos en las visualisaciones de los minujuegos 2 y 3
52a3efc
Merge pull request #62 from Game-Lab-5-0-UTP-Group-6-Team-2/actualiza…
JeessonYman 8468747
Minor improvements to the visualizations
JeessonYman 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
2 changes: 1 addition & 1 deletion
2
scenes/game_elements/characters/npcs/npc_prop/sprite_frames/fray_idle_purple.tres
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
2 changes: 1 addition & 1 deletion
2
scenes/game_elements/props/checkpoint/components/knitwitch_frames_blue.tres
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
2 changes: 1 addition & 1 deletion
2
scenes/game_elements/props/checkpoint/components/knitwitch_frames_purple.tres
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
2 changes: 1 addition & 1 deletion
2
scenes/game_elements/props/decoration/bush/components/bush_spriteframes_green_large.tres
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
2 changes: 1 addition & 1 deletion
2
scenes/game_elements/props/filling_barrel/components/filling_barrel_sprite_frames.tres
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
2 changes: 1 addition & 1 deletion
2
scenes/game_elements/props/projectile/components/inkblob_spriteframes.tres
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
2 changes: 1 addition & 1 deletion
2
scenes/game_elements/props/tree/components/tree_spriteframes_green.tres
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| [gd_resource type="Resource" script_class="Quest" load_steps=2 format=3 uid="uid://bmcekhv4sji0r"] | ||
|
|
||
| [ext_resource type="Script" uid="uid://dts1hwdy3phin" path="res://scenes/menus/storybook/components/quest.gd" id="1_r0o2e"] | ||
|
|
||
| [resource] | ||
| script = ExtResource("1_r0o2e") | ||
| title = "night Station beta-7" | ||
| description = "proyecto juego 5 noches en la estacion beta 7 " | ||
| first_scene = "uid://k8k7u7lnllbq" | ||
| metadata/_custom_type_script = "uid://dts1hwdy3phin" |
2 changes: 1 addition & 1 deletion
2
...tory_quests/NO_EDIT/1_NO_EDIT_stealth/NO_EDIT_stealth_components/NO_EDIT_guard_enemy.tres
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
2 changes: 1 addition & 1 deletion
2
...s/NO_EDIT/2_NO_EDIT_combat/NO_EDIT_combat_components/NO_EDIT_projectile_spriteframes.tres
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
2 changes: 1 addition & 1 deletion
2
...ory_quests/NO_EDIT/2_NO_EDIT_combat/NO_EDIT_combat_components/NO_EDIT_throwing_enemy.tres
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
2 changes: 1 addition & 1 deletion
2
scenes/quests/story_quests/NO_EDIT/3_NO_EDIT_sequence_puzzle/NO_EDIT_object.tres
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
2 changes: 1 addition & 1 deletion
2
scenes/quests/story_quests/NO_EDIT/3_NO_EDIT_sequence_puzzle/NO_EDIT_sign.tres
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
2 changes: 1 addition & 1 deletion
2
scenes/quests/story_quests/NO_EDIT/NO_EDIT_player_components/NO_EDIT_player.tres
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
47 changes: 47 additions & 0 deletions
47
scenes/quests/story_quests/estation _echo_9/0_intro/Shader/estation _echo_9_shader.gdshader
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,47 @@ | ||
| shader_type canvas_item; | ||
| render_mode unshaded, skip_vertex_transform; | ||
|
|
||
| const float curvature = 7.0; | ||
| const float vignette_multiplier = 1.0; | ||
|
|
||
| uniform sampler2D screen_texture: hint_screen_texture, filter_linear_mipmap; | ||
|
|
||
| // Función de ruido simple para el jitter | ||
| float rand(vec2 co) { | ||
| return fract(sin(dot(co.xy, vec2(12.9898,78.233))) * 43758.5453); | ||
| } | ||
|
|
||
| void fragment() { | ||
| // Movimiento sutil tipo VHS - wobble y jitter | ||
| float time_factor = TIME * 0.5; | ||
| vec2 wobble_uv = SCREEN_UV; | ||
|
|
||
| // Efecto de wobble (oscilación suave) | ||
| wobble_uv.x += sin(wobble_uv.y * 20.0 + time_factor) * 0.001; | ||
| wobble_uv.y += cos(wobble_uv.x * 15.0 + time_factor * 1.2) * 0.0008; | ||
|
|
||
| // Jitter aleatorio sutil | ||
| wobble_uv.x += (rand(vec2(time_factor, wobble_uv.y)) - 0.5) * 0.002; | ||
| wobble_uv.y += (rand(vec2(wobble_uv.x, time_factor * 1.5)) - 0.5) * 0.001; | ||
|
|
||
| // Distorsión de curvatura | ||
| vec2 centered_uv = wobble_uv * 2.0 - 1.0; | ||
| vec2 uv_offset = centered_uv.yx / curvature; | ||
| vec2 warped_uv = centered_uv + centered_uv * uv_offset * uv_offset; | ||
|
|
||
| // Efectos visuales VHS | ||
| vec3 cutoff = vec3(step(abs(warped_uv.x), 1.0) * step(abs(warped_uv.y), 1.0)); | ||
|
|
||
| // Scanlines dinámicos | ||
| float scanline_speed = 1.0; | ||
| vec3 scanlines = vec3(sin((warped_uv.y + time_factor * 0.1) * 180.0) * 0.1 + 0.9); | ||
|
|
||
| // Vignette | ||
| vec3 vignette = vec3(length(pow(abs(centered_uv), vec2(4.0)) / 3.0)); | ||
|
|
||
| // Color final con todos los efectos | ||
| vec3 screen_color = textureLod(screen_texture, (warped_uv + 1.0) / 2.0, 0.2).rgb * cutoff * scanlines; | ||
| screen_color -= vignette * vignette_multiplier; | ||
|
|
||
| COLOR = vec4(screen_color, 1.0); | ||
| } |
1 change: 1 addition & 0 deletions
1
.../quests/story_quests/estation _echo_9/0_intro/Shader/estation _echo_9_shader.gdshader.uid
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 @@ | ||
| uid://di1yvo812ri4x |
Oops, something went wrong.
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.