1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-29 08:16:58 +00:00

Merge pull request #7 from ninjamuffin99/geo_animate

tiny changes so I can work on FlxAnimate
This commit is contained in:
Cameron Taylor 2021-09-11 09:36:46 -04:00 committed by GitHub
commit 9b94a00610
4 changed files with 4 additions and 7 deletions

View file

@ -127,7 +127,7 @@
<haxelib name="flixel-ui" />
<!--haxelib name="newgrounds" unless="switch"/> -->
<haxelib name="faxe" if='switch'/>
<haxelib name="polymod"/>
<haxelib name="polymod" if="cpp"/>
<!-- <haxelib name="colyseus"/> -->
<!-- <haxelib name="colyseus-websocket" /> -->

View file

@ -2,7 +2,6 @@ package animate;
import haxe.format.JsonParser;
import openfl.Assets;
import sys.io.File;
/**
* Generally designed / written in a way that can be easily taken out of FNF and used elsewhere

View file

@ -3,10 +3,8 @@ package ui;
import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.text.FlxText;
import flixel.util.FlxColor;
#if cpp
import polymod.Polymod;
import sys.FileSystem;
#end
class ModMenu extends ui.OptionsState.Page
{

View file

@ -32,7 +32,7 @@ class OptionsState extends MusicBeatState
var controls = addPage(Controls, new ControlsMenu());
// var colors = addPage(Colors, new ColorsMenu());
#if cpp
#if polymod
var mods = addPage(Mods, new ModMenu());
#end
@ -43,7 +43,7 @@ class OptionsState extends MusicBeatState
// colors.onExit.add(switchPage.bind(Options));
preferences.onExit.add(switchPage.bind(Options));
#if cpp
#if polymod
mods.onExit.add(switchPage.bind(Options));
#end
}
@ -179,7 +179,7 @@ class OptionsMenu extends Page
createItem('preferences', function() switchPage(Preferences));
createItem("controls", function() switchPage(Controls));
// createItem('colors', function() switchPage(Colors));
#if cpp
#if polymod
createItem('mods', function() switchPage(Mods));
#end