Merge branch 'main' of https://sgda.game-dev.space/SGDA/EGJ25

fix: change floor
Merge branch 'main' of http://sgda.game-dev.space/SGDA/EGJ25
2025-06-29 10:05:31 +02:00 · 2025-06-29 10:05:23 +02:00 · 2025-06-29 09:54:51 +02:00 · 2025-06-29 09:49:48 +02:00
4 changed files with 22 additions and 7 deletions
--- a/assets/garance/EGJ-Green-tiles.png
+++ b/assets/garance/EGJ-Green-tiles.png
--- a/assets/garance/EGJ-Green-tiles.png.import
+++ b/assets/garance/EGJ-Green-tiles.png.import
@ -2,7 +2,7 @@

 importer="texture"
 type="CompressedTexture2D"
-uid="uid://ch7k58hcv4d0y"
+uid="uid://lqn1agbqybrv"
 path="res://.godot/imported/EGJ-Green-tiles.png-1c52bebef5d392ae5c1aa00936fe3f02.ctex"
 metadata={
 "vram_texture": false
--- a/scenes/indoors/bar.tscn
+++ b/scenes/indoors/bar.tscn
--- a/scenes/indoors/last.tscn
+++ b/scenes/indoors/last.tscn
@ -2515,14 +2515,14 @@ position = Vector2(292, -17)
 sprite_frames = SubResource("SpriteFrames_fcj1w")
 animation = &"idle"
 autoplay = "idle"
-frame_progress = 0.855646
+frame_progress = 0.457516

 [node name="AnimatedSprite2D2" type="AnimatedSprite2D" parent="Hack"]
 position = Vector2(-11, 14)
 sprite_frames = SubResource("SpriteFrames_tnfmx")
 animation = &"idle"
 autoplay = "idle"
-frame_progress = 0.900493
+frame_progress = 0.502363

 [node name="StaticBody2D" type="StaticBody2D" parent="Hack"]
Author	SHA1	Message	Date
minimata	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 Details Create tag and build when new code gets to main / Export (push) Successful in 2m35s Details	2025-06-29 10:05:31 +02:00
minimata	cc93f8dfc4	fix: change floor	2025-06-29 10:05:23 +02:00
Garance	de8079f0da	Merge branch 'main' of http://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 Details Create tag and build when new code gets to main / Export (push) Successful in 2m32s Details # Conflicts: # assets/garance/EGJ-Green-tiles.png # assets/garance/EGJ-Green-tiles.png.import	2025-06-29 09:54:51 +02:00
Garance	ad040b4940	Green tiles (correct)	2025-06-29 09:49:48 +02:00