Merge branch 'main' of https://github.com/MarcEricMartel/GameJam-Vanier

Levels/level.tscn

@@ -244,4 +244,3 @@ position = Vector2(3658, 4777)
 [connection signal="is_killed" from="Mimic_02" to="." method="_on_mimic_02_is_killed"]
 [connection signal="picked" from="pants" to="." method="_on_pants_picked"]
 [connection signal="is_killed" from="Gym_Enemy05" to="." method="_on_gym_enemy_05_is_killed"]
-

Player/player.tscn

@@ -50,13 +50,13 @@ default_color = Color(1, 0, 0, 0.392157)
 
 [node name="Bladder" type="Sprite2D" parent="."]
 material = SubResource("ShaderMaterial_g8k2d")
-position = Vector2(-847, -443)
+position = Vector2(-427, -197)
 scale = Vector2(2, 2)
 texture = ExtResource("5_pcbeg")
 script = ExtResource("6_8x3rf")
 
 [node name="BladderHollow" type="Sprite2D" parent="."]
-position = Vector2(-847, -443)
+position = Vector2(-427, -197)
 scale = Vector2(2, 2)
 texture = ExtResource("3_nm4h4")
 

Weapons/pillow.tscn

@@ -6,8 +6,8 @@
 
 [node name="pillow" instance=ExtResource("1_4irix")]
 PROJECTILE = ExtResource("2_ym5xc")
-COOLDOWN = 0.1
-SPREAD = 0.5
+COOLDOWN = 0.05
+SPREAD = 0.25
 
 [node name="Sprite2D" parent="." index="0"]
 position = Vector2(59, 19)

game_over.tscn

@@ -1,9 +1,11 @@
-[gd_scene load_steps=3 format=3 uid="uid://d1ek3aw31vio2"]
+[gd_scene load_steps=3 format=3 uid="uid://bi5h65wa7574p"]
 
 [ext_resource type="Script" path="res://GameOver.gd" id="1_2w7nc"]
 [ext_resource type="Texture2D" uid="uid://cyodm2ixiok7d" path="res://Images/Game_Over.png" id="2_guyua"]
 
 [node name="GameOver" type="Node2D"]
+position = Vector2(20, 0)
+scale = Vector2(0.522579, 0.493457)
 script = ExtResource("1_2w7nc")
 
 [node name="ColorRect" type="ColorRect" parent="."]

project.godot

@@ -17,8 +17,8 @@ config/icon="res://icon.svg"
 
 [display]
 
-window/size/viewport_width=1920
-window/size/viewport_height=1080
+window/size/viewport_width=1024
+window/size/viewport_height=576
 window/size/mode=3
 window/size/resizable=false
 window/stretch/mode="viewport"

start.tscn

@@ -1,10 +1,12 @@
-[gd_scene load_steps=4 format=3 uid="uid://d25c4ey6gvduc"]
+[gd_scene load_steps=4 format=3 uid="uid://c58wsmkklb7wq"]
 
 [ext_resource type="Texture2D" uid="uid://cg848qjc4fxi" path="res://Images/Main_menu.png" id="1_65g7h"]
 [ext_resource type="Script" path="res://start.gd" id="1_exncb"]
 [ext_resource type="Texture2D" uid="uid://drkbrxdk6s40s" path="res://Images/eniv.png" id="3_5j2rv"]
 
 [node name="Start" type="Node2D"]
+position = Vector2(-13, 37)
+scale = Vector2(0.547083, 0.527457)
 script = ExtResource("1_exncb")
 
 [node name="MainMenu" type="Sprite2D" parent="."]