Merge branch 'main' into new-editors

This commit is contained in:
⍚~Nex
2024-09-20 14:40:25 +02:00
23 changed files with 201 additions and 78 deletions
+1 -1
View File
@@ -64,7 +64,7 @@ class HScript extends Script {
}
private function importFailedCallback(cl:Array<String>):Bool {
if(_importFailedCallback(cl, "") || _importFailedCallback(cl, "source/")) {
if(_importFailedCallback(cl, "source/") || _importFailedCallback(cl, "")) {
return true;
}
return false;
+1 -1
View File
@@ -283,7 +283,7 @@ class Script extends FlxBasic implements IFlxDestroyable {
public function get(variable:String):Dynamic {return null;}
/**
* Gets the variable `variable` from the script's variables.
* Sets the variable `variable` from the script's variables.
* @param variable Name of the variable.
* @return Variable (or null if it doesn't exists)
*/
@@ -0,0 +1,23 @@
package funkin.backend.scripting.events;
import funkin.game.SplashGroup;
import funkin.game.Strum;
final class SplashShowEvent extends CancellableEvent {
/**
Splash name/type
**/
public var splashName:String;
/**
Splash that is shown
**/
public var splash:FunkinSprite;
/**
Strum that the splash is shown on
**/
public var strum:Strum;
/**
Splash group that the splash is from
**/
public var group:SplashGroup;
}