From 126c4245dd860f1dedfdd3e35dba1d151c0b5b59 Mon Sep 17 00:00:00 2001 From: Paul Norberger Date: Tue, 21 Apr 2020 00:58:12 +0200 Subject: [PATCH] Fixed sound looping --- .../Chad_Crouch_-_Algorithms.ogg.import | 2 +- src/Menus/Sounds/menu_slider1.ogg.import | 2 +- src/Menus/Sounds/menu_slider2.ogg.import | 2 +- src/Menus/Sounds/menu_slider3.ogg.import | 2 +- src/Menus/Sounds/menu_theme.ogg.import | 2 +- src/Player/Sounds/hero_laugh1.ogg.import | 2 +- src/Player/Sounds/hero_laugh2.ogg.import | 2 +- src/Player/Sounds/sword1.ogg.import | 2 +- src/Player/Sounds/sword2.ogg.import | 2 +- src/Player/Sounds/sword3.ogg.import | 2 +- src/Player/Sounds/sword4.ogg.import | 2 +- src/Player/Sounds/sword5.ogg.import | 2 +- src/World.tscn | 18 +----------------- src/project.godot | 14 ++++++++++++++ 14 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/Menus/Credits/Chad_Crouch_-_Algorithms.ogg.import b/src/Menus/Credits/Chad_Crouch_-_Algorithms.ogg.import index 5013037..2080b15 100644 --- a/src/Menus/Credits/Chad_Crouch_-_Algorithms.ogg.import +++ b/src/Menus/Credits/Chad_Crouch_-_Algorithms.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/Chad_Crouch_-_Algorithms.ogg-0b5876f6436c5da97190209 [params] -loop=true +loop=false loop_offset=0 diff --git a/src/Menus/Sounds/menu_slider1.ogg.import b/src/Menus/Sounds/menu_slider1.ogg.import index f348df4..61a6303 100644 --- a/src/Menus/Sounds/menu_slider1.ogg.import +++ b/src/Menus/Sounds/menu_slider1.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/menu_slider1.ogg-35df765e7d7998b5a6162c41b4a229e2.og [params] -loop=true +loop=false loop_offset=0 diff --git a/src/Menus/Sounds/menu_slider2.ogg.import b/src/Menus/Sounds/menu_slider2.ogg.import index cd97e3b..762c096 100644 --- a/src/Menus/Sounds/menu_slider2.ogg.import +++ b/src/Menus/Sounds/menu_slider2.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/menu_slider2.ogg-b2a698a7a30a0a4e4c29e9f29b5b7435.og [params] -loop=true +loop=false loop_offset=0 diff --git a/src/Menus/Sounds/menu_slider3.ogg.import b/src/Menus/Sounds/menu_slider3.ogg.import index 499133f..a09e5cf 100644 --- a/src/Menus/Sounds/menu_slider3.ogg.import +++ b/src/Menus/Sounds/menu_slider3.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/menu_slider3.ogg-a3cde724c66919d1cabbaa1ccadfedf2.og [params] -loop=true +loop=false loop_offset=0 diff --git a/src/Menus/Sounds/menu_theme.ogg.import b/src/Menus/Sounds/menu_theme.ogg.import index e3cec05..01f7d9f 100644 --- a/src/Menus/Sounds/menu_theme.ogg.import +++ b/src/Menus/Sounds/menu_theme.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/menu_theme.ogg-9ccc235bdc65da3be6e74fbbdbbd5bce.oggs [params] -loop=true +loop=false loop_offset=0 diff --git a/src/Player/Sounds/hero_laugh1.ogg.import b/src/Player/Sounds/hero_laugh1.ogg.import index ba29a5b..b4557bb 100644 --- a/src/Player/Sounds/hero_laugh1.ogg.import +++ b/src/Player/Sounds/hero_laugh1.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/hero_laugh1.ogg-7dec7ac554ba9c656df4c0a3b9f9ae70.ogg [params] -loop=true +loop=false loop_offset=0 diff --git a/src/Player/Sounds/hero_laugh2.ogg.import b/src/Player/Sounds/hero_laugh2.ogg.import index cd500c7..bd24033 100644 --- a/src/Player/Sounds/hero_laugh2.ogg.import +++ b/src/Player/Sounds/hero_laugh2.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/hero_laugh2.ogg-a275c70549ae553d0e85acd0735c97df.ogg [params] -loop=true +loop=false loop_offset=0 diff --git a/src/Player/Sounds/sword1.ogg.import b/src/Player/Sounds/sword1.ogg.import index 8247945..9d70235 100644 --- a/src/Player/Sounds/sword1.ogg.import +++ b/src/Player/Sounds/sword1.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/sword1.ogg-0cb6c377d883664dabc3ce1f29fb4b4c.oggstr" [params] -loop=true +loop=false loop_offset=0 diff --git a/src/Player/Sounds/sword2.ogg.import b/src/Player/Sounds/sword2.ogg.import index b3ced55..13ebbf9 100644 --- a/src/Player/Sounds/sword2.ogg.import +++ b/src/Player/Sounds/sword2.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/sword2.ogg-86708f3a6db18433346c1c1e70fc794c.oggstr" [params] -loop=true +loop=false loop_offset=0 diff --git a/src/Player/Sounds/sword3.ogg.import b/src/Player/Sounds/sword3.ogg.import index 71be4ef..c7fee23 100644 --- a/src/Player/Sounds/sword3.ogg.import +++ b/src/Player/Sounds/sword3.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/sword3.ogg-aba8e1a09318ce30f077322447a7f724.oggstr" [params] -loop=true +loop=false loop_offset=0 diff --git a/src/Player/Sounds/sword4.ogg.import b/src/Player/Sounds/sword4.ogg.import index 83eeda3..2e99b2a 100644 --- a/src/Player/Sounds/sword4.ogg.import +++ b/src/Player/Sounds/sword4.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/sword4.ogg-e175f4e5f038794fb7d38318b3ba2010.oggstr" [params] -loop=true +loop=false loop_offset=0 diff --git a/src/Player/Sounds/sword5.ogg.import b/src/Player/Sounds/sword5.ogg.import index eaa47dc..e9ecaf6 100644 --- a/src/Player/Sounds/sword5.ogg.import +++ b/src/Player/Sounds/sword5.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/sword5.ogg-53125f0a58e369e0b1241054eff7ca8b.oggstr" [params] -loop=true +loop=false loop_offset=0 diff --git a/src/World.tscn b/src/World.tscn index 920c486..6cfaa31 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=2] +[gd_scene load_steps=24 format=2] [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1] [ext_resource path="res://World.gd" type="Script" id=2] @@ -13,7 +13,6 @@ [ext_resource path="res://Debug/BossStateDisplay.gd" type="Script" id=11] [ext_resource path="res://Maps/Tilesets/Edge/tileset_edge.png" type="Texture" id=12] [ext_resource path="res://Boss/Minion.tscn" type="PackedScene" id=13] -[ext_resource path="res://Objects/Slime/Slime.tscn" type="PackedScene" id=14] [ext_resource path="res://Maps/Grid.tscn" type="PackedScene" id=18] [sub_resource type="ConvexPolygonShape2D" id=1] @@ -348,21 +347,6 @@ anchor_right = 1.0 margin_left = -42.0 margin_bottom = 24.0 text = "Win" - -[node name="Slime" parent="." instance=ExtResource( 14 )] -position = Vector2( 136, 160 ) - -[node name="Slime2" parent="." instance=ExtResource( 14 )] -position = Vector2( 136, 128 ) - -[node name="Slime3" parent="." instance=ExtResource( 14 )] -position = Vector2( 136, 96 ) - -[node name="Slime4" parent="." instance=ExtResource( 14 )] -position = Vector2( 136, 64 ) - -[node name="Slime5" parent="." instance=ExtResource( 14 )] -position = Vector2( 136, 32 ) [connection signal="phase_changed" from="YSort/SlimeBoss" to="CanvasLayer/DebugLabel/BossStateDisplay" method="_on_SlimeBoss_phase_changed"] [connection signal="state_changed" from="YSort/SlimeBoss" to="CanvasLayer/DebugLabel/BossStateDisplay" method="_on_SlimeBoss_state_changed"] [connection signal="pressed" from="CanvasLayer/Win" to="." method="_on_Win_pressed"] diff --git a/src/project.godot b/src/project.godot index 771324b..0caf72f 100644 --- a/src/project.godot +++ b/src/project.godot @@ -97,6 +97,20 @@ texture={ "stream": false, "svg/scale": 1.0 } +ogg_vorbis={ +"loop": false, +"loop_offset": 0 +} +wav={ +"compress/mode": 0, +"edit/loop": false, +"edit/normalize": false, +"edit/trim": false, +"force/8_bit": false, +"force/max_rate": false, +"force/max_rate_hz": 44100, +"force/mono": false +} [input]