Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
71a10a6
Duplicate and rename template and all files
KevinSplits Oct 21, 2025
8030a99
Merge pull request #43 from Game-Lab-5-0-UTP-Group-6-Team-1/copy-rena…
KevinSplits Oct 21, 2025
016de63
Integrar minijuego 1 y todos los cambios de Elementals
KevinSplits Nov 13, 2025
2d689ea
Merge pull request #45 from Game-Lab-5-0-UTP-Group-6-Team-1/integrar-…
KevinSplits Nov 13, 2025
726724d
ya esta
KevinSplits Nov 13, 2025
0f67570
Merge pull request #46 from Game-Lab-5-0-UTP-Group-6-Team-1/kevin-upd…
KevinSplits Nov 13, 2025
551078a
arreglando bugs
KevinSplits Nov 13, 2025
1fb6814
Merge branch 'main' of https://github.com/Game-Lab-5-0-UTP-Group-6-Te…
KevinSplits Nov 13, 2025
7af48fd
nuevo mapa con enemigos
Heiner-dev Nov 19, 2025
9358e5c
Guardando cambios antes del pull
KevinSplits Nov 20, 2025
676467d
fondo de la intro
Heiner-dev Nov 20, 2025
a377d8c
Resolviendo conflicto: Me quedo con la escena del servidor
KevinSplits Nov 20, 2025
c86cddd
Merge branch 'kevin-updates' of https://github.com/Game-Lab-5-0-UTP-G…
KevinSplits Nov 20, 2025
b57e460
agregacion de musica
Heiner-dev Nov 20, 2025
05a9467
Merge branch 'kevin-updates' of https://github.com/Game-Lab-5-0-UTP-G…
Heiner-dev Nov 20, 2025
450989f
sonidos del enemigo y de jozu
Heiner-dev Nov 20, 2025
5f37ef0
Mejoras en Jozu metralleta y cinematicas
KevinSplits Nov 21, 2025
932cd8e
Arreglando conflicto en la escena minigame1
KevinSplits Nov 21, 2025
869f722
Jozu terminado: Dash 8 dir, Audio, Dialogo Muerte y Cinematicas arreg…
KevinSplits 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
  •  
  •  
  •  
20 changes: 20 additions & 0 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,26 @@ throw={
, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":1,"position":Vector2(92, 25),"global_position":Vector2(92, 54),"factor":1.0,"button_index":1,"canceled":false,"pressed":true,"double_click":false,"script":null)
]
}
shoot_up={
"deadzone": 0.2,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":73,"key_label":0,"unicode":105,"location":0,"echo":false,"script":null)
]
}
shoot_down={
"deadzone": 0.2,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":75,"key_label":0,"unicode":107,"location":0,"echo":false,"script":null)
]
}
shoot_left={
"deadzone": 0.2,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":74,"key_label":0,"unicode":106,"location":0,"echo":false,"script":null)
]
}
shoot_right={
"deadzone": 0.2,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":76,"key_label":0,"unicode":108,"location":0,"echo":false,"script":null)
]
}

[layer_names]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: The Threadbare Authors
# SPDX-License-Identifier: MPL-2.0
class_name Projectile
class_name Projectiles
extends RigidBody2D
## A projectile that can fill matching [FillingBarrel]s.
##
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ func move_player_to_self_position(smooth_camera: bool = false) -> void:
var player: Node2D = get_tree().get_first_node_in_group("player")

if is_instance_valid(player):
player.teleport_to(self.global_position, smooth_camera, look_at_side_on_spawn)
player.teleport_to(self.global_position, smooth_camera, look_at_side_on_spawn)
28 changes: 14 additions & 14 deletions scenes/menus/storybook/storybook.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -239,21 +239,21 @@ arrow/styles/hover = SubResource("StyleBoxFlat_bk7gi")
arrow/styles/normal = SubResource("StyleBoxFlat_bk7gi")
arrow/styles/pressed = SubResource("StyleBoxFlat_bk7gi")

[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_y0b3i"]
texture = ExtResource("14_jl72s")

[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_8qcyx"]
texture = ExtResource("14_m2ghf")

[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_y0b3i"]
texture = ExtResource("14_jl72s")

[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_nkrro"]
texture = ExtResource("15_jl72s")

[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_xkl6m"]
texture = ExtResource("18_m2ghf")

[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_p0vqm"]
texture = ExtResource("17_m2ghf")

[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_xkl6m"]
texture = ExtResource("18_m2ghf")

[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_bnrpt"]
texture = ExtResource("18_jl72s")

Expand Down Expand Up @@ -394,11 +394,11 @@ offset_right = 175.0
offset_bottom = 49.28
grow_vertical = 2
theme = SubResource("Theme_rf3dg")
theme_override_styles/focus = SubResource("StyleBoxTexture_y0b3i")
theme_override_styles/disabled = SubResource("StyleBoxTexture_8qcyx")
theme_override_styles/hover = SubResource("StyleBoxTexture_nkrro")
theme_override_styles/pressed = SubResource("StyleBoxTexture_y0b3i")
theme_override_styles/normal = SubResource("StyleBoxTexture_8qcyx")
theme_override_styles/pressed = SubResource("StyleBoxTexture_y0b3i")
theme_override_styles/hover = SubResource("StyleBoxTexture_nkrro")
theme_override_styles/disabled = SubResource("StyleBoxTexture_8qcyx")
theme_override_styles/focus = SubResource("StyleBoxTexture_y0b3i")

[node name="Right_Button" type="Button" parent="Panel/Background"]
unique_name_in_owner = true
Expand All @@ -415,11 +415,11 @@ offset_right = -51.0
offset_bottom = 49.28
grow_horizontal = 0
grow_vertical = 2
theme_override_styles/focus = SubResource("StyleBoxTexture_xkl6m")
theme_override_styles/disabled = SubResource("StyleBoxTexture_p0vqm")
theme_override_styles/hover = SubResource("StyleBoxTexture_bnrpt")
theme_override_styles/pressed = SubResource("StyleBoxTexture_xkl6m")
theme_override_styles/normal = SubResource("StyleBoxTexture_p0vqm")
theme_override_styles/pressed = SubResource("StyleBoxTexture_xkl6m")
theme_override_styles/hover = SubResource("StyleBoxTexture_bnrpt")
theme_override_styles/disabled = SubResource("StyleBoxTexture_p0vqm")
theme_override_styles/focus = SubResource("StyleBoxTexture_xkl6m")

[connection signal="selected" from="Panel/Background/StoryBookContent/StorybookPage" to="." method="_on_storybook_page_selected"]
[connection signal="pressed" from="Panel/Background/StoryBookContent/BackButton" to="." method="_on_back_button_pressed"]
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ tile_set = ExtResource("1_hkifp")
metadata/_edit_lock_ = true

[node name="Equipo2Trees2" parent="TileMapLayers" instance=ExtResource("8_5dkvu")]
position = Vector2(20, 100)
position = Vector2(26, 114)

[node name="Equipo2Trees3" parent="TileMapLayers" instance=ExtResource("3_pttsu")]
position = Vector2(553, 209)
Expand Down
3 changes: 3 additions & 0 deletions scenes/quests/story_quests/elementals/0_intro/elarbol2.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://buvp35pn4hl7b"
path="res://.godot/imported/elarbol2.png-f16eadd6d0c9c5ffc850ccf134a4f6a0.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://scenes/quests/story_quests/elementals/0_intro/elarbol2.png"
dest_files=["res://.godot/imported/elarbol2.png-f16eadd6d0c9c5ffc850ccf134a4f6a0.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