Compare commits

..

26 Commits

Author SHA1 Message Date
36844069c4 arreglo 2024-11-13 17:36:37 +01:00
4facba61d4 Merge pull request 'cambio verde backgraund' (#5) from 10guerra/JuegoClase:main into main
Reviewed-on: http://julianloza.synology.me:3000/Julian/JuegoClase/pulls/5
2024-11-13 13:07:09 +00:00
4aab7d20b9 Merge pull request 'colores y sombras' (#6) from iyangarcii/JuegoClase:main into main
Reviewed-on: http://julianloza.synology.me:3000/Julian/JuegoClase/pulls/6
2024-11-13 13:06:45 +00:00
d9f4e3a872 colores y sombras 2024-11-13 14:03:52 +01:00
ba84b08428 cambio verde backgraund 2024-11-13 13:49:44 +01:00
fef1012543 Merge pull request 'pinchos(trampa)(color rojo)' (#4) from armando271/JuegoClase:main into main
Reviewed-on: http://julianloza.synology.me:3000/Julian/JuegoClase/pulls/4
2024-11-13 12:40:09 +00:00
bf5c8466a0 Merge branch 'main' into main 2024-11-13 12:39:13 +00:00
7719761959 pinchos(trampa)(color rojo) 2024-11-13 13:26:41 +01:00
e46a25c9b1 Merge pull request 'cambio color skull' (#2) from daviddiazruiz/JuegoClaseJulian:main into main
Reviewed-on: http://julianloza.synology.me:3000/Julian/JuegoClase/pulls/2
2024-11-12 11:46:10 +00:00
6da000a5f2 cambio color skull 2024-11-12 12:42:38 +01:00
261526c8da movido el personaje Player 2024-11-07 17:50:30 +01:00
fbcc0cdb7e ultimo 2024-11-07 17:49:30 +01:00
f8195aa74d Desde iMac al git mio 2024-11-07 17:48:30 +01:00
06bc11f4ba Ultimo desde iMac 2024-11-07 17:42:42 +01:00
f4d17b640e Merge pull request 'Actualizar Personajes/EnemigoCerdito/enemigo_cerdito.gd' (#1) from cambios into main
Reviewed-on: http://julianloza.synology.me:3000/Julian/JuegoClase/pulls/1
2024-11-07 10:33:30 +00:00
1da7b2461c Actualizar Personajes/EnemigoCerdito/enemigo_cerdito.gd 2024-11-07 10:32:22 +00:00
ade
38e9098ef3 tres 2024-11-07 11:18:41 +01:00
ade
72d6a38c08 dues 2024-11-07 11:12:54 +01:00
ade
1f848edd66 dos archivos 2024-11-07 11:04:54 +01:00
89d0f11b01
Merge pull request #5 from daviddiazruiz/main
cambio de colores al personaje principal
2024-11-06 14:19:03 +01:00
ad1e6595ae cambio de colores al personaje principal 2024-11-06 14:10:33 +01:00
af6c04e780 et5t5 2024-11-05 11:54:27 +01:00
40d27dee26 Merge remote-tracking branch 'refs/remotes/origin/main' 2024-11-02 15:05:01 +01:00
fda3fed005 Personaje 2024-11-01 20:52:00 +01:00
65f8284dd9 Merge remote-tracking branch 'refs/remotes/origin/main' 2024-10-27 11:02:14 +01:00
fa7be86966 Modificado gitignore 2024-10-26 14:06:19 +02:00
21 changed files with 54 additions and 644 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 543 B

After

Width:  |  Height:  |  Size: 618 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 188 B

After

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 178 B

After

Width:  |  Height:  |  Size: 159 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 829 B

After

Width:  |  Height:  |  Size: 810 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 707 B

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dm6dehnbtoihy"
path="res://.godot/imported/Pink 2.png-2f70cdad5db4bfe7730179d08c3b009f.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Assets_PixelAdventure/Main Characters/Pink 2.png"
dest_files=["res://.godot/imported/Pink 2.png-2f70cdad5db4bfe7730179d08c3b009f.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
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/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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 184 B

View File

@ -33,20 +33,15 @@ offset_right = 268.0
offset_bottom = 228.0
[node name="Button" type="Button" parent="VBoxContainer"]
offset_right = 110.0
offset_bottom = 31.0
layout_mode = 2
text = "START"
[node name="Button2" type="Button" parent="VBoxContainer"]
offset_top = 35.0
offset_right = 110.0
offset_bottom = 66.0
layout_mode = 2
text = "EXIT"
[node name="Button3" type="Button" parent="VBoxContainer"]
offset_top = 70.0
offset_right = 110.0
offset_bottom = 101.0
layout_mode = 2
text = "FULL SCREEN
"
@ -95,7 +90,6 @@ texture = ExtResource("7_ubh51")
[node name="Camera2D" type="Camera2D" parent="."]
position = Vector2(214, 117)
current = true
[connection signal="pressed" from="VBoxContainer/Button" to="." method="_on_button_pressed"]
[connection signal="pressed" from="VBoxContainer/Button2" to="." method="_on_button_2_pressed"]

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -19,42 +19,30 @@
texture = ExtResource("1_hkahx")
0:10/0 = 0
0:10/0/terrain_set = 0
0:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:10/0/physics_layer_0/angular_velocity = 0.0
0:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
0:10/0/terrains_peering_bit/top_right_corner = 0
0:9/0 = 0
0:9/0/terrain_set = 0
0:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:9/0/physics_layer_0/angular_velocity = 0.0
0:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
0:9/0/terrains_peering_bit/right_side = 0
0:9/0/terrains_peering_bit/bottom_right_corner = 0
0:9/0/terrains_peering_bit/top_right_corner = 0
0:8/0 = 0
0:8/0/terrain_set = 0
0:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
0:8/0/physics_layer_0/angular_velocity = 0.0
0:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
0:8/0/terrains_peering_bit/bottom_right_corner = 0
1:8/0 = 0
1:8/0/terrain_set = 0
1:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:8/0/physics_layer_0/angular_velocity = 0.0
1:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:8/0/terrains_peering_bit/bottom_right_corner = 0
1:8/0/terrains_peering_bit/bottom_side = 0
1:8/0/terrains_peering_bit/bottom_left_corner = 0
2:8/0 = 0
2:8/0/terrain_set = 0
2:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:8/0/physics_layer_0/angular_velocity = 0.0
2:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:8/0/terrains_peering_bit/bottom_left_corner = 0
3:8/0 = 0
3:8/0/terrain_set = 0
3:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:8/0/physics_layer_0/angular_velocity = 0.0
3:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:8/0/terrains_peering_bit/bottom_left_corner = 0
3:8/0/terrains_peering_bit/left_side = 0
@ -63,8 +51,6 @@ texture = ExtResource("1_hkahx")
3:8/0/terrains_peering_bit/top_right_corner = 0
4:8/0 = 0
4:8/0/terrain_set = 0
4:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:8/0/physics_layer_0/angular_velocity = 0.0
4:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
4:8/0/terrains_peering_bit/right_side = 0
4:8/0/terrains_peering_bit/bottom_right_corner = 0
@ -73,8 +59,6 @@ texture = ExtResource("1_hkahx")
4:8/0/terrains_peering_bit/top_right_corner = 0
4:9/0 = 0
4:9/0/terrain_set = 0
4:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:9/0/physics_layer_0/angular_velocity = 0.0
4:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
4:9/0/terrains_peering_bit/right_side = 0
4:9/0/terrains_peering_bit/bottom_right_corner = 0
@ -82,21 +66,13 @@ texture = ExtResource("1_hkahx")
4:9/0/terrains_peering_bit/bottom_left_corner = 0
4:9/0/terrains_peering_bit/top_right_corner = 0
4:10/0 = 0
4:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
4:10/0/physics_layer_0/angular_velocity = 0.0
3:10/0 = 0
3:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:10/0/physics_layer_0/angular_velocity = 0.0
2:10/0 = 0
2:10/0/terrain_set = 0
2:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:10/0/physics_layer_0/angular_velocity = 0.0
2:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:10/0/terrains_peering_bit/top_left_corner = 0
1:10/0 = 0
1:10/0/terrain_set = 0
1:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:10/0/physics_layer_0/angular_velocity = 0.0
1:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:10/0/terrains_peering_bit/top_left_corner = 0
1:10/0/terrains_peering_bit/top_side = 0
@ -104,8 +80,6 @@ texture = ExtResource("1_hkahx")
1:9/0 = 0
1:9/0/terrain_set = 0
1:9/0/terrain = 0
1:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
1:9/0/physics_layer_0/angular_velocity = 0.0
1:9/0/terrains_peering_bit/right_side = 0
1:9/0/terrains_peering_bit/bottom_right_corner = 0
1:9/0/terrains_peering_bit/bottom_side = 0
@ -116,16 +90,12 @@ texture = ExtResource("1_hkahx")
1:9/0/terrains_peering_bit/top_right_corner = 0
2:9/0 = 0
2:9/0/terrain_set = 0
2:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
2:9/0/physics_layer_0/angular_velocity = 0.0
2:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:9/0/terrains_peering_bit/bottom_left_corner = 0
2:9/0/terrains_peering_bit/left_side = 0
2:9/0/terrains_peering_bit/top_left_corner = 0
3:9/0 = 0
3:9/0/terrain_set = 0
3:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
3:9/0/physics_layer_0/angular_velocity = 0.0
3:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:9/0/terrains_peering_bit/bottom_right_corner = 0
3:9/0/terrains_peering_bit/bottom_side = 0
@ -229,9 +199,9 @@ curve = SubResource("Curve2D_xbbc4")
platformSpeed = 0.284
[node name="PathFollow2D" parent="Platform" index="0"]
position = Vector2(230.957, -12.1214)
rotation = -0.0282943
progress = 235.163
position = Vector2(29.1281, -6.18427)
rotation = -0.0658388
progress = 33.2031
[node name="FallDamage" parent="." instance=ExtResource("10_1wkwm")]
position = Vector2(85, 259)
@ -249,12 +219,12 @@ platformSpeed = 0.888
curve = SubResource("Curve2D_2qvbj")
[node name="PathFollow2D" parent="Sierra2/Path2D" index="0"]
position = Vector2(2.12025, -27.5509)
rotation = -1.59782
progress = 32.5748
position = Vector2(2.00764, -32.5866)
rotation = -1.5779
progress = 37.7707
[node name="Sprite" parent="Sierra2/Path2D/PathFollow2D/SierraVerdadera" index="0"]
rotation = 1857.37
rotation = 2132.02
[node name="Chain" type="Sprite2D" parent="Sierra2"]
position = Vector2(3, 1)

View File

@ -1,5 +1,5 @@
extends Personajes
# comentario

View File

@ -199,12 +199,14 @@ collision_mask = 6
script = ExtResource("1_7wx7r")
[node name="LabelState" type="Label" parent="."]
visible = false
z_index = 10
offset_left = -9.0
offset_top = -28.0
offset_right = 38.0
offset_bottom = -2.0
text = "aaaaa"
text = "as
"
label_settings = SubResource("LabelSettings_82qkg")
[node name="StateMachine" type="Node" parent="."]
@ -337,7 +339,7 @@ stream = ExtResource("7_jbpay")
collision_mask = 6
[node name="CollisionShape2D" type="CollisionShape2D" parent="RecibirDanio"]
position = Vector2(1, 4.5)
position = Vector2(1, 4)
shape = SubResource("RectangleShape2D_menop")
[connection signal="timeout" from="StateMachine/Dash/DashTimer" to="StateMachine/Dash" method="_on_dash_timer_timeout"]

View File

@ -28,6 +28,3 @@ func save_data():
var file = FileAccess.open(SAVEFILE,FileAccess.WRITE)
file.store_var(game_data)
file = null

View File

@ -28,6 +28,10 @@ window/size/window_width_override=1280
window/size/window_height_override=720
window/stretch/mode="canvas_items"
[dotnet]
project/assembly_name="Plataformas2d"
[editor]
version_control/plugin_name="GitPlugin"