cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 11:22:55 +00:00
Code Issues Releases Wiki Activity

merge conflict fixins

Browse source
This commit is contained in:
Cameron Taylor 2024-08-29 15:26:35 -04:00
parent 825327e1c8
commit 737a679196
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 8558bc906ecd48ba5d7b1c213982f15b5d033227 Subproject commit b7f132a4e6c528c2d55831f88a11781df0149fd5

2
source/Main.hx
View file

@ -26,7 +26,7 @@ class Main extends Sprite
var framerate:Int = 60; // How many frames per second the game should run at. var framerate:Int = 60; // How many frames per second the game should run at.
#else #else
// TODO: This should probably be in the options menu? // TODO: This should probably be in the options menu?
var framerate:Int = 60; // How many frames per second the game should run at. var framerate:Int = 144; // How many frames per second the game should run at.
#end #end
var skipSplash:Bool = true; // Whether to skip the flixel splash screen that appears in release mode. var skipSplash:Bool = true; // Whether to skip the flixel splash screen that appears in release mode.
var startFullscreen:Bool = false; // Whether to start the game in fullscreen on desktop targets var startFullscreen:Bool = false; // Whether to start the game in fullscreen on desktop targets

3
source/funkin/ui/charSelect/CharSelectGF.hx
View file

@ -22,7 +22,6 @@ class CharSelectGF extends FlxAtlasSprite
var intendedYPos:Float = 0; var intendedYPos:Float = 0;
var intendedAlpha:Float = 0; var intendedAlpha:Float = 0;
var list:Array<String> = []; var list:Array<String> = [];
var char:String = "gf";
var analyzer:SpectralAnalyzer; var analyzer:SpectralAnalyzer;
@ -76,7 +75,7 @@ class CharSelectGF extends FlxAtlasSprite
function drawFFT() function drawFFT()
{ {
if (char == "nene") if (curGF == NENE)
{ {
var levels = analyzer.getLevels(); var levels = analyzer.getLevels();
var frame = anim.curSymbol.timeline.get("VIZ_bars").get(anim.curFrame); var frame = anim.curSymbol.timeline.get("VIZ_bars").get(anim.curFrame);

2
source/funkin/ui/charSelect/CharSelectSubState.hx
View file

@ -309,7 +309,7 @@ class CharSelectSubState extends MusicBeatSubState
var grpXSpread(default, set):Float = 107; var grpXSpread(default, set):Float = 107;
var grpYSpread(default, set):Float = 127; var grpYSpread(default, set):Float = 127;
function initLocks() function initLocks():Void
{ {
grpIcons = new FlxSpriteGroup(); grpIcons = new FlxSpriteGroup();
add(grpIcons); add(grpIcons);