Skip to content

Commit

Permalink
giving out
Browse files Browse the repository at this point in the history
working loading screen (with tips!)
new time text type
i cant get the icon bop in freeplay menu working...
charting text and version text in play state
  • Loading branch information
charlesisfeline committed Nov 15, 2023
1 parent 7a15352 commit d400144
Show file tree
Hide file tree
Showing 31 changed files with 221 additions and 294 deletions.
2 changes: 1 addition & 1 deletion Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<define name="LUA_ALLOWED" if="desktop || android" />
<define name="CRASH_HANDLER" if="desktop" />
<define name="ACHIEVEMENTS_ALLOWED" />
<!--<define name="LOADING_SCREEN" />--> <!-- i'll fix later-->
<define name="LOADING_SCREEN" /> <!-- i'll fix later-->
<define name="VIDEOS_ALLOWED" if="windows || linux || android" unless="32bits"/> <!-- wait why is there some hints of an official android port wtf -->
<define name="PSYCH_WATERMARKS"/> <!-- DELETE THIS TO REMOVE WATERMARKS/DEV NAMES ON TITLE SCREEN -->
<define name="TITLE_SCREEN_EASTER_EGG"/> <!-- DELETE THE if="officialBuild" for enabling this on an unofficial build -->
Expand Down
Binary file added assets/shared/images/early.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/shared/images/funkay.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/shared/images/icons/icon-bf-pixel.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/shared/images/icons/icon-dad.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/shared/images/icons/icon-face.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/shared/images/icons/icon-monster.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/shared/images/icons/icon-senpai-pixel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 assets/shared/images/icons/icon-winningtemplate.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 assets/shared/images/late.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 assets/shared/images/loadBG_Main.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 assets/shared/images/mainmenu/menu_play.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions assets/shared/images/mainmenu/menu_play.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="menu_play.png">
<!-- Created with Adobe Flash CS6 version 12.0.0.481 -->
<!-- http://www.adobe.com/products/flash.html -->
<SubTexture name="play basic0000" x="0" y="0" width="224" height="120"/>
<SubTexture name="play basic0001" x="0" y="0" width="224" height="120"/>
<SubTexture name="play basic0002" x="0" y="0" width="224" height="120"/>
<SubTexture name="play basic0003" x="234" y="0" width="224" height="120"/>
<SubTexture name="play basic0004" x="234" y="0" width="224" height="120"/>
<SubTexture name="play basic0005" x="234" y="0" width="224" height="120"/>
<SubTexture name="play basic0006" x="0" y="130" width="224" height="120"/>
<SubTexture name="play basic0007" x="0" y="130" width="224" height="120"/>
<SubTexture name="play basic0008" x="0" y="130" width="224" height="120"/>
<SubTexture name="play white0000" x="0" y="260" width="321" height="164" frameX="0" frameY="0" frameWidth="329" frameHeight="169"/>
<SubTexture name="play white0001" x="0" y="434" width="324" height="165" frameX="-5" frameY="-1" frameWidth="329" frameHeight="169"/>
<SubTexture name="play white0002" x="0" y="609" width="325" height="168" frameX="-2" frameY="-1" frameWidth="329" frameHeight="169"/>
</TextureAtlas>
Binary file added assets/shared/images/psych_logo.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 assets/shared/images/stageborder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 0 additions & 13 deletions example_mods/foxa/scripts/FCTEXT.lua

This file was deleted.

237 changes: 0 additions & 237 deletions example_mods/foxa/scripts/Simplelize Hud + Feature.lua

This file was deleted.

8 changes: 0 additions & 8 deletions example_mods/foxa/scripts/score_bar_recreation.lua
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
scoreName = "Score"
missesName = "Misses"
ratingNames = "Rating"
function onCreate()
makeLuaText('cornerMark', ('FNF Vs. Foxa 3.0'), 1275, 0, 5)
setTextAlignment('cornerMark', 'RIGHT')
setTextSize('cornerMark', 18)
if not getPropertyFromClass('backend.ClientPrefs', 'data.hideHud') then
addLuaText('cornerMark')
end
end
function onUpdate()
if not getProperty('ratingName') == '?' then
setProperty('scoreTxt.text', scoreName .. ': ' .. getProperty('songScore') .. ' // ' .. missesName .. ': ' .. getProperty('songMisses') .. ' // Accuracy: ' .. floorInDecimal(rating*100, 2) .. ' // ' .. ratingNames .. ': ' .. getProperty('ratingName') .. ' (' .. round(getProperty('ratingPercent') * 100, 2) .. '%) - ' .. getProperty('ratingFC'))
Expand Down
3 changes: 1 addition & 2 deletions source/Main.hx
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,7 @@ class Main extends Sprite
"Skibidy bah mmm dada *explodes* - ShadowMario",
"What have you done, you killed it! - BeastlyGhost",
"Have you checked if the variable exists? - BeastlyGhost",
"Have you even read the wiki before trying that? - BeastlyGhost",
"Huh, did I forget something? - Yoshubs (?)"
"Have you even read the wiki before trying that? - BeastlyGhost"
];

// Code was entirely made by sqirra-rng for their fnf engine named "Izzy Engine", big props to them!!!
Expand Down
4 changes: 4 additions & 0 deletions source/backend/CoolUtil.hx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ class CoolUtil
inline public static function capitalize(text:String)
return text.charAt(0).toUpperCase() + text.substr(1).toLowerCase();

inline public static function boundTo(value:Float, min:Float, max:Float):Float {
return Math.max(min, Math.min(max, value));
}

inline public static function coolTextFile(path:String):Array<String>
{
var daList:String = null;
Expand Down
2 changes: 1 addition & 1 deletion source/backend/MusicBeatState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class MusicBeatState extends FlxUIState
}

if(FlxG.save.data != null) FlxG.save.data.fullscreen = FlxG.fullscreen;

stagesFunc(function(stage:BaseStage) {
stage.update(elapsed);
});
Expand Down
Loading

0 comments on commit d400144

Please sign in to comment.