Skip to content

Commit

Permalink
back official
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesisfeline committed Nov 11, 2023
1 parent 29db345 commit d9855f5
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<project>
<!-- _________________________ Application Settings _________________________ -->

<app title="Friday Night Funkin': Vs. Foxa Ultimate" file="VsFoxaUltimate" packageName="com.shadowmario.psychengine" package="com.shadowmario.psychengine" main="Main" version="0.2.8" company="ShadowMario" />
<app title="Friday Night Funkin': Vs. Foxa" file="VsFoxa" packageName="com.shadowmario.psychengine" package="com.shadowmario.psychengine" main="Main" version="0.2.8" company="ShadowMario" />

<!-- NOTE TO SELF: DISABLE THIS IF ISSUES ARE FOUND -->
<haxedef name="LINC_LUA_RELATIVE_DYNAMIC_LIB"/> <!-- stable luas PUT AFTER FIRST LINE WITH APP NAME AND ETC -->
<!-- NOTE TO SELF: DISABLE THIS IF ISSUES ARE FOUND, theres no issues :) -->
<haxedef name="LINC_LUA_RELATIVE_DYNAMIC_LIB"/> <!-- stable lua -->

<app preloader="flixel.system.FlxPreloader" />
<set name="SWF_VERSION" value="11.8" />
<set name="SWF_VERSION" value="11.8" /> <!-- but this isnt flash :/-->

<!-- ______________________ PSYCH ENGINE CUSTOMIZATION ______________________ -->

Expand Down
2 changes: 1 addition & 1 deletion example_mods/foxa/scripts/score_bar_recreation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ scoreName = "Score"
missesName = "Misses"
ratingNames = "Rating"
function onCreate()
makeLuaText('cornerMark', ('FNF Vs. Foxa Ultimate'), 1275, 0, 5)
makeLuaText('cornerMark', ('FNF Vs. Foxa 3.0'), 1275, 0, 5)
setTextAlignment('cornerMark', 'RIGHT')
setTextSize('cornerMark', 18)
if not getPropertyFromClass('backend.ClientPrefs', 'data.hideHud') then
Expand Down
4 changes: 2 additions & 2 deletions source/openfl/display/FPS.hx
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ class FPS extends TextField
text += '\nMemory: ${flixel.util.FlxStringUtil.formatBytes(memoryMegas)}';
#end

text += '\nPsych Engine 0.7.2';
text += '\nFNF Vs. Foxa Ultimate Edition 3.0';
text += '\nPsych Engine 0.7.2 Custom Build';
text += '\nFNF Vs. Foxa 3.0';

textColor = 0xFFFFFFFF;
if (currentFPS <= ClientPrefs.data.framerate / 2)
Expand Down
2 changes: 1 addition & 1 deletion source/states/CreditsState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class CreditsState extends MusicBeatState
['shubs', 'face', 'Ex-Programmer of Psych Engine\nI don\'t support them.', '', 'A1A1A1'],
[''],
['Engine Contributors'],
['CrowPlexus', 'gabriela', 'Input System v3, Major Help and Other PRs\nTO DO: Add Icon', 'https://twitter.com/crowplexus', 'A1A1A1'],
['CrowPlexus', 'gabriela', 'Input System v3, Major Help and Other PRs', 'https://twitter.com/crowplexus', 'A1A1A1'],
['Keoiki', 'keoiki', 'Note Splash Animations and Latin Alphabet', 'https://twitter.com/Keoiki_', 'D2D2D2'],
['SqirraRNG', 'sqirra', 'Crash Handler and Base code for\nChart Editor\'s Waveform', 'https://twitter.com/gedehari', 'E1843A'],
['EliteMasterEric', 'mastereric', 'Runtime Shaders support', 'https://twitter.com/EliteMasterEric', 'FFBD40'],
Expand Down
4 changes: 2 additions & 2 deletions source/states/MainMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import options.OptionsState;

class MainMenuState extends MusicBeatState
{
public static var psychEngineVersion:String = '0.7.2'; //This is also used for Discord RPC
public static var psychEngineVersion:String = '0.7.2-foxa'; //This is also used for Discord RPC
public static var curSelected:Int = 0;

var menuItems:FlxTypedGroup<FlxSprite>;
Expand Down Expand Up @@ -139,7 +139,7 @@ class MainMenuState extends MusicBeatState
versionShit.scrollFactor.set();
versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
add(versionShit);
var versionShit:FlxText = new FlxText(12, FlxG.height - 64, 0, "Vs. Foxa Ultimate v3.0", 12);
var versionShit:FlxText = new FlxText(12, FlxG.height - 64, 0, "Vs. Foxa v3.0", 12);
versionShit.scrollFactor.set();
versionShit.setFormat("VCR OSD Mono", 16, FlxColor.WHITE, LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
add(versionShit);
Expand Down
2 changes: 1 addition & 1 deletion source/states/editors/CharacterEditorState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class CharacterEditorState extends MusicBeatState

var cameraFollowPointer:FlxSprite;
var healthBar:Bar;
//the begining mouse location that all drag movements are in reference of
//the beginning mouse location that all drag movements are in reference of
private var mouseLocation:FlxPoint;

override function create()
Expand Down

0 comments on commit d9855f5

Please sign in to comment.