Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ same goes for *Lua Scripts*, comment out or delete the line with `LUA_ALLOWED`,
* Hackx2 - Automated VersionShit
* not-weuz - haha i took his winning icon support coding
* dombomb64 - Multi-Sheet Characters
* Burgerballs - Accurate Playback Rate Speed Song Length
_____________________________________

# Features
Expand Down
Binary file modified art/icon16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified art/icon32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified art/icon64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified art/iconOG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added art/iconOGandroid.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/preload/images/menumod/Splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/preload/images/menumod/menuBG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/preload/music/bro.ogg.sfk
Binary file not shown.
2 changes: 1 addition & 1 deletion source/MainMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ class MainMenuState extends MusicBeatState
}


var versionShit:FlxText = new FlxText(12, FlxG.height - 84, 0, "FNF: The Grand Red Destruction v6.3.2", 12);
var versionShit:FlxText = new FlxText(12, FlxG.height - 84, 0, "FNF: The Grand Red Destruction v6.3.3", 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/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -3080,7 +3080,7 @@ class PlayState extends MusicBeatState
var songCalc:Float = (songLength - curTime);
if(ClientPrefs.timeBarType == 'Time Elapsed') songCalc = curTime;

var secondsTotal:Int = Math.floor(songCalc / 1000);
var secondsTotal:Int = Math.floor((songCalc/playbackRate) / 1000);
if(secondsTotal < 0) secondsTotal = 0;

if(ClientPrefs.timeBarType != 'Song Name')
Expand Down
2 changes: 1 addition & 1 deletion source/StoryMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ class StoryMenuState extends MusicBeatState
lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, CoolUtil.boundTo(elapsed * 30, 0, 1)));
if(Math.abs(intendedScore - lerpScore) < 10) lerpScore = intendedScore;

scoreText.text = "WEEK SCORE:" + lerpScore;
scoreText.text = "LEVEL SCORE:" + lerpScore;

// FlxG.watch.addQuick('font', scoreText.font);

Expand Down
4 changes: 0 additions & 4 deletions source/TitleState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -650,11 +650,7 @@ class TitleState extends MusicBeatState
// credTextShit.text = 'In association \nwith';
// credTextShit.screenCenter();
case 6:
#if PSYCH_WATERMARKS
createCoolText(['Mod', 'made by'], -40);
#else
createCoolText(['Mod', 'made by'], -40);
#end
case 8:
addMoreText('TheUnknownKoala4545', -40);
// credTextShit.text += '\nNewgrounds';
Expand Down
Loading