Skip to content

Commit

Permalink
v0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
sayofthelor committed Jul 4, 2024
1 parent 5d3a119 commit 7f7cbc1
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<!-- _________________________ Application Settings _________________________ -->

<app file="Lore" packageName="us.sayofthelor.LoreEngine" package="us.sayofthelor.LoreEngine" main="Main" version="0.2.8" company="sayofthelor" />
<app title="Friday Night Funkin': Lore Engine" unless="debug" />
<app title="Friday Night Funkin': Lore Engine (debug)" if="debug" />
<app title="Friday Night Funkin': Lore Engine Legacy" unless="debug" />
<app title="Friday Night Funkin': Lore Engine Legacy (debug)" if="debug" />

<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
### 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.
<div align="center">
<img src="https://user-images.githubusercontent.com/35895538/184577297-98b08bcc-3144-45a7-b33f-64a11dc3c652.png" width="40%" height="40%"/>
<br />
<br />
<img src="https://img.shields.io/github/actions/workflow/status/sayofthelor/lore-engine/main.yml?style=for-the-badge" /> <img src="https://img.shields.io/github/v/release/sayofthelor/lore-engine?style=for-the-badge" /> <img src="https://img.shields.io/github/license/sayofthelor/lore-engine?style=for-the-badge" /> <img src="https://img.shields.io/github/forks/sayofthelor/lore-engine?style=for-the-badge" />
</div>

# 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.

Expand All @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion engineVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.2
0.9.0
6 changes: 3 additions & 3 deletions hmm.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{
"name": "openfl",
"type": "haxelib",
"version": null
"version": "9.2.2"
},
{
"name": "flixel",
Expand Down Expand Up @@ -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"
},
{
Expand Down
2 changes: 1 addition & 1 deletion source/MainMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 7f7cbc1

Please sign in to comment.