diff --git a/Project.xml b/Project.xml index 83d8f0cca..b5be9354c 100644 --- a/Project.xml +++ b/Project.xml @@ -4,8 +4,8 @@ - - + + diff --git a/README.md b/README.md index 2db383978..9002f6dd9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - ### Note: Lore Engine is out of support and will not be updated to parity with Psych Engine v0.7, but feel free to report any current bugs. + ### Note: Lore Engine Legacy is out of support and will not be updated to parity with Psych Engine v0.7, but feel free to report any current bugs.

@@ -6,8 +6,8 @@
-# Friday Night Funkin': Lore Engine -Psych Engine with some neat tweaks. +# Friday Night Funkin': Lore Engine Legacy +Psych Engine v0.6.3 with some neat tweaks. Originally intended for an FNF mod for my Chemistry class, but that never came through. @@ -24,7 +24,6 @@ Extra features include: - Added LUA functions - Custom noteskins per-character - Shadertoy shader support -- More to come! NOTE: If you're running on Linux or Mac, please use the respective native build (or build it yourself) instead of running the game through Wine/GPTK. FNF has quite a few input, stuttering, and minimization issues with both at the moment through Wine/GPTK. diff --git a/engineVersion.txt b/engineVersion.txt index 53a48a1e8..899f24fc7 100644 --- a/engineVersion.txt +++ b/engineVersion.txt @@ -1 +1 @@ -0.8.2 \ No newline at end of file +0.9.0 \ No newline at end of file diff --git a/hmm.json b/hmm.json index 74767015a..5b16f9008 100644 --- a/hmm.json +++ b/hmm.json @@ -13,7 +13,7 @@ { "name": "openfl", "type": "haxelib", - "version": null + "version": "9.2.2" }, { "name": "flixel", @@ -86,14 +86,14 @@ "name": "hscript-lore", "type": "git", "dir": null, - "ref": "master", + "ref": "legacy", "url": "https://github.com/sayofthelor/hscript-lore" }, { "name": "flixel-shadertoy-shader-lr", "type": "git", "dir": null, - "ref": "master", + "ref": "legacy", "url": "https://github.com/sayofthelor/flixel-shadertoy-shader-lr" }, { diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index feec95d83..60edb3025 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -167,7 +167,7 @@ class MainMenuState extends lore.ScriptableState FlxG.camera.follow(camFollowPos, null, 1); - var verText = (ClientPrefs.showLore ? "Lore Engine v" + (loreEngineVersion.endsWith(".0") ? loreEngineVersion.replace(".0", "") + versionSuffix + " \\ " : loreEngineVersion + versionSuffix + " \\ ") : "") + "Friday Night Funkin' v" + Application.current.meta.get('version')#if debug + " (debug)"#end; + var verText = (ClientPrefs.showLore ? "Lore Engine Legacy v" + (loreEngineVersion.endsWith(".0") ? loreEngineVersion.replace(".0", "") + versionSuffix + " \\ " : loreEngineVersion + versionSuffix + " \\ ") : "") + "Friday Night Funkin' v" + Application.current.meta.get('version')#if debug + " (debug)"#end; if (isNotFinal && commitHash != "") verText += ' (not final, commit hash ${commitHash.substr(0, 6)})'; var versionShit:FlxText = new FlxText(12, FlxG.height - 24, 0, verText, 12); versionShit.scrollFactor.set(); diff --git a/source/PlayState.hx b/source/PlayState.hx index 6191235da..a8c612f6d 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -208,7 +208,7 @@ class PlayState extends MusicBeatState var songPercent:Float = 0; private var timeBarBG:AttachedSprite; - public var timeBar:SmoothBar; + public var timeBar:FlxBar; public var marvs:Int = 0; @@ -1143,7 +1143,7 @@ class PlayState extends MusicBeatState timeBarBG.xAdd = -4; timeBarBG.yAdd = -4; - timeBar = new SmoothBar(timeBarBG.x + 4, timeBarBG.y + 4, LEFT_TO_RIGHT, Std.int(timeBarBG.width - 8), Std.int(timeBarBG.height - 8), this, + timeBar = new FlxBar(timeBarBG.x + 4, timeBarBG.y + 4, LEFT_TO_RIGHT, Std.int(timeBarBG.width - 8), Std.int(timeBarBG.height - 8), this, 'songPercent', 0, 1); timeBar.scrollFactor.set(); timeBar.createFilledBar(0xFF000000, 0xFFFFFFFF);