mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-11-01 04:14:47 +00:00
bullshit for working mac build? lol
This commit is contained in:
parent
4518cbfbbc
commit
3d20c2fd12
|
@ -126,7 +126,7 @@
|
||||||
<haxelib name="faxe" if='switch'/>
|
<haxelib name="faxe" if='switch'/>
|
||||||
<haxelib name="polymod"/>
|
<haxelib name="polymod"/>
|
||||||
<haxelib name="hxcpp-debug-server" if="desktop debug"/>
|
<haxelib name="hxcpp-debug-server" if="desktop debug"/>
|
||||||
<haxelib name="discord_rpc" if="cpp"/> <!-- foesn't work with neko -->
|
<!--<haxelib name="discord_rpc" if="cpp"/> --> <!-- foesn't work with neko -->
|
||||||
<!-- <haxelib name="hxcpp-debug-server" if="desktop"/> -->
|
<!-- <haxelib name="hxcpp-debug-server" if="desktop"/> -->
|
||||||
|
|
||||||
<!-- <haxelib name="markdown" /> -->
|
<!-- <haxelib name="markdown" /> -->
|
||||||
|
|
|
@ -1,12 +1,16 @@
|
||||||
package;
|
package;
|
||||||
|
|
||||||
import Sys.sleep;
|
import Sys.sleep;
|
||||||
import discord_rpc.DiscordRpc;
|
|
||||||
|
|
||||||
using StringTools;
|
using StringTools;
|
||||||
|
|
||||||
|
#if discord_rpc
|
||||||
|
import discord_rpc.DiscordRpc;
|
||||||
|
#end
|
||||||
|
|
||||||
class DiscordClient
|
class DiscordClient
|
||||||
{
|
{
|
||||||
|
#if discord_rpc
|
||||||
public function new()
|
public function new()
|
||||||
{
|
{
|
||||||
trace("Discord Client starting...");
|
trace("Discord Client starting...");
|
||||||
|
@ -22,7 +26,7 @@ class DiscordClient
|
||||||
{
|
{
|
||||||
DiscordRpc.process();
|
DiscordRpc.process();
|
||||||
sleep(2);
|
sleep(2);
|
||||||
//trace("Discord Client Update");
|
// trace("Discord Client Update");
|
||||||
}
|
}
|
||||||
|
|
||||||
DiscordRpc.shutdown();
|
DiscordRpc.shutdown();
|
||||||
|
@ -57,9 +61,9 @@ class DiscordClient
|
||||||
trace("Discord Client initialized");
|
trace("Discord Client initialized");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function changePresence(details:String, state:Null<String>, ?smallImageKey : String, ?hasStartTimestamp : Bool, ?endTimestamp: Float)
|
public static function changePresence(details:String, state:Null<String>, ?smallImageKey:String, ?hasStartTimestamp:Bool, ?endTimestamp:Float)
|
||||||
{
|
{
|
||||||
var startTimestamp:Float = if(hasStartTimestamp) Date.now().getTime() else 0;
|
var startTimestamp:Float = if (hasStartTimestamp) Date.now().getTime() else 0;
|
||||||
|
|
||||||
if (endTimestamp > 0)
|
if (endTimestamp > 0)
|
||||||
{
|
{
|
||||||
|
@ -71,12 +75,13 @@ class DiscordClient
|
||||||
state: state,
|
state: state,
|
||||||
largeImageKey: 'icon',
|
largeImageKey: 'icon',
|
||||||
largeImageText: "Friday Night Funkin'",
|
largeImageText: "Friday Night Funkin'",
|
||||||
smallImageKey : smallImageKey,
|
smallImageKey: smallImageKey,
|
||||||
// Obtained times are in milliseconds so they are divided so Discord can use it
|
// Obtained times are in milliseconds so they are divided so Discord can use it
|
||||||
startTimestamp : Std.int(startTimestamp / 1000),
|
startTimestamp: Std.int(startTimestamp / 1000),
|
||||||
endTimestamp : Std.int(endTimestamp / 1000)
|
endTimestamp: Std.int(endTimestamp / 1000)
|
||||||
});
|
});
|
||||||
|
|
||||||
//trace('Discord RPC Updated. Arguments: $details, $state, $smallImageKey, $hasStartTimestamp, $endTimestamp');
|
// trace('Discord RPC Updated. Arguments: $details, $state, $smallImageKey, $hasStartTimestamp, $endTimestamp');
|
||||||
}
|
}
|
||||||
|
#end
|
||||||
}
|
}
|
||||||
|
|
|
@ -194,7 +194,9 @@ class PlayState extends MusicBeatState
|
||||||
dialogue = CoolUtil.coolTextFile(Paths.txt('thorns/thornsDialogue'));
|
dialogue = CoolUtil.coolTextFile(Paths.txt('thorns/thornsDialogue'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if discord_rpc
|
||||||
initDiscord();
|
initDiscord();
|
||||||
|
#end
|
||||||
|
|
||||||
switch (SONG.song.toLowerCase())
|
switch (SONG.song.toLowerCase())
|
||||||
{
|
{
|
||||||
|
|
|
@ -194,9 +194,9 @@ class TitleState extends MusicBeatState
|
||||||
blackScreen = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
|
blackScreen = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.BLACK);
|
||||||
credGroup.add(blackScreen);
|
credGroup.add(blackScreen);
|
||||||
|
|
||||||
var atlasBullShit:FlxSprite = new FlxSprite();
|
// var atlasBullShit:FlxSprite = new FlxSprite();
|
||||||
atlasBullShit.frames = CoolUtil.fromAnimate(Paths.image('money'), Paths.file('images/money.json'));
|
// atlasBullShit.frames = CoolUtil.fromAnimate(Paths.image('money'), Paths.file('images/money.json'));
|
||||||
credGroup.add(atlasBullShit);
|
// credGroup.add(atlasBullShit);
|
||||||
|
|
||||||
credTextShit = new Alphabet(0, 0, "ninjamuffin99\nPhantomArcade\nkawaisprite\nevilsk8er", true);
|
credTextShit = new Alphabet(0, 0, "ninjamuffin99\nPhantomArcade\nkawaisprite\nevilsk8er", true);
|
||||||
credTextShit.screenCenter();
|
credTextShit.screenCenter();
|
||||||
|
|
|
@ -35,7 +35,7 @@ class PreferencesMenu extends ui.OptionsState.Page
|
||||||
public static function initPrefs():Void
|
public static function initPrefs():Void
|
||||||
{
|
{
|
||||||
preferenceCheck('censor-naughty', false);
|
preferenceCheck('censor-naughty', false);
|
||||||
preferenceCheck('downscroll', true);
|
preferenceCheck('downscroll', false);
|
||||||
preferenceCheck('flashing-menu', true);
|
preferenceCheck('flashing-menu', true);
|
||||||
preferenceCheck('camera-zoom', true);
|
preferenceCheck('camera-zoom', true);
|
||||||
preferenceCheck('fps-counter', true);
|
preferenceCheck('fps-counter', true);
|
||||||
|
|
Loading…
Reference in a new issue