General editor bugfixes & QOL updates

graphics/icons/autoangles.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b7xk8p6rfcm3r"
+path="res://.godot/imported/autoangles.svg-4f938c9fbf9b3b3b67c37939d085293e.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://graphics/icons/autoangles.svg"
+dest_files=["res://.godot/imported/autoangles.svg-4f938c9fbf9b3b3b67c37939d085293e.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=20.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

graphics/icons/reverse-arrange.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ruj0nqhq6wf5"
+path="res://.godot/imported/reverse-arrange.svg-1edab6754c9408412d0b073d3a56d1cd.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://graphics/icons/reverse-arrange.svg"
+dest_files=["res://.godot/imported/reverse-arrange.svg-1edab6754c9408412d0b073d3a56d1cd.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=20.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

menus/song_list/SongList.gd

@@ -143,15 +143,14 @@ func _on_menu_enter(force_hard_transition=false, args = {}):
 	MouseTrap.ppd_dialog.connect("youtube_url_selected", Callable(self, "_on_youtube_url_selected"))
 	MouseTrap.ppd_dialog.connect("file_selected", Callable(self, "_on_ppd_audio_file_selected"))
 	MouseTrap.ppd_dialog.connect("file_selector_hidden", Callable(song_container, "grab_focus").bind(), CONNECT_DEFERRED)
-	MouseTrap.ppd_dialog.connect("visibility_changed", self._on_ppd_dialog_visiblity_changed, CONNECT_DEFERRED)
-#	song_container.hard_arrange_all()
-	#sort_button_texture_rect.texture = IconPackLoader.get_graphic("UP", "note")
-	#fav_button_texture_rect.texture = IconPackLoader.get_graphic("LEFT", "note")
+	if not MouseTrap.ppd_dialog.is_connected("visibility_changed", self._on_ppd_dialog_visibility_changed):
+		MouseTrap.ppd_dialog.connect("visibility_changed", self._on_ppd_dialog_visibility_changed, CONNECT_DEFERRED)
+
 	if "force_url_request" in args:
 		_on_PPDAudioBrowseWindow_accept()
 	song_container.grab_focus()
 
-func _on_ppd_dialog_visiblity_changed():
+func _on_ppd_dialog_visibility_changed():
 	if MouseTrap.ppd_dialog.visible:
 		song_container.grab_focus()
 
@@ -186,7 +185,6 @@ func _on_menu_exit(force_hard_transition = false):
 	MouseTrap.ppd_dialog.disconnect("youtube_url_selected", Callable(self, "_on_youtube_url_selected"))
 	MouseTrap.ppd_dialog.disconnect("file_selected", Callable(self, "_on_ppd_audio_file_selected"))
 	MouseTrap.ppd_dialog.disconnect("file_selector_hidden", Callable(song_container, "grab_focus"))
-	MouseTrap.ppd_dialog.disconnect("popup_hide", Callable(song_container, "grab_focus"))
 	if PlatformService.service_provider.implements_ugc:
 		PlatformService.service_provider.ugc_provider.disconnect("ugc_song_meta_updated", Callable(self, "_on_ugc_song_meta_updated"))
 	HBGame.rich_presence.notify_at_main_menu()

rythm_game/game_modes/RhythmGameBase.gd

@@ -620,7 +620,7 @@ func _process_game(_delta):
 
 func get_latency_compensation_msec() -> int:
 	var latency_compensation = UserSettings.user_settings.lag_compensation
-	if current_song.id in UserSettings.user_settings.per_song_settings:
+	if current_song.id in UserSettings.user_settings.per_song_settings and game_mode == GAME_MODE.NORMAL:
 		latency_compensation += UserSettings.user_settings.per_song_settings[current_song.id].lag_compensation
 	return latency_compensation
 

scripts/HBUserSettings.gd

@@ -287,6 +287,7 @@ func _init():
 		"lag_compensation", 
 		"resource_pack", "romanized_titles_enabled", "show_latency", "enable_voice_fade",
 		"ui_skin",
+		"timing_method",
 		"note_size", "input_map", "input_map_version",
 		"fps_limit", "display_mode", "display", "desired_video_fps", "ytdlp_custom_command_line", "desired_video_resolution", "disable_video",
 		"disable_ppd_video", "use_visualizer_with_video", "sort_filter_settings", "last_selected_difficulty", "leading_trail_enabled",

scripts/timing_points/HBTimingPoint.gd

@@ -3,6 +3,7 @@ extends HBSerializable
 class_name HBTimingPoint
 
 var time: int
+var meta := {}
 
 var _class_name: String = "HBTimingPoint" # Workaround for godot#4708
 var _inheritance: Array = [] # HACK: ClassDB.get_parent_class() is retarded
@@ -13,7 +14,7 @@ func get_log_name():
 	return get_serialized_type()
 
 func _init():
-	serializable_fields += ["time"]
+	serializable_fields += ["time", "meta"]
 
 func get_serialized_type():
 	return "TimingPoint"

tools/editor/EditorPlayback.gd

@@ -29,24 +29,6 @@ func _init(_game: HBRhythmGame):
 	self.game = _game
 
 func _process(delta):
-	var time = 0.0
-	if is_playing() and false:
-		time = (Time.get_ticks_usec() - time_begin) / 1000000.0
-		time *= playback_speed
-		# Compensate for latency.
-		time -= time_delay
-		time -= UserSettings.user_settings.lag_compensation / 1000.0
-		# May be below 0 (did not being yet).
-		time = max(0, time)
-
-		time = time + _audio_play_offset
-
-		var variant_offset = 0
-		if current_song:
-			variant_offset = current_song.get_variant_offset(selected_variant) / 1000.0
-		time += variant_offset
-		game.time_msec = time * 1000.0
-
 	if is_playing() and game.audio_playback.is_playing():
 		emit_signal("time_changed", game.time_msec / 1000.0)
 
@@ -56,6 +38,7 @@ func get_song_volume():
 func set_song(song: HBSong, difficulty: String, assets: SongAssetLoader.AssetLoadToken, variant=-1):
 	current_song = song
 	selected_variant = variant
+	game.current_variant = variant
 	game.audio_playback = null
 	game.voice_audio_playback = null
 

tools/editor/controls/HBEditorCodeEdit.gd

@@ -843,6 +843,10 @@ func _init():
 		file.store_string(FONT_LICENSE)
 
 func _ready():
+	# Setup editing options.
+	self.indent_automatic = true
+	self.gutters_draw_line_numbers = true
+
 	# Setup syntax highlighting.
 	syntax_highlighter = CodeHighlighter.new()
 

tools/editor/editor_modules/ArrangeModule.gd

@@ -186,25 +186,25 @@ func update_shortcuts():
 	var arrange_ev = arrange_event_list[0] if arrange_event_list else null
 
 	if arrange_ev:
-		$MarginContainer/ScrollContainer/VBoxContainer/HBoxContainer/VBoxContainer/Label.show()
-		$MarginContainer/ScrollContainer/VBoxContainer/HBoxContainer/VBoxContainer/Label.text = \
+		$%QuickPlacingLabel.show()
+		$%QuickPlacingLabel.text = \
 			"Hold " + get_event_text(arrange_ev) + " for quick placing."
-		$MarginContainer/ScrollContainer/VBoxContainer/HBoxContainer/VBoxContainer/Label.tooltip_text = \
+		$%QuickPlacingLabel.tooltip_text = \
 			"The arrange wheel helps you place notes quickly.\n" + \
 			"Hold Shift for reverse arranging.\n" + \
 			"Hold Control to toggle automatic angles.\n" + \
 			"Shortcut: " + get_event_text(arrange_ev)
 	else:
-		$MarginContainer/ScrollContainer/VBoxContainer/HBoxContainer/VBoxContainer/Label.hide()
+		$%QuickPlacingLabel.hide()
 
 	var size_up_event_list = InputMap.action_get_events("editor_circle_size_bigger")
 	var size_down_event_list = InputMap.action_get_events("editor_circle_size_smaller")
 	var size_up_ev = size_up_event_list[0] if size_up_event_list else null
 	var size_down_ev = size_down_event_list[0] if size_down_event_list else null
 
-	$MarginContainer/ScrollContainer/VBoxContainer/HBoxContainer2.tooltip_text = "Amount of 8th notes required for \na full revolution."
-	$MarginContainer/ScrollContainer/VBoxContainer/HBoxContainer2.tooltip_text += "\nShortcut (increase): " + get_event_text(size_up_ev)
-	$MarginContainer/ScrollContainer/VBoxContainer/HBoxContainer2.tooltip_text += "\nShortcut (decrease): " + get_event_text(size_down_ev)
+	$%CircleSizeHBoxContainer.tooltip_text = "Amount of 8th notes required for \na full revolution."
+	$%CircleSizeHBoxContainer.tooltip_text += "\nShortcut (increase): " + get_event_text(size_up_ev)
+	$%CircleSizeHBoxContainer.tooltip_text += "\nShortcut (decrease): " + get_event_text(size_down_ev)
 
 func apply_transform(id: int):
 	hide_transform()