diff --git a/assets/bgm.ogg b/assets/bgm.ogg index 9deeb35..df878cd 100644 Binary files a/assets/bgm.ogg and b/assets/bgm.ogg differ diff --git a/assets/bgm.wav b/assets/bgm.wav new file mode 100644 index 0000000..57e32c1 Binary files /dev/null and b/assets/bgm.wav differ diff --git a/assets/bgm.wav.import b/assets/bgm.wav.import new file mode 100644 index 0000000..4a023f7 --- /dev/null +++ b/assets/bgm.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://cdvvsv0q3vxbh" +path="res://.godot/imported/bgm.wav-986847edff92f29ec805368a841d2666.sample" + +[deps] + +source_file="res://assets/bgm.wav" +dest_files=["res://.godot/imported/bgm.wav-986847edff92f29ec805368a841d2666.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/entities/Intro.tscn b/entities/Intro.tscn index b6ddd85..5661519 100644 --- a/entities/Intro.tscn +++ b/entities/Intro.tscn @@ -168,3 +168,4 @@ theme_override_font_sizes/normal_font_size = 24 bbcode_enabled = true text = "[code]HELLO[/code] " +scroll_active = false diff --git a/entities/credits.tscn b/entities/credits.tscn index dc30fb6..9265366 100644 --- a/entities/credits.tscn +++ b/entities/credits.tscn @@ -506,6 +506,8 @@ theme_override_font_sizes/normal_font_size = 176 theme_override_font_sizes/bold_font_size = 176 bbcode_enabled = true text = "[wave amp=50.0 freq=5.0 connected=1]XTRA[wave]" +fit_content = true +scroll_active = false [node name="Wipe" type="ColorRect" parent="XTRA"] layout_mode = 1 @@ -566,6 +568,8 @@ theme_override_font_sizes/normal_font_size = 176 theme_override_font_sizes/bold_font_size = 176 bbcode_enabled = true text = "[wave amp=50.0 freq=5.0 connected=1]GorkaMorka[wave]" +fit_content = true +scroll_active = false [node name="Wipe" type="ColorRect" parent="GorkaMorka"] layout_mode = 1 @@ -626,6 +630,8 @@ theme_override_font_sizes/normal_font_size = 176 theme_override_font_sizes/bold_font_size = 176 bbcode_enabled = true text = "[wave amp=50.0 freq=5.0 connected=1]AUGI[wave]" +fit_content = true +scroll_active = false [node name="Wipe" type="ColorRect" parent="Augi"] layout_mode = 1 @@ -701,8 +707,6 @@ layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 -offset_top = 788.0 -offset_bottom = 788.0 grow_horizontal = 2 grow_vertical = 2 color = Color(0, 0, 0, 1) diff --git a/export_presets.cfg b/export_presets.cfg index 8841210..e72b6bb 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -49,7 +49,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="output/v0.0.1/win/demo.exe" +export_path="output/scroll-fix-test/demo.exe" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false diff --git a/scripts/credits.gd b/scripts/credits.gd index f3fc412..9856bba 100644 --- a/scripts/credits.gd +++ b/scripts/credits.gd @@ -23,6 +23,7 @@ func _ready() -> void: $Augi.visible = false; $Godot.visible = false; + XTRA_name_timer.start(); $AnimationPlayer.play("xtra_wipe");