Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
b33ac8f
Duplicate and rename template and all files of apu_inka
ChemixX1 Oct 22, 2025
e8e3ce2
Duplicate and rename template and all files of apu_inka
ChemixX1 Oct 22, 2025
d85715f
Merge pull request #44 from Game-Lab-5-0-UTP-Group-1-Team-4/apu_inka_…
ChemixX1 Oct 23, 2025
d5ff425
Agregué animaciones a intro y outro: cambio de personaje, antorchas, …
ChemixX1 Nov 14, 2025
d9b32e3
Merge pull request #45 from Game-Lab-5-0-UTP-Group-1-Team-4/intro-outro
ChemixX1 Nov 14, 2025
cc22d31
Beta del minijuego1 añadida
nlavadom Nov 14, 2025
b3951a4
Dialogos añadidos
nlavadom Nov 15, 2025
b7d324a
Merge branch 'main' into minijuego1
nlavadom Nov 15, 2025
8ce4fc1
Merge pull request #47 from Game-Lab-5-0-UTP-Group-1-Team-4/minijuego1
nlavadom Nov 15, 2025
45b08c7
add dialogue and update apu_inka_tileset.tres
abcd1924 Nov 16, 2025
c1bf5af
add minigame 3 and apu_inka_sign_2.tres
abcd1924 Nov 16, 2025
5a44e88
Merge pull request #48 from Game-Lab-5-0-UTP-Group-1-Team-4/minijuego3
abcd1924 Nov 16, 2025
d54b628
Minijuego 1 actualizado
nlavadom Nov 17, 2025
dc5b4fe
Merge branch 'main' into minijuego1
nlavadom Nov 17, 2025
7e3b610
Merge pull request #49 from Game-Lab-5-0-UTP-Group-1-Team-4/minijuego1
nlavadom Nov 17, 2025
c0820f3
Agregar intro
ChemixX1 Nov 17, 2025
4f55add
Merge pull request #50 from Game-Lab-5-0-UTP-Group-1-Team-4/intro
ChemixX1 Nov 17, 2025
7917c01
Actualizando main con mis cambios
ChemixX1 Nov 18, 2025
29d75c0
Merge pull request #51 from Game-Lab-5-0-UTP-Group-1-Team-4/intro-min…
ChemixX1 Nov 18, 2025
ccc5038
Restaurar tileset.tres desde commit estable
abcd1924 Nov 18, 2025
f5a0aa7
update apu_inka_tileset and minigame3
abcd1924 Nov 19, 2025
e7bfdaf
Merge pull request #52 from Game-Lab-5-0-UTP-Group-1-Team-4/fix/resto…
abcd1924 Nov 19, 2025
5a53852
update apu_inka_tileset for minigame3
abcd1924 Nov 19, 2025
a56c92c
update player sprites and minigames
abcd1924 Nov 19, 2025
55cfed7
Merge pull request #53 from Game-Lab-5-0-UTP-Group-1-Team-4/fix/resto…
abcd1924 Nov 19, 2025
212cae5
update player collisions for all minigames
abcd1924 Nov 19, 2025
f0364b7
Merge pull request #54 from Game-Lab-5-0-UTP-Group-1-Team-4/fix/resto…
abcd1924 Nov 19, 2025
e2cab00
update path for minigame 2 (next scene in minigame 1)
abcd1924 Nov 19, 2025
3890420
Merge pull request #55 from Game-Lab-5-0-UTP-Group-1-Team-4/fix/resto…
abcd1924 Nov 19, 2025
4ef9a8b
delete duplicated scene
abcd1924 Nov 19, 2025
aa7b631
Merge pull request #56 from Game-Lab-5-0-UTP-Group-1-Team-4/fix/resto…
abcd1924 Nov 19, 2025
97b6af0
update music in minigame 2
abcd1924 Nov 19, 2025
ee2a290
update outro
abcd1924 Nov 20, 2025
4e1c644
Merge pull request #57 from Game-Lab-5-0-UTP-Group-1-Team-4/update-mu…
abcd1924 Nov 20, 2025
8fb0273
delete char_blue.png
abcd1924 Nov 20, 2025
7133e5e
Merge pull request #58 from Game-Lab-5-0-UTP-Group-1-Team-4/fix/resto…
abcd1924 Nov 20, 2025
a2c63e1
update character assets
abcd1924 Nov 21, 2025
d9ca003
Merge pull request #59 from Game-Lab-5-0-UTP-Group-1-Team-4/fix/resto…
abcd1924 Nov 21, 2025
1d9a9b0
minijuego 1 arreglado
nlavadom Nov 21, 2025
2ccf407
fix: reajuste de tile hitbox
nlavadom Nov 21, 2025
c6ce3e0
Merge pull request #60 from Game-Lab-5-0-UTP-Group-1-Team-4/fix/minij…
nlavadom Nov 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions assets/first_party/intro/SANTUARIOOUTROFINAL2025.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 assets/first_party/intro/SANTUARIOOUTROFINAL2025.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cbs6lcpxtl0a1"
path="res://.godot/imported/SANTUARIOOUTROFINAL2025.png-82d7c32073fa34b26c287964051c7ce3.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/first_party/intro/SANTUARIOOUTROFINAL2025.png"
dest_files=["res://.godot/imported/SANTUARIOOUTROFINAL2025.png-82d7c32073fa34b26c287964051c7ce3.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
3 changes: 3 additions & 0 deletions assets/first_party/intro/Sprite-Gema.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 assets/first_party/intro/Sprite-Gema.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://o5oxircs01n6"
path="res://.godot/imported/Sprite-Gema.png-776e41467d1598e8505c45caf1c190d5.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/first_party/intro/Sprite-Gema.png"
dest_files=["res://.godot/imported/Sprite-Gema.png-776e41467d1598e8505c45caf1c190d5.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
3 changes: 3 additions & 0 deletions assets/first_party/intro/Sprite-MONTAÑAS-APUINKA2025.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 assets/first_party/intro/Sprite-MONTAÑAS-APUINKA2025.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://bsmrvyahkf82v"
path="res://.godot/imported/Sprite-MONTAÑAS-APUINKA2025.png-b52427ef39d6cb3639f6b50f292506b9.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/first_party/intro/Sprite-MONTAÑAS-APUINKA2025.png"
dest_files=["res://.godot/imported/Sprite-MONTAÑAS-APUINKA2025.png-b52427ef39d6cb3639f6b50f292506b9.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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://ccwv710pp62fo"
path="res://.godot/imported/Sprite-MURALLA-APUINKAFINAL2025.png-573ca7f3518d346cea47bcbd598a07ab.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/first_party/intro/Sprite-MURALLA-APUINKAFINAL2025.png"
dest_files=["res://.godot/imported/Sprite-MURALLA-APUINKAFINAL2025.png-573ca7f3518d346cea47bcbd598a07ab.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
3 changes: 3 additions & 0 deletions assets/first_party/intro/Sprite-PISOMURALLA-APUINKA2025.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://blytjk62cqufc"
path="res://.godot/imported/Sprite-PISOMURALLA-APUINKA2025.png-72966554a2858e1dff4b930d748f8063.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/first_party/intro/Sprite-PISOMURALLA-APUINKA2025.png"
dest_files=["res://.godot/imported/Sprite-PISOMURALLA-APUINKA2025.png-72966554a2858e1dff4b930d748f8063.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
3 changes: 3 additions & 0 deletions assets/first_party/intro/Sprite-antorchananimtion.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 assets/first_party/intro/Sprite-antorchananimtion.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://b41btscqpc5ih"
path="res://.godot/imported/Sprite-antorchananimtion.png-7fe79e65d7679a12fd67c412a04d82f2.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/first_party/intro/Sprite-antorchananimtion.png"
dest_files=["res://.godot/imported/Sprite-antorchananimtion.png-7fe79e65d7679a12fd67c412a04d82f2.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
3 changes: 3 additions & 0 deletions assets/first_party/intro/Sprite-soldis.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 assets/first_party/intro/Sprite-soldis.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://ygac2abvd2k6"
path="res://.godot/imported/Sprite-soldis.png-9d67c32da39690f1b1efe575601ee78d.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/first_party/intro/Sprite-soldis.png"
dest_files=["res://.godot/imported/Sprite-soldis.png-9d67c32da39690f1b1efe575601ee78d.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
2 changes: 1 addition & 1 deletion project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ Settings="*res://scenes/globals/settings/settings.gd"
PauseOverlay="*res://scenes/globals/pause/pause_overlay.tscn"
MusicPlayer="*res://scenes/globals/music_player/music_player.tscn"
CameraShake="*res://scenes/globals/camera_shaker/camera_shake.tscn"
InputHelper="*res://addons/input_helper/input_helper.gd"
AspectRatioDebugger="*res://scenes/globals/aspect_ratio_debugger/aspect_ratio_debugger.tscn"
InputHelper="*res://addons/input_helper/input_helper.gd"

[debug]

Expand Down
9 changes: 4 additions & 5 deletions scenes/game_elements/characters/enemies/guard/guard.tscn
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[gd_scene load_steps=17 format=3 uid="uid://d37mebu7atru7"]
[gd_scene load_steps=20 format=3 uid="uid://d37mebu7atru7"]

[ext_resource type="Script" uid="uid://dmf866kgfnp3c" path="res://scenes/game_elements/characters/enemies/guard/components/guard.gd" id="1_g173s"]
[ext_resource type="Script" uid="uid://c477jgx4lwr86" path="res://scenes/game_elements/characters/enemies/guard/components/guard_movement.gd" id="2_0hjcv"]
[ext_resource type="Texture2D" uid="uid://8t6ihmesvghq" path="res://scenes/game_elements/characters/enemies/guard/components/field_of_view.png" id="3_0hjcv"]
[ext_resource type="Texture2D" uid="uid://c75ofhy3swhj3" path="res://scenes/game_elements/characters/enemies/guard/components/exclamation_mark.png" id="3_pnkgp"]
[ext_resource type="Script" uid="uid://cxsi2xqcdyw7g" path="res://scenes/game_elements/characters/enemies/guard/components/light.gd" id="4_lptvm"]
[ext_resource type="Script" uid="uid://bnbt0iw1a1w6" path="res://scenes/game_elements/characters/enemies/guard/components/detection_area.gd" id="4_mswbt"]
[ext_resource type="SpriteFrames" uid="uid://ovu5wqo15s5g" path="res://scenes/quests/story_quests/NO_EDIT/1_NO_EDIT_stealth/NO_EDIT_stealth_components/NO_EDIT_guard_enemy.tres" id="5_mswbt"]
[ext_resource type="SpriteFrames" uid="uid://cg01qyy8bim2q" path="res://scenes/quests/story_quests/apu_inka/1_stealth/stealth_components/apu_inka_guard_enemy.tres" id="6_8vt0k"]
[ext_resource type="Script" uid="uid://dy68p7gf07pi3" path="res://scenes/game_logic/character_sprite_behavior.gd" id="7_klpct"]
[ext_resource type="Script" uid="uid://b3hx1n2yl88qr" path="res://scenes/game_logic/character_animation_player_behavior.gd" id="9_8vt0k"]

Expand Down Expand Up @@ -248,9 +248,8 @@ polygon = PackedVector2Array(302, 48, 283, 52, 279, 52, 101, 114, 98, 114, 79, 1
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
unique_name_in_owner = true
position = Vector2(0, -16)
sprite_frames = ExtResource("5_mswbt")
animation = &"idle"
autoplay = "idle"
sprite_frames = ExtResource("6_8vt0k")
animation = &"walk"

[node name="CharacterSpriteBehavior" type="Node2D" parent="AnimatedSprite2D" node_paths=PackedStringArray("character", "sprite")]
script = ExtResource("7_klpct")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[gd_scene load_steps=11 format=3 uid="uid://fuhl3l6gxq5k"]

[ext_resource type="Script" uid="uid://be7lr8ty24cix" path="res://scenes/game_elements/props/collectible_item/components/collectible_item.gd" id="1_7ff3m"]
[ext_resource type="Texture2D" uid="uid://6bf8rum68wq3" path="res://assets/first_party/collectibles/world_imagination.png" id="3_p8e5a"]
[ext_resource type="AudioStream" uid="uid://bhgpds38q0j4r" path="res://assets/third_party/sounds/collectibles/MemoryCollectable.ogg" id="5_hhgm5"]
[ext_resource type="AudioStream" uid="uid://38xwdjm46478" path="res://assets/third_party/sounds/collectibles/CollectibleAppear.ogg" id="5_oh62b"]
[ext_resource type="PackedScene" uid="uid://dutgnbiy7xalb" path="res://scenes/game_elements/props/interact_area/interact_area.tscn" id="6_j0enh"]
Expand Down Expand Up @@ -294,7 +293,6 @@ libraries = {
[node name="Sprite2D" type="Sprite2D" parent="."]
visible = false
modulate = Color(1, 1, 1, 0)
texture = ExtResource("3_p8e5a")

[node name="CollectedSound" type="AudioStreamPlayer" parent="."]
unique_name_in_owner = true
Expand Down
Loading