Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Ne_Eo
2025-01-17 15:23:44 +01:00
4 changed files with 6 additions and 3 deletions
+1 -1
View File
@@ -31,7 +31,7 @@ class EventsData {
{name: "Time (Steps)", type: TFloat(0.25, 9999, 0.25, 2), defValue: 4},
{name: "Camera", type: TDropDown(['camGame', 'camHUD']), defValue: "camHUD"}
],
"BPM Change" => [{name: "Target BPM", type: TFloat(1), defValue: 100}],
"BPM Change" => [{name: "Target BPM", type: TFloat(1.00, null, 0.001, 3), defValue: 100}],
"Scroll Speed Change" => [
{name: "Tween Speed?", type: TBool, defValue: true},
{name: "New Speed", type: TFloat(0.01, 99, 0.01, 2), defValue: 1.},
+1
View File
@@ -340,6 +340,7 @@ class StrumLine extends FlxTypedGroup<Strum> {
super.destroy();
if(startingPos != null)
startingPos.put();
notes = FlxDestroyUtil.destroy(notes);
}
/**
+1 -1
View File
@@ -12,7 +12,7 @@ class CreditsMain extends TreeMenu {
var items:Array<OptionType> = [];
public override function create() {
bg = new FlxSprite(-80).loadGraphic(Paths.image('menus/menuBGBlue'));
bg = new FlxSprite(-80).loadAnimatedGraphic(Paths.image('menus/menuBGBlue'));
// bg.scrollFactor.set();
bg.scale.set(1.15, 1.15);
bg.updateHitbox();
+3 -1
View File
@@ -32,6 +32,8 @@ class OptionsMenu extends TreeMenu {
}
];
var bg:FlxSprite;
public override function create() {
super.create();
@@ -39,7 +41,7 @@ class OptionsMenu extends TreeMenu {
DiscordUtil.call("onMenuLoaded", ["Options Menu"]);
var bg:FlxSprite = new FlxSprite(-80).loadAnimatedGraphic(Paths.image('menus/menuBGBlue'));
bg = new FlxSprite(-80).loadAnimatedGraphic(Paths.image('menus/menuBGBlue'));
// bg.scrollFactor.set();
bg.scale.set(1.15, 1.15);
bg.updateHitbox();