Skip to content

Commit

Permalink
releasing 1.4.0b soon
Browse files Browse the repository at this point in the history
also im working on a bunch of other stuff rn so progress may be slow
  • Loading branch information
Joalor64GH authored Oct 1, 2023
1 parent b106841 commit 65ba0c0
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion gitVersion.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version":"1.3.5",
"description":"V1.4 Release WIP"
"description":"V1.4.0b Release Soon"
}
7 changes: 6 additions & 1 deletion source/Paths.hx
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,14 @@ class Paths
return getPreloadPath(file);
}

static var currentLevel:String;

inline public static function getPreloadPath(file:String = '')
{
return 'assets/$file';
var path = 'assets/$file';
if (currentLevel != null && Assets.exists('$currentLevel:$path'))
return '$currentLevel:$path';
return path;
}

inline static public function txt(key:String, ?library:String)
Expand Down
6 changes: 4 additions & 2 deletions source/import.hx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// This just contains global imports.
#if !macro
// FLIXEL
import flixel.tweens.FlxTween;
import flixel.tweens.FlxEase;
Expand All @@ -22,7 +23,7 @@ import meta.MusicBeatState;
import meta.MusicBeatSubstate;
import meta.state.PlayState;
import meta.Controls;
#if !macro import Paths; #end
import Paths;

#if MODS_ALLOWED import backend.Mods; #end

Expand All @@ -41,4 +42,5 @@ import sys.FileSystem;
import openfl.utils.Assets as OpenFlAssets;

using StringTools;
using meta.CoolUtil;
using meta.CoolUtil;
#end
2 changes: 1 addition & 1 deletion source/meta/state/MainMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class MainMenuState extends MusicBeatState
{
public static var nightly:String = #if nightly '-nightly' #else '' #end;

public static var joalor64EngineVersion:String = '1.4.0 (UNRELEASED)'; // Used for Discord RPC
public static var joalor64EngineVersion:String = '1.4.0b'; // Used for Discord RPC

public static var psychEngineVersion:String = '0.6.3';
public static var psychGitBuild:String = 'eb79a80';
Expand Down
2 changes: 1 addition & 1 deletion source/meta/state/TitleState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class TitleState extends MusicBeatState
titleText.updateHitbox();
add(titleText);

var versionShit:FlxText = new FlxText(12, FlxG.height - 24, 0, "Joalor64 Engine Rewritten v1.4.0 (PE 0.6.3)", 12);
var versionShit:FlxText = new FlxText(12, FlxG.height - 24, 0, "Joalor64 Engine Rewritten v1.4.0b (PE 0.6.3)", 12);
#if debug versionShit.text += " DEBUG BUILD"; #elseif nightly versionShit.text += " NIGHTLY BUILD"; #end
versionShit.scrollFactor.set();
versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
Expand Down

0 comments on commit 65ba0c0

Please sign in to comment.