diff --git a/.gitattributes b/.gitattributes index 58d9996..45801d7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ *.png filter=lfs diff=lfs merge=lfs -text *.ttf filter=lfs diff=lfs merge=lfs -text *.wav filter=lfs diff=lfs merge=lfs -text +*.ico filter=lfs diff=lfs merge=lfs -text diff --git a/Assets/icons/jaquette.ico b/Assets/icons/jaquette.ico index 0af7381..0236d2e 100755 Binary files a/Assets/icons/jaquette.ico and b/Assets/icons/jaquette.ico differ diff --git a/Scenes/Scripts/Button_Node2D.gd b/Scenes/Scripts/Button_Node2D.gd index 1397a39..3d2def5 100755 --- a/Scenes/Scripts/Button_Node2D.gd +++ b/Scenes/Scripts/Button_Node2D.gd @@ -15,7 +15,7 @@ func _process(delta) -> void: if etat: timer += delta if villain.animation == villain_animations.animations[-1]: - assert(get_tree().change_scene("res://Scenes/gameover.tscn") == OK) + get_tree().change_scene("res://Scenes/gameover.tscn") if timer >= 7: # fermer le dossier et enlever l'icone etat = false self.get_parent().get_parent().visible = false diff --git a/Scenes/Scripts/Desktop.gd b/Scenes/Scripts/Desktop.gd index 25b6c02..be0051f 100755 --- a/Scenes/Scripts/Desktop.gd +++ b/Scenes/Scripts/Desktop.gd @@ -94,4 +94,4 @@ func _process(_delta) -> void: if end: mainMusic.set_volume_db(-80) eyeMusic.set_volume_db(-80) - assert(get_tree().change_scene("res://Scenes/victory.tscn") == OK) + get_tree().change_scene("res://Scenes/victory.tscn") diff --git a/Scenes/Scripts/GameOver.gd b/Scenes/Scripts/GameOver.gd index 7de4103..3129407 100755 --- a/Scenes/Scripts/GameOver.gd +++ b/Scenes/Scripts/GameOver.gd @@ -3,7 +3,7 @@ onready var hover_sound = $"Hover" func _on_RestartButton_pressed() -> void: - assert(get_tree().change_scene("res://Scenes/menu.tscn") == OK) + get_tree().change_scene("res://Scenes/Menu.tscn") func _on_RestartButton_mouse_entered() -> void: diff --git a/Scenes/Scripts/Screen_Menu.gd b/Scenes/Scripts/Screen_Menu.gd index 29d87a2..0ea1f23 100755 --- a/Scenes/Scripts/Screen_Menu.gd +++ b/Scenes/Scripts/Screen_Menu.gd @@ -4,7 +4,7 @@ onready var help = $"../Help" func _on_PlayButton_pressed() -> void: - assert(get_tree().change_scene("res://Scenes/DesktopScreen.tscn") == OK) + get_tree().change_scene("res://Scenes/DesktopScreen.tscn") func _on_Help_Button_pressed() -> void: diff --git a/Scenes/help.tscn b/Scenes/help.tscn index a8bbe37..34d5f39 100755 --- a/Scenes/help.tscn +++ b/Scenes/help.tscn @@ -21,7 +21,7 @@ margin_top = 8.0 margin_right = 1025.0 margin_bottom = 726.0 custom_fonts/font = ExtResource( 2 ) -text = "[ Aim of the game ] +text = "[Aim of the game] If you have made it this far, you've been selected for an important mission: Get rid of our greatest enemy, Macreye. diff --git a/export_presets.cfg b/export_presets.cfg index 518ee29..578c44a 100755 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -32,11 +32,11 @@ codesign/digest_algorithm=1 codesign/description="" codesign/custom_options=PoolStringArray( ) application/modify_resources=true -application/icon="" +application/icon="res://Assets/icons/jaquette.ico" application/file_version="" application/product_version="" application/company_name="Bip boup" -application/product_name="" +application/product_name="Boups" application/file_description="Jeu développé lors de la GameJam Advance 2023" application/copyright="" application/trademarks="" diff --git a/icon.png b/icon.png deleted file mode 100755 index 0b4d74e..0000000 --- a/icon.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c160bfdb8d0423b958083202dc7b58d499cbef22f28d2a58626884378ce9b7f -size 3305 diff --git a/icon.png.import b/icon.png.import deleted file mode 100644 index a4c02e6..0000000 --- a/icon.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://icon.png" -dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=true -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/project.godot b/project.godot index 0571d34..6db3017 100755 --- a/project.godot +++ b/project.godot @@ -10,7 +10,7 @@ config_version=4 [application] -config/name="Gja" +config/name="Boups" run/main_scene="res://Scenes/Menu.tscn" config/icon="res://Assets/icons/jaquette.png" config/windows_native_icon="res://Assets/icons/jaquette.ico"