12 Commits

Author SHA1 Message Date
5b37da17e0 fix: some lights on lvl 1
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 9s
Create tag and build when new code gets to main / Export (push) Successful in 2m33s
2025-06-29 12:11:11 +02:00
9b781ac431 Merge branch 'main' of https://sgda.game-dev.space/SGDA/EGJ25
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 13s
Create tag and build when new code gets to main / Export (push) Successful in 2m33s
2025-06-29 12:02:41 +02:00
42fa5edecf feat: lvl2 decor 2025-06-29 12:02:37 +02:00
d478f81fc0 Déco scène 1 (buildings fond)
Some checks failed
Create tag and build when new code gets to main / BumpTag (push) Successful in 8s
Create tag and build when new code gets to main / Export (push) Has been cancelled
2025-06-29 12:01:04 +02:00
84cf2d3131 Asset mur uni 2025-06-29 11:28:33 +02:00
12cd9a5232 Déco scène 1 2025-06-29 11:27:45 +02:00
c12009c6d5 Merge branch 'main' of https://sgda.game-dev.space/SGDA/EGJ25
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 9s
Create tag and build when new code gets to main / Export (push) Successful in 2m30s
2025-06-29 10:41:32 +02:00
2eab16feab feat: tableau 2025-06-29 10:41:26 +02:00
62afaea51d trap door import
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 8s
Create tag and build when new code gets to main / Export (push) Successful in 2m34s
2025-06-29 10:33:12 +02:00
d92d6203cf Trap door asset
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 9s
Create tag and build when new code gets to main / Export (push) Successful in 2m28s
first version
2025-06-29 10:21:28 +02:00
7d9dfc40a6 Merge branch 'main' of https://sgda.game-dev.space/SGDA/EGJ25
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 8s
Create tag and build when new code gets to main / Export (push) Successful in 2m35s
2025-06-29 10:05:31 +02:00
cc93f8dfc4 fix: change floor 2025-06-29 10:05:23 +02:00
7 changed files with 358 additions and 40 deletions

BIN
assets/garance/EGJ-MurUni.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ebw4okpvcioc"
path="res://.godot/imported/EGJ-MurUni.png-1e473768d3bca838d36aee5a34900282.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/garance/EGJ-MurUni.png"
dest_files=["res://.godot/imported/EGJ-MurUni.png-1e473768d3bca838d36aee5a34900282.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

BIN
assets/garance/EGJ-TrapDoor.png (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://pc5817wfl1no"
path="res://.godot/imported/EGJ-TrapDoor.png-4b40cb8e4fcb87241c8db0dc35e949f4.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/garance/EGJ-TrapDoor.png"
dest_files=["res://.godot/imported/EGJ-TrapDoor.png-4b40cb8e4fcb87241c8db0dc35e949f4.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

File diff suppressed because one or more lines are too long

View File

@ -2515,14 +2515,14 @@ position = Vector2(292, -17)
sprite_frames = SubResource("SpriteFrames_fcj1w") sprite_frames = SubResource("SpriteFrames_fcj1w")
animation = &"idle" animation = &"idle"
autoplay = "idle" autoplay = "idle"
frame_progress = 0.855646 frame_progress = 0.987176
[node name="AnimatedSprite2D2" type="AnimatedSprite2D" parent="Hack"] [node name="AnimatedSprite2D2" type="AnimatedSprite2D" parent="Hack"]
position = Vector2(-11, 14) position = Vector2(-11, 14)
sprite_frames = SubResource("SpriteFrames_tnfmx") sprite_frames = SubResource("SpriteFrames_tnfmx")
animation = &"idle" animation = &"idle"
autoplay = "idle" autoplay = "idle"
frame_progress = 0.900493 frame_progress = 0.0320194
[node name="StaticBody2D" type="StaticBody2D" parent="Hack"] [node name="StaticBody2D" type="StaticBody2D" parent="Hack"]
@ -2632,7 +2632,7 @@ position = Vector2(468, -6)
texture = ExtResource("7_7ac63") texture = ExtResource("7_7ac63")
[node name="TimerBetweenVO" type="Timer" parent="."] [node name="TimerBetweenVO" type="Timer" parent="."]
wait_time = 0.2 wait_time = 4.0
autostart = true autostart = true
[connection signal="event_confirmed" from="GetOutDoors/WrongDoor" to="." method="_on_wrong_door_event_triggered"] [connection signal="event_confirmed" from="GetOutDoors/WrongDoor" to="." method="_on_wrong_door_event_triggered"]

File diff suppressed because one or more lines are too long