From b3c418098b2bbdc85833e9903d6185071124e917 Mon Sep 17 00:00:00 2001 From: Detoria <44783518+theDetourist@users.noreply.github.com> Date: Sat, 3 Apr 2021 18:15:28 -0300 Subject: [PATCH 01/44] Friday Night Funkin' EYY's, but GF cheers too --- source/PlayState.hx | 164 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 131 insertions(+), 33 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 762695d..97d930c 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -157,7 +157,6 @@ class PlayState extends MusicBeatState var scoreTxt:FlxText; var replayTxt:FlxText; - public static var campaignScore:Int = 0; var defaultCamZoom:Float = 1.05; @@ -172,6 +171,12 @@ class PlayState extends MusicBeatState public static var timeCurrently:Float = 0; public static var timeCurrentlyR:Float = 0; + + // Will fire once every prevent debug spam messages and broken animations + private var triggeredAlready:Bool = false; + + // Will decide if she's even allowed to headbang at all depending on the song + private var allowToHeadbang:Bool = false; override public function create() { @@ -1150,42 +1155,47 @@ class PlayState extends MusicBeatState songLength = FlxG.sound.music.length; if (FlxG.save.data.songPosition) - { - remove(songPosBG); - remove(songPosBar); - remove(songName); + { + remove(songPosBG); + remove(songPosBar); + remove(songName); - songPosBG = new FlxSprite(0, 10).loadGraphic(Paths.image('healthBar')); - if (FlxG.save.data.downscroll) - songPosBG.y = FlxG.height * 0.9 + 45; - songPosBG.screenCenter(X); - songPosBG.scrollFactor.set(); - add(songPosBG); + songPosBG = new FlxSprite(0, 10).loadGraphic(Paths.image('healthBar')); + if (FlxG.save.data.downscroll) + songPosBG.y = FlxG.height * 0.9 + 45; + songPosBG.screenCenter(X); + songPosBG.scrollFactor.set(); + add(songPosBG); - songPosBar = new FlxBar(songPosBG.x + 4, songPosBG.y + 4, LEFT_TO_RIGHT, Std.int(songPosBG.width - 8), Std.int(songPosBG.height - 8), this, - 'songPositionBar', 0, songLength - 1000); - songPosBar.numDivisions = 1000; - songPosBar.scrollFactor.set(); - songPosBar.createFilledBar(FlxColor.GRAY, FlxColor.LIME); - add(songPosBar); - - var songName = new FlxText(songPosBG.x + (songPosBG.width / 2) - 20,songPosBG.y,0,SONG.song, 16); - if (FlxG.save.data.downscroll) - songName.y -= 3; - songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); - songName.scrollFactor.set(); - add(songName); + songPosBar = new FlxBar(songPosBG.x + 4, songPosBG.y + 4, LEFT_TO_RIGHT, Std.int(songPosBG.width - 8), Std.int(songPosBG.height - 8), this, + 'songPositionBar', 0, songLength - 1000); + songPosBar.numDivisions = 1000; + songPosBar.scrollFactor.set(); + songPosBar.createFilledBar(FlxColor.GRAY, FlxColor.LIME); + add(songPosBar); - songPosBG.cameras = [camHUD]; - songPosBar.cameras = [camHUD]; - songName.cameras = [camHUD]; - } + var songName = new FlxText(songPosBG.x + (songPosBG.width / 2) - 20,songPosBG.y,0,SONG.song, 16); + if (FlxG.save.data.downscroll) + songName.y -= 3; + songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); + songName.scrollFactor.set(); + add(songName); + songPosBG.cameras = [camHUD]; + songPosBar.cameras = [camHUD]; + songName.cameras = [camHUD]; + } + + // Song check real quick + if(curSong == 'Bopeebo' || + curSong == 'Philly' || + curSong == 'Blammed' || + curSong == 'Cocoa' || + curSong == 'Eggnog') allowToHeadbang = true; + else allowToHeadbang = false; + #if desktop // Updating Discord Rich Presence (with Time Left) - - - DiscordClient.changePresence(detailsText + " " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(), "\nAcc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses , iconRPC); #end } @@ -1725,9 +1735,97 @@ class PlayState extends MusicBeatState if (generatedMusic && PlayState.SONG.notes[Std.int(curStep / 16)] != null) { - if (curBeat % 4 == 0) + // Make sure Girlfriend cheers only for certain songs + if(allowToHeadbang) { - // trace(PlayState.SONG.notes[Std.int(curStep / 16)].mustHitSection); + // Don't animate GF if something else is already animating her (eg. train passing) + if(gf.animation.curAnim.name == 'danceLeft' || gf.animation.curAnim.name == 'danceRight' || gf.animation.curAnim.name == 'idle') + { + // Per song treatment since some songs will only have the 'Hey' at certain times + if(curSong == 'Philly') + { + // Prevent GF from starting too early or doing this endlessly + if(curBeat < 250) + { + // Stoppage times + if(curBeat != 184 && curBeat != 216) + { + if (curBeat % 16 == 8) + { + // Just a garantee that it'll trigger just once + if(!triggeredAlready) + { + gf.playAnim('cheer'); + trace('Eyy ' + curBeat); + triggeredAlready = true; + } + }else triggeredAlready = false; + } + } + }else if(curSong == 'Bopeebo') + { + if(curBeat > 5 && curBeat < 130) + { + if (curBeat % 8 == 7) + { + if(!triggeredAlready) + { + gf.playAnim('cheer'); + trace('Eyy ' + curBeat); + triggeredAlready = true; + } + }else triggeredAlready = false; + } + }else if(curSong == 'Blammed') + { + if(curBeat > 30 && curBeat < 190) + { + if(curBeat < 90 || curBeat > 128) + { + if (curBeat % 4 == 2) + { + if(!triggeredAlready) + { + gf.playAnim('cheer'); + trace('Eyy ' + curBeat); + triggeredAlready = true; + } + }else triggeredAlready = false; + } + } + }else if(curSong == 'Cocoa') + { + if(curBeat < 170) + { + if(curBeat < 65 || curBeat > 130 && curBeat < 145) + { + if (curBeat % 16 == 15) + { + if(!triggeredAlready) + { + gf.playAnim('cheer'); + trace('Eyy ' + curBeat); + triggeredAlready = true; + } + }else triggeredAlready = false; + } + } + }else if(curSong == 'Eggnog') + { + if(curBeat > 10 && curBeat != 111 && curBeat < 220) + { + if (curBeat % 8 == 7) + { + if(!triggeredAlready) + { + gf.playAnim('cheer'); + trace('Eyy ' + curBeat); + triggeredAlready = true; + } + }else triggeredAlready = false; + } + } + } } if (camFollow.x != dad.getMidpoint().x + 150 && !PlayState.SONG.notes[Std.int(curStep / 16)].mustHitSection) From ab6963f6c74802f1f55897debae2a295d7f2b052 Mon Sep 17 00:00:00 2001 From: Detoria <44783518+theDetourist@users.noreply.github.com> Date: Sat, 3 Apr 2021 19:01:41 -0300 Subject: [PATCH 02/44] typo fix --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 97d930c..0a3b4d6 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -172,7 +172,7 @@ class PlayState extends MusicBeatState public static var timeCurrently:Float = 0; public static var timeCurrentlyR:Float = 0; - // Will fire once every prevent debug spam messages and broken animations + // Will fire once to prevent debug spam messages and broken animations private var triggeredAlready:Bool = false; // Will decide if she's even allowed to headbang at all depending on the song From 580ad210cafdd21d1d6610e2b7a4f70d61b18005 Mon Sep 17 00:00:00 2001 From: Detoria <44783518+theDetourist@users.noreply.github.com> Date: Sat, 3 Apr 2021 22:17:02 -0300 Subject: [PATCH 03/44] switch over elseif stuff + few changes --- source/PlayState.hx | 136 ++++++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 67 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 0a3b4d6..f982855 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -176,7 +176,7 @@ class PlayState extends MusicBeatState private var triggeredAlready:Bool = false; // Will decide if she's even allowed to headbang at all depending on the song - private var allowToHeadbang:Bool = false; + private var allowedToHeadbang:Bool = false; override public function create() { @@ -1187,12 +1187,11 @@ class PlayState extends MusicBeatState } // Song check real quick - if(curSong == 'Bopeebo' || - curSong == 'Philly' || - curSong == 'Blammed' || - curSong == 'Cocoa' || - curSong == 'Eggnog') allowToHeadbang = true; - else allowToHeadbang = false; + switch(curSong) + { + case 'Bopeebo' | 'Philly' | 'Blammed' | 'Cocoa' | 'Eggnog': allowedToHeadbang = true; + default: allowedToHeadbang = false; + } #if desktop // Updating Discord Rich Presence (with Time Left) @@ -1736,98 +1735,101 @@ class PlayState extends MusicBeatState if (generatedMusic && PlayState.SONG.notes[Std.int(curStep / 16)] != null) { // Make sure Girlfriend cheers only for certain songs - if(allowToHeadbang) + if(allowedToHeadbang) { // Don't animate GF if something else is already animating her (eg. train passing) if(gf.animation.curAnim.name == 'danceLeft' || gf.animation.curAnim.name == 'danceRight' || gf.animation.curAnim.name == 'idle') { // Per song treatment since some songs will only have the 'Hey' at certain times - if(curSong == 'Philly') + switch(curSong) { - // Prevent GF from starting too early or doing this endlessly - if(curBeat < 250) + case 'Philly': { - // Stoppage times - if(curBeat != 184 && curBeat != 216) + // General duration of the song + if(curBeat < 250) { - if (curBeat % 16 == 8) + // Beats to skip or to stop GF from cheering + if(curBeat != 184 && curBeat != 216) { - // Just a garantee that it'll trigger just once - if(!triggeredAlready) + if(curBeat % 16 == 8) { - gf.playAnim('cheer'); - trace('Eyy ' + curBeat); - triggeredAlready = true; - } - }else triggeredAlready = false; - } - } - }else if(curSong == 'Bopeebo') - { - if(curBeat > 5 && curBeat < 130) - { - if (curBeat % 8 == 7) - { - if(!triggeredAlready) - { - gf.playAnim('cheer'); - trace('Eyy ' + curBeat); - triggeredAlready = true; + // Just a garantee that it'll trigger just once + if(!triggeredAlready) + { + gf.playAnim('cheer'); + triggeredAlready = true; + } + }else triggeredAlready = false; } - }else triggeredAlready = false; + } } - }else if(curSong == 'Blammed') - { - if(curBeat > 30 && curBeat < 190) + case 'Bopeebo': { - if(curBeat < 90 || curBeat > 128) + // Where it starts || where it ends + if(curBeat > 5 && curBeat < 130) { - if (curBeat % 4 == 2) + if(curBeat % 8 == 7) { if(!triggeredAlready) { gf.playAnim('cheer'); - trace('Eyy ' + curBeat); triggeredAlready = true; } }else triggeredAlready = false; } } - }else if(curSong == 'Cocoa') - { - if(curBeat < 170) + case 'Blammed': { - if(curBeat < 65 || curBeat > 130 && curBeat < 145) + if(curBeat > 30 && curBeat < 190) { - if (curBeat % 16 == 15) + if(curBeat < 90 || curBeat > 128) { - if(!triggeredAlready) + if(curBeat % 4 == 2) { - gf.playAnim('cheer'); - trace('Eyy ' + curBeat); - triggeredAlready = true; - } - }else triggeredAlready = false; - } - } - }else if(curSong == 'Eggnog') - { - if(curBeat > 10 && curBeat != 111 && curBeat < 220) - { - if (curBeat % 8 == 7) - { - if(!triggeredAlready) - { - gf.playAnim('cheer'); - trace('Eyy ' + curBeat); - triggeredAlready = true; + if(!triggeredAlready) + { + gf.playAnim('cheer'); + triggeredAlready = true; + } + }else triggeredAlready = false; } - }else triggeredAlready = false; + } + } + case 'Cocoa': + { + if(curBeat < 170) + { + if(curBeat < 65 || curBeat > 130 && curBeat < 145) + { + if(curBeat % 16 == 15) + { + if(!triggeredAlready) + { + gf.playAnim('cheer'); + triggeredAlready = true; + } + }else triggeredAlready = false; + } + } + } + case 'Eggnog': + { + if(curBeat > 10 && curBeat != 111 && curBeat < 220) + { + if(curBeat % 8 == 7) + { + if(!triggeredAlready) + { + gf.playAnim('cheer'); + triggeredAlready = true; + } + }else triggeredAlready = false; + } } } } } - + if (camFollow.x != dad.getMidpoint().x + 150 && !PlayState.SONG.notes[Std.int(curStep / 16)].mustHitSection) { camFollow.setPosition(dad.getMidpoint().x + 150, dad.getMidpoint().y - 100); From ee4b1f37d5c4b6c1f78de73f31c701b3f156bbe5 Mon Sep 17 00:00:00 2001 From: NitrogenDioxide <45130240+Kiffolisk@users.noreply.github.com> Date: Sun, 4 Apr 2021 21:40:21 +0200 Subject: [PATCH 04/44] bug.md fix (talked about clearing cookies n shit like that which doesnt make sense at all) lol --- .github/ISSUE_TEMPLATE/bug.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index a87e759..5fefe0f 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -7,7 +7,7 @@ assignees: '' --- -#### Please check for duplicates or similar issues, as well performing simple troubleshooting steps (such as clearing cookies, clearing AppData, trying another browser) before submitting an issue. +#### Please check for duplicates or similar issues, as well performing simple troubleshooting steps (such as deleting the export folder if it's an issue with compiling, reinstalling Kade Engine) before submitting an issue. ### If you are playing a downloaded version of the game, what operating system are you using? Windows (`x86`), Windows (`x86_64`), Linux, or macOS? Specify below. From 83a9f484ef947c15e7fbab7c7c1fc946e57b3c88 Mon Sep 17 00:00:00 2001 From: KadeDev Date: Sun, 4 Apr 2021 14:10:45 -0700 Subject: [PATCH 05/44] like a lot of things lmaooo --- source/ConvertScore.hx | 21 +++++++++ source/KadeEngineData.hx | 9 ++-- source/Options.hx | 99 ++++++++++++++++++++++++++++++++++++++-- source/OptionsMenu.hx | 82 +++++++++++++++------------------ source/PlayState.hx | 55 ++++++---------------- source/Ratings.hx | 30 ++++++++++++ 6 files changed, 203 insertions(+), 93 deletions(-) create mode 100644 source/ConvertScore.hx create mode 100644 source/Ratings.hx diff --git a/source/ConvertScore.hx b/source/ConvertScore.hx new file mode 100644 index 0000000..9eba969 --- /dev/null +++ b/source/ConvertScore.hx @@ -0,0 +1,21 @@ +class ConvertScore +{ + public static function convertScore(noteDiff:Float):Int + { + var daRating:String = Ratings.CalculateRating(noteDiff, 166); + + switch(daRating) + { + case 'shit': + return -300; + case 'bad': + return 0; + case 'good': + return 200; + case 'sick': + return 350; + } + return 0; + } + +} \ No newline at end of file diff --git a/source/KadeEngineData.hx b/source/KadeEngineData.hx index 458de55..da31db7 100644 --- a/source/KadeEngineData.hx +++ b/source/KadeEngineData.hx @@ -26,9 +26,6 @@ class KadeEngineData if (FlxG.save.data.songPosition == null) FlxG.save.data.songPosition = false; - if (FlxG.save.data.etternaMode == null) - FlxG.save.data.etternaMode = false; - if (FlxG.save.data.fps == null) FlxG.save.data.fps = false; @@ -54,6 +51,12 @@ class KadeEngineData if (FlxG.save.data.npsDisplay == null) FlxG.save.data.npsDisplay = false; + if (FlxG.save.data.frames == null) + FlxG.save.data.frames = 10; + + Conductor.safeFrames = FlxG.save.data.frames; + Conductor.safeZoneOffset = (Conductor.safeFrames / 60) * 1000; + (cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap); } } diff --git a/source/Options.hx b/source/Options.hx index f4e6e20..771d548 100644 --- a/source/Options.hx +++ b/source/Options.hx @@ -45,19 +45,28 @@ class Option } private var description:String = ""; private var display:String; + private var acceptValues:Bool = false; public final function getDisplay():String { return display; } + public final function getAccept():Bool + { + return acceptValues; + } + public final function getDescription():String { return description; } + // Returns whether the label is to be updated. public function press():Bool { return throw "stub!"; } private function updateDisplay():String { return throw "stub!"; } + public function left():Bool { return throw "stub!"; } + public function right():Bool { return throw "stub!"; } } class DFJKOption extends Option @@ -150,24 +159,55 @@ class SongPositionOption extends Option } } -class EtternaModeOption extends Option +class Judgement extends Option { + + public function new(desc:String) { super(); description = desc; + acceptValues = true; } public override function press():Bool { - FlxG.save.data.etternaMode = !FlxG.save.data.etternaMode; - display = updateDisplay(); return true; } private override function updateDisplay():String { - return "Etterna Mode " + (!FlxG.save.data.etternaMode ? "off" : "on"); + return "Safe Frames"; + } + + override function left():Bool { + Conductor.safeFrames -= 1; + FlxG.save.data.frames = Conductor.safeFrames; + + Conductor.safeZoneOffset = (Conductor.safeFrames / 60) * 1000; + + OptionsMenu.versionShit.text = "Current Safe Frames: " + Conductor.safeFrames + " - Description - " + description + + " - SIK: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.25, 0) + + "ms GD: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.40, 0) + + "ms BD: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.50, 0) + + "ms SHT: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.70, 0) + + "ms TOTAL: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset,0) + "ms"; + return true; + } + + override function right():Bool { + Conductor.safeFrames += 1; + FlxG.save.data.frames = Conductor.safeFrames; + + Conductor.safeZoneOffset = (Conductor.safeFrames / 60) * 1000; + + OptionsMenu.versionShit.text = "Current Safe Frames: " + Conductor.safeFrames + " - Description - " + description + + " - SIK: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.25, 0) + + "ms GD: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.40, 0) + + "ms BD: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.50, 0) + + "ms SHT: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.70, 0) + + "ms TOTAL: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset,0) + "ms"; + return true; } } @@ -199,6 +239,7 @@ class FPSCapOption extends Option { super(); description = desc; + acceptValues = true; } public override function press():Bool @@ -210,6 +251,28 @@ class FPSCapOption extends Option { return "FPS Cap"; } + + override function right():Bool { + if (FlxG.save.data.fpsCap > 290) + return false; + FlxG.save.data.fpsCap = FlxG.save.data.fpsCap + 10; + (cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap); + + OptionsMenu.versionShit.text = "Current FPS Cap: " + FlxG.save.data.fpsCap + " - Description - " + description; + + return true; + } + + override function left():Bool { + if (FlxG.save.data.fpsCap < 60) + return false; + FlxG.save.data.fpsCap = FlxG.save.data.fpsCap - 10; + (cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap); + + OptionsMenu.versionShit.text = "Current FPS Cap: " + FlxG.save.data.fpsCap + " - Description - " + description; + + return true; + } } @@ -219,6 +282,7 @@ class ScrollSpeedOption extends Option { super(); description = desc; + acceptValues = true; } public override function press():Bool @@ -230,6 +294,33 @@ class ScrollSpeedOption extends Option { return "Scroll Speed"; } + + override function right():Bool { + FlxG.save.data.scrollSpeed += 0.1; + + if (FlxG.save.data.scrollSpeed < 1) + FlxG.save.data.scrollSpeed = 1; + + if (FlxG.save.data.scrollSpeed > 10) + FlxG.save.data.scrollSpeed = 10; + + OptionsMenu.versionShit.text = "Current Scroll Speed: " + OptionsMenu.truncateFloat(FlxG.save.data.scrollSpeed,1) + " - Description - " + description; + return true; + } + + override function left():Bool { + FlxG.save.data.scrollSpeed -= 0.1; + + if (FlxG.save.data.scrollSpeed < 1) + FlxG.save.data.scrollSpeed = 1; + + if (FlxG.save.data.scrollSpeed > 10) + FlxG.save.data.scrollSpeed = 10; + + + OptionsMenu.versionShit.text = "Current Scroll Speed: " + OptionsMenu.truncateFloat(FlxG.save.data.scrollSpeed,1) + " - Description - " + description; + return true; + } } diff --git a/source/OptionsMenu.hx b/source/OptionsMenu.hx index 35af037..f732001 100644 --- a/source/OptionsMenu.hx +++ b/source/OptionsMenu.hx @@ -22,7 +22,10 @@ class OptionsMenu extends MusicBeatState var options:Array = [ new OptionCatagory("Gameplay", [ new DFJKOption(controls), - new FPSCapOption("Cap your FPS (Left for -10, Right for -10)"), + new Judgement("Customize your Hit Timings (LEFT or RIGHT)"), + #if !html + new FPSCapOption("Cap your FPS (Left for -10, Right for -10. SHIFT to go faster)"), + #end new ScrollSpeedOption("Change your scroll speed (Left for -0.1, right for +0.1. If its at 1, it will be chart dependent)"), new OffsetMenu("Get a note offset based off of your inputs!"), new CustomizeGameplay("Drag'n'Drop Gameplay Modules around to your preference") @@ -30,22 +33,24 @@ class OptionsMenu extends MusicBeatState new OptionCatagory("Appearence", [ new SongPositionOption("Show the songs current position (as a bar)"), new DownscrollOption("Change the layout of the strumline."), + #if !html new RainbowFPSOption("Make the FPS Counter Rainbow (Only works with the FPS Counter toggeled on)"), + #end new AccuracyOption("Display accuracy information."), new NPSDisplayOption("Shows your current Notes Per Second.") ]), + #if !mobile new OptionCatagory("Misc", [ - new EtternaModeOption("Harder Hit Windows and a different scoring system."), - #if !mobile + new FPSOption("Toggle the FPS Counter"), - #end new ReplayOption("View replays") ]) + #end ]; private var currentDescription:String = ""; private var grpControls:FlxTypedGroup; - var versionShit:FlxText; + public static var versionShit:FlxText; var currentSelectedCat:OptionCatagory; @@ -84,7 +89,7 @@ class OptionsMenu extends MusicBeatState var isCat:Bool = false; - function truncateFloat( number : Float, precision : Int): Float { + public static function truncateFloat( number : Float, precision : Int): Float { var num = number; num = num * Math.pow(10, precision); num = Math.round( num ) / Math.pow(10, precision); @@ -118,51 +123,36 @@ class OptionsMenu extends MusicBeatState if (isCat) { - switch(currentSelectedCat.getOptions()[curSelected].getDisplay()) + if (currentSelectedCat.getOptions()[curSelected].getAccept()) { - case 'FPS Cap': - var fps = (cast (Lib.current.getChildAt(0), Main)).getFPSCap(); - - if (FlxG.keys.pressed.RIGHT && fps < 285) // actual cap is 285 + if (FlxG.keys.pressed.SHIFT) { - (cast (Lib.current.getChildAt(0), Main)).setFPSCap(fps + 10); - FlxG.save.data.fpsCap = fps + 10; + if (FlxG.keys.pressed.RIGHT) + currentSelectedCat.getOptions()[curSelected].right(); + if (FlxG.keys.pressed.LEFT) + currentSelectedCat.getOptions()[curSelected].left(); } - - if (FlxG.keys.pressed.LEFT && fps > 60) - { - (cast (Lib.current.getChildAt(0), Main)).setFPSCap(fps - 10); - FlxG.save.data.fpsCap = fps - 10; - } - - versionShit.text = "Current FPS Cap: " + fps + " - Description - " + currentDescription; - - - case 'Scroll Speed': + else + { if (FlxG.keys.justPressed.RIGHT) - FlxG.save.data.scrollSpeed += 0.1; - + currentSelectedCat.getOptions()[curSelected].right(); if (FlxG.keys.justPressed.LEFT) - FlxG.save.data.scrollSpeed -= 0.1; - - // caps - - if (FlxG.save.data.scrollSpeed < 1) - FlxG.save.data.scrollSpeed = 1; - - if (FlxG.save.data.scrollSpeed > 10) - FlxG.save.data.scrollSpeed = 10; - - - versionShit.text = "Current Scroll Speed: " + truncateFloat(FlxG.save.data.scrollSpeed,1) + " - Description - " + currentDescription; - default: + currentSelectedCat.getOptions()[curSelected].left(); + } + } + else + { + if (FlxG.keys.pressed.SHIFT) if (FlxG.keys.pressed.RIGHT) - FlxG.save.data.offset += 0.01; - - if (FlxG.keys.pressed.LEFT) - FlxG.save.data.offset -= 0.01; - - versionShit.text = "Offset (Left, Right): " + truncateFloat(FlxG.save.data.offset,2) + " - Description - " + currentDescription; + FlxG.save.data.offset += 1; + else if (FlxG.keys.pressed.LEFT) + FlxG.save.data.offset -= 1; + else if (controls.RIGHT_P) + FlxG.save.data.offset += 0.1; + else if (controls.LEFT_P) + FlxG.save.data.offset -= 0.1; + + versionShit.text = "Offset (Left, Right, Shift to go faster): " + truncateFloat(FlxG.save.data.offset,2) + " - Description - " + currentDescription; } } else @@ -173,7 +163,7 @@ class OptionsMenu extends MusicBeatState if (FlxG.keys.pressed.LEFT) FlxG.save.data.offset-= 0.01; - versionShit.text = "Offset (Left, Right): " + truncateFloat(FlxG.save.data.offset,2) + " - Description - " + currentDescription; + versionShit.text = "Offset (Left, Right, Shift to go faster): " + truncateFloat(FlxG.save.data.offset,2) + " - Description - " + currentDescription; } diff --git a/source/PlayState.hx b/source/PlayState.hx index 762695d..034c64e 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -107,7 +107,9 @@ class PlayState extends MusicBeatState private var combo:Int = 0; public static var misses:Int = 0; private var accuracy:Float = 0.00; + private var accuracyDefault:Float = 0.00; private var totalNotesHit:Float = 0; + private var totalNotesHitDefault:Float = 0; private var totalPlayed:Int = 0; private var ss:Bool = false; @@ -154,6 +156,7 @@ class PlayState extends MusicBeatState var talking:Bool = true; var songScore:Int = 0; + var songScoreDef:Int = 0; var scoreTxt:FlxText; var replayTxt:FlxText; @@ -176,12 +179,6 @@ class PlayState extends MusicBeatState override public function create() { - if (FlxG.save.data.etternaMode) - Conductor.safeFrames = 5; // 116ms hit window (j3-4) - else - Conductor.safeFrames = 10; // 166ms hit window (j1) - - if (FlxG.sound.music != null) FlxG.sound.music.stop(); @@ -257,6 +254,8 @@ class PlayState extends MusicBeatState Conductor.mapBPMChanges(SONG); Conductor.changeBPM(SONG.bpm); + trace('INFORMATION ABOUT WHAT U PLAYIN WIT:\nFRAMES: ' + Conductor.safeFrames + '\nZONE: ' + Conductor.safeZoneOffset); + switch (SONG.song.toLowerCase()) { case 'tutorial': @@ -1615,7 +1614,7 @@ class PlayState extends MusicBeatState { if (FlxG.save.data.accuracyDisplay) { - scoreTxt.text = (FlxG.save.data.npsDisplay ? "NPS: " + nps + " | " : "") + "Score:" + (FlxG.save.data.etternaMode ? Math.max(0,etternaModeScore) + " (" + songScore + ")" : "" + songScore) + " | Combo Breaks:" + misses + " | Accuracy:" + truncateFloat(accuracy, 2) + "% | " + generateRanking(); + scoreTxt.text = (FlxG.save.data.npsDisplay ? "NPS: " + nps + " | " : "") + "Score:" + (Conductor.safeFrames != 10 ? songScore + " (" + songScoreDef + ")" : "" + songScore) + " | Combo Breaks:" + misses + " | Accuracy:" + truncateFloat(accuracy, 2) + "% | " + generateRanking(); } else { @@ -2058,8 +2057,8 @@ class PlayState extends MusicBeatState private function popUpScore(daNote:Note):Void { - var noteDiff:Float = Math.abs(daNote.strumTime - Conductor.songPosition); - var wife:Float = EtternaFunctions.wife3(noteDiff, FlxG.save.data.etternaMode ? 1 : 1.7); + var noteDiff:Float = Math.abs(Conductor.songPosition - daNote.strumTime); + var wife:Float = EtternaFunctions.wife3(noteDiff, 1.7); // boyfriend.playAnim('hey'); vocals.volume = 1; @@ -2107,9 +2106,6 @@ class PlayState extends MusicBeatState sicks++; } - if (FlxG.save.data.etternaMode) - etternaModeScore += Math.round(score / wife); - // trace('Wife accuracy loss: ' + wife + ' | Rating: ' + daRating + ' | Score: ' + score + ' | Weight: ' + (1 - wife)); if (daRating != 'shit' || daRating != 'bad') @@ -2117,6 +2113,7 @@ class PlayState extends MusicBeatState songScore += Math.round(score); + songScoreDef += Math.round(ConvertScore.convertScore(noteDiff)); /* if (combo > 60) daRating = 'sick'; @@ -2198,6 +2195,8 @@ class PlayState extends MusicBeatState add(currentTimingShown); + + var comboSpr:FlxSprite = new FlxSprite().loadGraphic(Paths.image(pixelShitPart1 + 'combo' + pixelShitPart2)); comboSpr.screenCenter(); comboSpr.x = rating.x; @@ -2463,14 +2462,7 @@ class PlayState extends MusicBeatState { var noteDiff:Float = Math.abs(daNote.strumTime - Conductor.songPosition); - if (noteDiff > Conductor.safeZoneOffset * 0.70 || noteDiff < Conductor.safeZoneOffset * -0.70) - daNote.rating = "shit"; - else if (noteDiff > Conductor.safeZoneOffset * 0.50 || noteDiff < Conductor.safeZoneOffset * -0.50) - daNote.rating = "bad"; - else if (noteDiff > Conductor.safeZoneOffset * 0.45 || noteDiff < Conductor.safeZoneOffset * -0.45) - daNote.rating = "good"; - else if (noteDiff < Conductor.safeZoneOffset * 0.44 && noteDiff > Conductor.safeZoneOffset * -0.44) - daNote.rating = "sick"; + daNote.rating = Ratings.CalculateRating(noteDiff); if (NearlyEquals(daNote.strumTime,rep.replay.keyPresses[repPresses].time, 30)) { @@ -2520,14 +2512,7 @@ class PlayState extends MusicBeatState { var noteDiff:Float = Math.abs(daNote.strumTime - Conductor.songPosition); - if (noteDiff > Conductor.safeZoneOffset * 0.70 || noteDiff < Conductor.safeZoneOffset * -0.70) - daNote.rating = "shit"; - else if (noteDiff > Conductor.safeZoneOffset * 0.50 || noteDiff < Conductor.safeZoneOffset * -0.50) - daNote.rating = "bad"; - else if (noteDiff > Conductor.safeZoneOffset * 0.45 || noteDiff < Conductor.safeZoneOffset * -0.45) - daNote.rating = "good"; - else if (noteDiff < Conductor.safeZoneOffset * 0.44 && noteDiff > Conductor.safeZoneOffset * -0.44) - daNote.rating = "sick"; + daNote.rating = Ratings.CalculateRating(noteDiff); goodNoteHit(daNote); trace('force note hit'); @@ -2776,12 +2761,9 @@ class PlayState extends MusicBeatState */ function updateAccuracy() { - if (misses > 0 || accuracy < 96) - fc = false; - else - fc = true; totalPlayed += 1; accuracy = Math.max(0,totalNotesHit / totalPlayed * 100); + accuracyDefault = Math.max(0, totalNotesHitDefault / totalPlayed * 100); } @@ -2870,14 +2852,7 @@ class PlayState extends MusicBeatState var noteDiff:Float = Math.abs(note.strumTime - Conductor.songPosition); - if (noteDiff > Conductor.safeZoneOffset * 0.70 || noteDiff < Conductor.safeZoneOffset * -0.70) - note.rating = "shit"; - else if (noteDiff > Conductor.safeZoneOffset * 0.50 || noteDiff < Conductor.safeZoneOffset * -0.50) - note.rating = "bad"; - else if (noteDiff > Conductor.safeZoneOffset * 0.45 || noteDiff < Conductor.safeZoneOffset * -0.45) - note.rating = "good"; - else if (noteDiff < Conductor.safeZoneOffset * 0.44 && noteDiff > Conductor.safeZoneOffset * -0.44) - note.rating = "sick"; + note.rating = Ratings.CalculateRating(noteDiff); if (!note.isSustainNote) notesHitArray.push(Date.now()); diff --git a/source/Ratings.hx b/source/Ratings.hx new file mode 100644 index 0000000..410d63c --- /dev/null +++ b/source/Ratings.hx @@ -0,0 +1,30 @@ +class Ratings +{ + public static function CalculateRating(noteDiff:Float, ?customSafeZone:Float):String + { + + if (customSafeZone == null) + { + Conductor.safeZoneOffset = (Conductor.safeFrames / 60) * 1000; + customSafeZone = Conductor.safeZoneOffset; + } + + + // I HATE THIS IF CONDITION + // IF LEMON SEES THIS I'M SORRY :( + + if (noteDiff > customSafeZone * 0.50) // way early + return "shit"; + else if (noteDiff > customSafeZone * 0.26) // early + return "bad"; + else if (noteDiff > customSafeZone * 0.20) // your kinda there + return "good"; + else if (noteDiff < customSafeZone * -0.20) // little late + return "good"; + else if (noteDiff < customSafeZone * -0.26) // late + return "bad"; + else if (noteDiff < customSafeZone * -0.50) // late as fuck + return "shit"; + return "sick"; + } +} \ No newline at end of file From fb55d993e1ee50c4ff7b220aa9f804e55da9b181 Mon Sep 17 00:00:00 2001 From: KadeDev Date: Sun, 4 Apr 2021 18:08:19 -0700 Subject: [PATCH 06/44] funny commit --- source/Conductor.hx | 11 ++++++++++- source/KadeEngineData.hx | 3 +-- source/MainMenuState.hx | 4 ++-- source/Note.hx | 4 ++-- source/Options.hx | 28 ++++++++++++++++++---------- source/OptionsMenu.hx | 2 +- source/PlayState.hx | 8 +++++--- source/Ratings.hx | 22 +++++++++++----------- 8 files changed, 50 insertions(+), 32 deletions(-) diff --git a/source/Conductor.hx b/source/Conductor.hx index 4248c9d..68634a3 100644 --- a/source/Conductor.hx +++ b/source/Conductor.hx @@ -1,6 +1,7 @@ package; import Song.SwagSong; +import flixel.FlxG; /** * ... @@ -24,7 +25,8 @@ class Conductor public static var offset:Float = 0; public static var safeFrames:Int = 10; - public static var safeZoneOffset:Float = (safeFrames / 60) * 1000; // is calculated in create(), is safeFrames in milliseconds + public static var safeZoneOffset:Float = Math.floor((safeFrames / 60) * 1000); // is calculated in create(), is safeFrames in milliseconds + public static var timeScale:Float = Conductor.safeZoneOffset / 166; public static var bpmChangeMap:Array = []; @@ -32,6 +34,13 @@ class Conductor { } + public static function recalculateTimings() + { + Conductor.safeFrames = FlxG.save.data.frames; + Conductor.safeZoneOffset = Math.floor((Conductor.safeFrames / 60) * 1000); + Conductor.timeScale = Conductor.safeZoneOffset / 166; + } + public static function mapBPMChanges(song:SwagSong) { bpmChangeMap = []; diff --git a/source/KadeEngineData.hx b/source/KadeEngineData.hx index da31db7..8229c19 100644 --- a/source/KadeEngineData.hx +++ b/source/KadeEngineData.hx @@ -54,8 +54,7 @@ class KadeEngineData if (FlxG.save.data.frames == null) FlxG.save.data.frames = 10; - Conductor.safeFrames = FlxG.save.data.frames; - Conductor.safeZoneOffset = (Conductor.safeFrames / 60) * 1000; + Conductor.recalculateTimings(); (cast (Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap); } diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index fb24034..f33ad95 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -36,9 +36,9 @@ class MainMenuState extends MusicBeatState var newGaming2:FlxText; var newInput:Bool = true; - public static var nightly:String = ""; + public static var nightly:String = "-Nightly2"; - public static var kadeEngineVer:String = "1.4" + nightly; + public static var kadeEngineVer:String = "1.4.1" + nightly; public static var gameVer:String = "0.2.7.1"; var magenta:FlxSprite; diff --git a/source/Note.hx b/source/Note.hx index fa88315..699b9bc 100644 --- a/source/Note.hx +++ b/source/Note.hx @@ -48,7 +48,7 @@ class Note extends FlxSprite x += 50; // MAKE SURE ITS DEFINITELY OFF SCREEN? y -= 2000; - this.strumTime = strumTime + FlxG.save.data.offset; + this.strumTime = strumTime; if (this.strumTime < 0 ) this.strumTime = 0; @@ -172,7 +172,7 @@ class Note extends FlxSprite prevNote.animation.play('redhold'); } - prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.8 * PlayState.SONG.speed; + prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.8 * FlxG.save.data.scrollSpeed; prevNote.updateHitbox(); // prevNote.setGraphicSize(); } diff --git a/source/Options.hx b/source/Options.hx index 771d548..85dd530 100644 --- a/source/Options.hx +++ b/source/Options.hx @@ -181,31 +181,39 @@ class Judgement extends Option } override function left():Bool { + + if (Conductor.safeFrames == 1) + return false; + Conductor.safeFrames -= 1; FlxG.save.data.frames = Conductor.safeFrames; - Conductor.safeZoneOffset = (Conductor.safeFrames / 60) * 1000; + Conductor.recalculateTimings(); OptionsMenu.versionShit.text = "Current Safe Frames: " + Conductor.safeFrames + " - Description - " + description + - " - SIK: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.25, 0) + - "ms GD: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.40, 0) + - "ms BD: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.50, 0) + - "ms SHT: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.70, 0) + + " - SIK: " + OptionsMenu.truncateFloat(45 * Conductor.timeScale, 0) + + "ms GD: " + OptionsMenu.truncateFloat(90 * Conductor.timeScale, 0) + + "ms BD: " + OptionsMenu.truncateFloat(135 * Conductor.timeScale, 0) + + "ms SHT: " + OptionsMenu.truncateFloat(155 * Conductor.timeScale, 0) + "ms TOTAL: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset,0) + "ms"; return true; } override function right():Bool { + + if (Conductor.safeFrames == 20) + return false; + Conductor.safeFrames += 1; FlxG.save.data.frames = Conductor.safeFrames; - Conductor.safeZoneOffset = (Conductor.safeFrames / 60) * 1000; + Conductor.recalculateTimings(); OptionsMenu.versionShit.text = "Current Safe Frames: " + Conductor.safeFrames + " - Description - " + description + - " - SIK: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.25, 0) + - "ms GD: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.40, 0) + - "ms BD: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.50, 0) + - "ms SHT: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset * 0.70, 0) + + " - SIK: " + OptionsMenu.truncateFloat(45 * Conductor.timeScale, 0) + + "ms GD: " + OptionsMenu.truncateFloat(90 * Conductor.timeScale, 0) + + "ms BD: " + OptionsMenu.truncateFloat(135 * Conductor.timeScale, 0) + + "ms SHT: " + OptionsMenu.truncateFloat(155 * Conductor.timeScale, 0) + "ms TOTAL: " + OptionsMenu.truncateFloat(Conductor.safeZoneOffset,0) + "ms"; return true; } diff --git a/source/OptionsMenu.hx b/source/OptionsMenu.hx index f732001..600a960 100644 --- a/source/OptionsMenu.hx +++ b/source/OptionsMenu.hx @@ -24,7 +24,7 @@ class OptionsMenu extends MusicBeatState new DFJKOption(controls), new Judgement("Customize your Hit Timings (LEFT or RIGHT)"), #if !html - new FPSCapOption("Cap your FPS (Left for -10, Right for -10. SHIFT to go faster)"), + new FPSCapOption("Cap your FPS (Left for -10, Right for +10. SHIFT to go faster)"), #end new ScrollSpeedOption("Change your scroll speed (Left for -0.1, right for +0.1. If its at 1, it will be chart dependent)"), new OffsetMenu("Get a note offset based off of your inputs!"), diff --git a/source/PlayState.hx b/source/PlayState.hx index 8b7f4e6..415de42 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -259,7 +259,7 @@ class PlayState extends MusicBeatState Conductor.mapBPMChanges(SONG); Conductor.changeBPM(SONG.bpm); - trace('INFORMATION ABOUT WHAT U PLAYIN WIT:\nFRAMES: ' + Conductor.safeFrames + '\nZONE: ' + Conductor.safeZoneOffset); + trace('INFORMATION ABOUT WHAT U PLAYIN WIT:\nFRAMES: ' + Conductor.safeFrames + '\nZONE: ' + Conductor.safeZoneOffset + '\nTS: ' + Conductor.timeScale); switch (SONG.song.toLowerCase()) { @@ -1233,7 +1233,9 @@ class PlayState extends MusicBeatState for (songNotes in section.sectionNotes) { - var daStrumTime:Float = songNotes[0]; + var daStrumTime:Float = songNotes[0] + FlxG.save.data.offset; + if (daStrumTime < 0) + daStrumTime = 0; var daNoteData:Int = Std.int(songNotes[1] % 4); var gottaHitNote:Bool = section.mustHitSection; @@ -2158,7 +2160,7 @@ class PlayState extends MusicBeatState private function popUpScore(daNote:Note):Void { var noteDiff:Float = Math.abs(Conductor.songPosition - daNote.strumTime); - var wife:Float = EtternaFunctions.wife3(noteDiff, 1.7); + var wife:Float = EtternaFunctions.wife3(noteDiff, Conductor.timeScale); // boyfriend.playAnim('hey'); vocals.volume = 1; diff --git a/source/Ratings.hx b/source/Ratings.hx index 410d63c..46e9ffb 100644 --- a/source/Ratings.hx +++ b/source/Ratings.hx @@ -3,27 +3,27 @@ class Ratings public static function CalculateRating(noteDiff:Float, ?customSafeZone:Float):String { - if (customSafeZone == null) - { - Conductor.safeZoneOffset = (Conductor.safeFrames / 60) * 1000; - customSafeZone = Conductor.safeZoneOffset; - } + var customTimeScale = Conductor.timeScale; + if (customSafeZone != null) + customTimeScale = customSafeZone / 166; + + // trace(customTimeScale + ' vs ' + Conductor.timeScale); // I HATE THIS IF CONDITION // IF LEMON SEES THIS I'M SORRY :( - if (noteDiff > customSafeZone * 0.50) // way early + if (noteDiff > 135 * customTimeScale) // way early return "shit"; - else if (noteDiff > customSafeZone * 0.26) // early + else if (noteDiff > 90 * customTimeScale) // early return "bad"; - else if (noteDiff > customSafeZone * 0.20) // your kinda there + else if (noteDiff > 45 * customTimeScale) // your kinda there return "good"; - else if (noteDiff < customSafeZone * -0.20) // little late + else if (noteDiff < -45 * customTimeScale) // little late return "good"; - else if (noteDiff < customSafeZone * -0.26) // late + else if (noteDiff < -90 * customTimeScale) // late return "bad"; - else if (noteDiff < customSafeZone * -0.50) // late as fuck + else if (noteDiff < -135 * customTimeScale) // late as fuck return "shit"; return "sick"; } From 53855f369fef49cf7961d7f0615555b98c0ccf63 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 02:19:28 +0200 Subject: [PATCH 07/44] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 5cd5c57..0cf321d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +The point of this fork of Kade-Engine is to build it with AppVeyor. Nothing else is changed. + ![KadeEngineLogo](https://user-images.githubusercontent.com/26305836/110529589-4b4eb600-80ce-11eb-9c44-e899118b0bf0.png) **Download the latest release [here](https://github.com/KadeDev/Kade-Engine/releases/latest)** From ccf8cf942cc0666556b2fd905f0dbf859724ed4a Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 02:29:58 +0200 Subject: [PATCH 08/44] Update .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 415caf3..08da7b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ export/ .vscode/ -APIStuff.hx From 5617070c41fac3b4deb59388152b00c55277af86 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 02:30:19 +0200 Subject: [PATCH 09/44] Create APIStuff.hx --- source/APIStuff.hx | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 source/APIStuff.hx diff --git a/source/APIStuff.hx b/source/APIStuff.hx new file mode 100644 index 0000000..f05fa06 --- /dev/null +++ b/source/APIStuff.hx @@ -0,0 +1,7 @@ +package; + +class APIStuff +{ + public static var API:String = ""; + public static var EncKey:String = ""; +} From 820ec143f29d3530f2f14eca3738887873e9a73f Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 02:32:22 +0200 Subject: [PATCH 10/44] Create appveyor.yml --- appveyor.yml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..29f4de3 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,43 @@ +# Taken from https://github.com/andyli/HaxeCI/blob/master/appveyor.yml +version: "{build}" + +environment: + global: + HAXELIB_ROOT: C:\projects\haxelib + +install: + # http://help.appveyor.com/discussions/problems/5616-not-able-to-build-due-to-problem-in-chocolateyinstallps1 + - ps: Set-Service wuauserv -StartupType Manual + # Install the neko chocolatey package (https://chocolatey.org/packages/neko) + - cinst neko --version 2.3.0 -y + # Install the haxe chocolatey package (https://chocolatey.org/packages/haxe) + - cinst haxe --version 4.1.5 -y + - RefreshEnv + # Setup haxelib + - mkdir "%HAXELIB_ROOT%" + - haxelib setup "%HAXELIB_ROOT%" + # Download and setup a standalone flash player debugger + - haxe flash/install.hxml + # Install project dependencies + # `> log.txt || type log.txt` is for muting the output unless there is an error + - haxelib install lime 7.8.0 > log.txt || type log.txt && cmd /C exit 1 + - haxelib install openfl > log.txt || type log.txt && cmd /C exit 1 + - haxelib install flixel > log.txt || type log.txt && cmd /C exit 1 + - haxelib run lime setup flixel > log.txt || type log.txt && cmd /C exit 1 + - haxelib run lime setup > log.txt || type log.txt && cmd /C exit 1 + - haxelib install flixel-tools > log.txt || type log.txt && cmd /C exit 1 + - haxelib run flixel-tools setup > log.txt || type log.txt && cmd /C exit 1 + - haxelib install flixel-addons > log.txt || type log.txt && cmd /C exit 1 + - haxelib install flixel-ui > log.txt || type log.txt && cmd /C exit 1 + - haxelib install hscript > log.txt || type log.txt && cmd /C exit 1 + - haxelib install newgrounds > log.txt || type log.txt && cmd /C exit 1 + - haxelib install flixel-addons > log.txt || type log.txt && cmd /C exit 1 + - haxelib install faxe > log.txt || type log.txt && cmd /C exit 1 + - haxelib git polymod https://github.com/larsiusprime/polymod.git > log.txt || type log.txt && cmd /C exit 1 + - haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc > log.txt || type log.txt && cmd /C exit 1 + - haxelib list + +# No tests idk lol +build: + - lime build linux + - lime build windows From 5f5c8fea33be7687000fc6601eab237e4385b552 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 02:34:02 +0200 Subject: [PATCH 11/44] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 29f4de3..abd1f5e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,6 +38,6 @@ install: - haxelib list # No tests idk lol -build: +build_script: - lime build linux - lime build windows From d37e4efcf67ee5e889542dae72b686ea8573b1dd Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 02:36:04 +0200 Subject: [PATCH 12/44] Update appveyor.yml --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index abd1f5e..f5e0f69 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,8 +16,6 @@ install: # Setup haxelib - mkdir "%HAXELIB_ROOT%" - haxelib setup "%HAXELIB_ROOT%" - # Download and setup a standalone flash player debugger - - haxe flash/install.hxml # Install project dependencies # `> log.txt || type log.txt` is for muting the output unless there is an error - haxelib install lime 7.8.0 > log.txt || type log.txt && cmd /C exit 1 From a46370820db7f300e5f269cd3aadb7d5ebf16f0a Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 02:56:22 +0200 Subject: [PATCH 13/44] Update appveyor.yml --- appveyor.yml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f5e0f69..ce53140 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,22 +17,21 @@ install: - mkdir "%HAXELIB_ROOT%" - haxelib setup "%HAXELIB_ROOT%" # Install project dependencies - # `> log.txt || type log.txt` is for muting the output unless there is an error - - haxelib install lime 7.8.0 > log.txt || type log.txt && cmd /C exit 1 - - haxelib install openfl > log.txt || type log.txt && cmd /C exit 1 - - haxelib install flixel > log.txt || type log.txt && cmd /C exit 1 - - haxelib run lime setup flixel > log.txt || type log.txt && cmd /C exit 1 - - haxelib run lime setup > log.txt || type log.txt && cmd /C exit 1 - - haxelib install flixel-tools > log.txt || type log.txt && cmd /C exit 1 - - haxelib run flixel-tools setup > log.txt || type log.txt && cmd /C exit 1 - - haxelib install flixel-addons > log.txt || type log.txt && cmd /C exit 1 - - haxelib install flixel-ui > log.txt || type log.txt && cmd /C exit 1 - - haxelib install hscript > log.txt || type log.txt && cmd /C exit 1 - - haxelib install newgrounds > log.txt || type log.txt && cmd /C exit 1 - - haxelib install flixel-addons > log.txt || type log.txt && cmd /C exit 1 - - haxelib install faxe > log.txt || type log.txt && cmd /C exit 1 - - haxelib git polymod https://github.com/larsiusprime/polymod.git > log.txt || type log.txt && cmd /C exit 1 - - haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc > log.txt || type log.txt && cmd /C exit 1 + - haxelib install lime 7.8.0 + - haxelib install openfl + - haxelib install flixel + - haxelib run lime setup flixel + - haxelib run lime setup + - haxelib install flixel-tools + - haxelib run flixel-tools setup + - haxelib install flixel-addons + - haxelib install flixel-ui + - haxelib install hscript + - haxelib install newgrounds + - haxelib install flixel-addons + - haxelib install faxe + - haxelib git polymod https://github.com/larsiusprime/polymod.git + - haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc - haxelib list # No tests idk lol From 22394a30085ac56eeb47fcbcdb94313daf0c2470 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:12:00 +0200 Subject: [PATCH 14/44] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ce53140..ec99f00 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,7 +17,7 @@ install: - mkdir "%HAXELIB_ROOT%" - haxelib setup "%HAXELIB_ROOT%" # Install project dependencies - - haxelib install lime 7.8.0 + - haxelib install lime 7.9.0 - haxelib install openfl - haxelib install flixel - haxelib run lime setup flixel From 2dabc0d6b98f81491865cf933673258235b69782 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:17:16 +0200 Subject: [PATCH 15/44] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ec99f00..b2387fb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,7 +23,7 @@ install: - haxelib run lime setup flixel - haxelib run lime setup - haxelib install flixel-tools - - haxelib run flixel-tools setup + - haxelib run flixel-tools setup -y - haxelib install flixel-addons - haxelib install flixel-ui - haxelib install hscript From aa55c48036b23eeba609f580fa22672171cbc276 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:29:38 +0200 Subject: [PATCH 16/44] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b2387fb..c6cbea8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,7 +23,7 @@ install: - haxelib run lime setup flixel - haxelib run lime setup - haxelib install flixel-tools - - haxelib run flixel-tools setup -y + # haxelib run flixel-tools setup -y # Can't do this since it asks [y/n] even with -y argument! Stupid - haxelib install flixel-addons - haxelib install flixel-ui - haxelib install hscript From b75c4f259a8cfa819b180e25f1970b71f25594c8 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:35:22 +0200 Subject: [PATCH 17/44] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index c6cbea8..5f7db84 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,7 @@ install: - haxelib install hscript - haxelib install newgrounds - haxelib install flixel-addons - - haxelib install faxe + - haxelib git faxe https://github.com/uhrobots/faxe - haxelib git polymod https://github.com/larsiusprime/polymod.git - haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc - haxelib list From 3affe2a6a10700fe6d379bb4cb7c3dc8971c7efc Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:40:59 +0200 Subject: [PATCH 18/44] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5f7db84..b86147a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -36,5 +36,5 @@ install: # No tests idk lol build_script: - - lime build linux - - lime build windows + - haxelib run lime build linux + - haxelib run lime build windows From 572d1ddd01d3a3d3c01b8a78d16eac79b6373fbb Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:48:22 +0200 Subject: [PATCH 19/44] Update appveyor.yml --- appveyor.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index b86147a..b8532a7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,3 +38,12 @@ install: build_script: - haxelib run lime build linux - haxelib run lime build windows + +artifacts: + - path: export/release/linux + name: Linux release + type: zip + + - path: export/release/windows + name: Windows release + type: zip From 8af197ab19d597a6c31f5e7d7460551e335d5c1e Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 01:56:20 +0000 Subject: [PATCH 20/44] Change Discord stuff to only windows --- Project.xml | 2 +- source/Discord.hx | 4 +++- source/FreeplayState.hx | 4 ++-- source/GameplayCustomizeState.hx | 4 ++-- source/MainMenuState.hx | 4 ++-- source/MusicBeatState.hx | 2 ++ source/PlayState.hx | 20 ++++++++++---------- source/StoryMenuState.hx | 4 ++-- source/TitleState.hx | 7 +++++-- 9 files changed, 29 insertions(+), 22 deletions(-) diff --git a/Project.xml b/Project.xml index 08b9a5a..0de6121 100644 --- a/Project.xml +++ b/Project.xml @@ -116,7 +116,7 @@ - + diff --git a/source/Discord.hx b/source/Discord.hx index 5dc9c64..f48bf4b 100644 --- a/source/Discord.hx +++ b/source/Discord.hx @@ -1,3 +1,4 @@ +# if windows package; import Sys.sleep; @@ -84,4 +85,5 @@ class DiscordClient //trace('Discord RPC Updated. Arguments: $details, $state, $smallImageKey, $hasStartTimestamp, $endTimestamp'); } -} \ No newline at end of file +} +#end \ No newline at end of file diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 145f2fc..b7efe64 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -11,7 +11,7 @@ import flixel.util.FlxColor; import lime.utils.Assets; -#if desktop +#if windows import Discord.DiscordClient; #end @@ -53,7 +53,7 @@ class FreeplayState extends MusicBeatState } */ - #if desktop + #if windows // Updating Discord Rich Presence DiscordClient.changePresence("In the Menus", null); #end diff --git a/source/GameplayCustomizeState.hx b/source/GameplayCustomizeState.hx index 355691e..b3991c8 100644 --- a/source/GameplayCustomizeState.hx +++ b/source/GameplayCustomizeState.hx @@ -2,7 +2,7 @@ import flixel.math.FlxMath; import flixel.FlxCamera; import flixel.math.FlxPoint; import flixel.FlxObject; -#if desktop +#if windows import Discord.DiscordClient; import sys.thread.Thread; #end @@ -33,7 +33,7 @@ class GameplayCustomizeState extends MusicBeatState private var camHUD:FlxCamera; public override function create() { - #if desktop + #if windows // Updating Discord Rich Presence DiscordClient.changePresence("Customizing Gameplay", null); #end diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index f33ad95..0351715 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -14,7 +14,7 @@ import flixel.util.FlxColor; import io.newgrounds.NG; import lime.app.Application; -#if desktop +#if windows import Discord.DiscordClient; #end @@ -46,7 +46,7 @@ class MainMenuState extends MusicBeatState override function create() { - #if desktop + #if windows // Updating Discord Rich Presence DiscordClient.changePresence("In the Menus", null); #end diff --git a/source/MusicBeatState.hx b/source/MusicBeatState.hx index 3900654..29260f8 100644 --- a/source/MusicBeatState.hx +++ b/source/MusicBeatState.hx @@ -1,6 +1,8 @@ package; +#if windows import Discord.DiscordClient; +#end import flixel.tweens.FlxTween; import flixel.util.FlxColor; import openfl.Lib; diff --git a/source/PlayState.hx b/source/PlayState.hx index 415de42..aa54b97 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -40,7 +40,7 @@ import openfl.display.BlendMode; import openfl.display.StageQuality; import openfl.filters.ShaderFilter; -#if desktop +#if windows import Discord.DiscordClient; #end @@ -72,7 +72,7 @@ class PlayState extends MusicBeatState var songLength:Float = 0; - #if desktop + #if windows // Discord RPC variables var storyDifficultyText:String = ""; var iconRPC:String = ""; @@ -197,7 +197,7 @@ class PlayState extends MusicBeatState repPresses = 0; repReleases = 0; - #if desktop + #if windows // Making difficulty text for Discord Rich Presence. switch (storyDifficulty) { @@ -1192,7 +1192,7 @@ class PlayState extends MusicBeatState default: allowedToHeadbang = false; } - #if desktop + #if windows // Updating Discord Rich Presence (with Time Left) DiscordClient.changePresence(detailsText + " " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(), "\nAcc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses , iconRPC); #end @@ -1421,7 +1421,7 @@ class PlayState extends MusicBeatState vocals.pause(); } - #if desktop + #if windows DiscordClient.changePresence("PAUSED on " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(), "Acc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses , iconRPC); #end if (!startTimer.finished) @@ -1444,7 +1444,7 @@ class PlayState extends MusicBeatState startTimer.active = true; paused = false; - #if desktop + #if windows if (startTimer.finished) { DiscordClient.changePresence(detailsText + " " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(), "\nAcc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses, iconRPC, true, songLength - Conductor.songPosition); @@ -1469,7 +1469,7 @@ class PlayState extends MusicBeatState vocals.time = Conductor.songPosition; vocals.play(); - #if desktop + #if windows DiscordClient.changePresence(detailsText + " " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(), "\nAcc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses , iconRPC); #end } @@ -1655,7 +1655,7 @@ class PlayState extends MusicBeatState if (FlxG.keys.justPressed.SEVEN) { - #if desktop + #if windows DiscordClient.changePresence("Chart Editor", null, null, true); #end FlxG.switchState(new ChartingState()); @@ -1940,7 +1940,7 @@ class PlayState extends MusicBeatState openSubState(new GameOverSubstate(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y)); - #if desktop + #if windows // Game Over doesn't get his own variable because it's only used here DiscordClient.changePresence("GAME OVER -- " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(),"\nAcc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses , iconRPC); #end @@ -3111,7 +3111,7 @@ class PlayState extends MusicBeatState // yes this updates every step. // yes this is bad // but i'm doing it to update misses and accuracy - #if desktop + #if windows // Song duration in a float, useful for the time left feature songLength = FlxG.sound.music.length; diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index c2e1cb7..a7677a5 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -13,7 +13,7 @@ import flixel.util.FlxColor; import flixel.util.FlxTimer; import lime.net.curl.CURLCode; -#if desktop +#if windows import Discord.DiscordClient; #end @@ -74,7 +74,7 @@ class StoryMenuState extends MusicBeatState override function create() { - #if desktop + #if windows // Updating Discord Rich Presence DiscordClient.changePresence("In the Menus", null); #end diff --git a/source/TitleState.hx b/source/TitleState.hx index ec98454..e38e58e 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -24,8 +24,11 @@ import io.newgrounds.NG; import lime.app.Application; import openfl.Assets; -#if desktop +#if windows import Discord.DiscordClient; +#end + +#if desktop import sys.thread.Thread; #end @@ -59,7 +62,7 @@ class TitleState extends MusicBeatState PlayerSettings.init(); - #if desktop + #if windows DiscordClient.initialize(); Application.current.onExit.add (function (exitCode) { From 72da00469086bac82fbda56a0a88ba7b38ca1cf3 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 02:04:39 +0000 Subject: [PATCH 21/44] This Bitch said Invalid Character! --- source/Discord.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Discord.hx b/source/Discord.hx index f48bf4b..00018e7 100644 --- a/source/Discord.hx +++ b/source/Discord.hx @@ -1,6 +1,6 @@ -# if windows package; +#if windows import Sys.sleep; import discord_rpc.DiscordRpc; From 055d1439434277a421eeed9511fa4a37b731fc61 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 02:38:53 +0000 Subject: [PATCH 22/44] Do not fuck with me, I *WILL* cry. --- appveyor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index b8532a7..f6c747b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -47,3 +47,7 @@ artifacts: - path: export/release/windows name: Windows release type: zip + + - path: export/ + name: All exports + type: zip \ No newline at end of file From 523457b764deec749daebeeb41d765c48bd5e84b Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 02:45:10 +0000 Subject: [PATCH 23/44] Rename appveyor.yml to appveyor-windows.yml --- appveyor.yml => appveyor-windows.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename appveyor.yml => appveyor-windows.yml (100%) diff --git a/appveyor.yml b/appveyor-windows.yml similarity index 100% rename from appveyor.yml rename to appveyor-windows.yml From a9edb8bfc3acfc4a2fdf6e9f70ef0fd0cdf11572 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 02:55:34 +0000 Subject: [PATCH 24/44] Add appveyor-linux and remove linux stuff from appveyor-windows --- appveyor-linux.yml | 34 ++++++++++++++++++++++++++++++++++ appveyor-windows.yml | 10 +--------- 2 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 appveyor-linux.yml diff --git a/appveyor-linux.yml b/appveyor-linux.yml new file mode 100644 index 0000000..7743c8f --- /dev/null +++ b/appveyor-linux.yml @@ -0,0 +1,34 @@ +version: '{build}' +image: Ubuntu2004 +environment: + global: + HAXELIB_ROOT: ~/haxelib + +install: + - sudo add-apt-repository ppa:haxe/releases -y + - sudo apt-get update + - sudo apt-get install haxe -y + - mkdir %HAXELIB_ROOT% && haxelib setup %HAXELIB_ROOT% + - haxelib install lime 7.9.0 + - haxelib install openfl + - haxelib install flixel + - haxelib run lime setup flixel + - haxelib run lime setup + - haxelib install flixel-tools + - haxelib install flixel-addons + - haxelib install flixel-ui + - haxelib install hscript + - haxelib install newgrounds + - haxelib install flixel-addons + - haxelib git faxe https://github.com/uhrobots/faxe + - haxelib git polymod https://github.com/larsiusprime/polymod.git + - haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc + - haxelib list + +build_script: + - haxelib run lime build linux + +artifacts: +- path: export/release/linux + name: Linux release + type: zip \ No newline at end of file diff --git a/appveyor-windows.yml b/appveyor-windows.yml index f6c747b..7d9799b 100644 --- a/appveyor-windows.yml +++ b/appveyor-windows.yml @@ -36,18 +36,10 @@ install: # No tests idk lol build_script: - - haxelib run lime build linux - haxelib run lime build windows + # haxelib run lime build linux artifacts: - - path: export/release/linux - name: Linux release - type: zip - - path: export/release/windows name: Windows release - type: zip - - - path: export/ - name: All exports type: zip \ No newline at end of file From 013fca6760fd2005e9971fdd5a1ed7496114ddfc Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:00:35 +0000 Subject: [PATCH 25/44] I may be stupid --- appveyor-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index 7743c8f..ec7c225 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -8,7 +8,7 @@ install: - sudo add-apt-repository ppa:haxe/releases -y - sudo apt-get update - sudo apt-get install haxe -y - - mkdir %HAXELIB_ROOT% && haxelib setup %HAXELIB_ROOT% + - mkdir $HAXELIB_ROOT && haxelib setup $HAXELIB_ROOT - haxelib install lime 7.9.0 - haxelib install openfl - haxelib install flixel From 891e1aac073b2a746e33f477ea60635127948111 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:07:39 +0000 Subject: [PATCH 26/44] Update readme and appveyor-linux.yml --- README.md | 6 ++++++ appveyor-linux.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0cf321d..cd01fc5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,11 @@ +# daniel11420/Kade-Engine + The point of this fork of Kade-Engine is to build it with AppVeyor. Nothing else is changed. +Windows: [AppVeyor Project](https://ci.appveyor.com/project/daniel11420/kade-engine-windows) | [Artifacts (downloads)](https://ci.appveyor.com/project/daniel11420/kade-engine-windows/build/artifacts) + +Linux: [AppVeyor Project](https://ci.appveyor.com/project/daniel11420/kade-engine-linux) | [Artifacts (downloads)](https://ci.appveyor.com/project/daniel11420/kade-engine-linux/build/artifacts) + ![KadeEngineLogo](https://user-images.githubusercontent.com/26305836/110529589-4b4eb600-80ce-11eb-9c44-e899118b0bf0.png) **Download the latest release [here](https://github.com/KadeDev/Kade-Engine/releases/latest)** diff --git a/appveyor-linux.yml b/appveyor-linux.yml index ec7c225..08419e0 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -2,7 +2,7 @@ version: '{build}' image: Ubuntu2004 environment: global: - HAXELIB_ROOT: ~/haxelib + HAXELIB_ROOT: /home/appveyor/haxelib install: - sudo add-apt-repository ppa:haxe/releases -y From bc2b41c584a391e193173058c3220a8bffdaf169 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:26:13 +0000 Subject: [PATCH 27/44] crying. --- appveyor-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index 08419e0..59d6125 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -7,7 +7,7 @@ environment: install: - sudo add-apt-repository ppa:haxe/releases -y - sudo apt-get update - - sudo apt-get install haxe -y + - sudo apt-get install haxe-4.1.5 -y - mkdir $HAXELIB_ROOT && haxelib setup $HAXELIB_ROOT - haxelib install lime 7.9.0 - haxelib install openfl From fece9ed84eafabfa94e60fa92031a2c0d5249eb4 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:29:31 +0000 Subject: [PATCH 28/44] apt? is that a threat? --- appveyor-linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index 59d6125..555bf31 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -6,8 +6,8 @@ environment: install: - sudo add-apt-repository ppa:haxe/releases -y - - sudo apt-get update - - sudo apt-get install haxe-4.1.5 -y + - sudo apt update + - sudo apt install haxe=4.1.5 -y - mkdir $HAXELIB_ROOT && haxelib setup $HAXELIB_ROOT - haxelib install lime 7.9.0 - haxelib install openfl From ebd340ad655673ce7897d1822bbbdcf5c9d4e912 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:37:26 +0000 Subject: [PATCH 29/44] HAXE 4.1.5 BUT THIS TIME WIT DA BINARIES --- appveyor-linux.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index 555bf31..c14c3b5 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -3,12 +3,18 @@ image: Ubuntu2004 environment: global: HAXELIB_ROOT: /home/appveyor/haxelib + HAXE_INSTALLDIR: /home/appveyor/haxe install: + - cd /home/appveyor - sudo add-apt-repository ppa:haxe/releases -y - sudo apt update - - sudo apt install haxe=4.1.5 -y + - sudo apt install neko tar + - wget https://github.com/HaxeFoundation/haxe/releases/download/4.1.5/haxe-4.1.5-linux64.tar.gz + - mkdir $HAXE_INSTALLDIR + - tar -xf haxe-4.1.5-linux64.tar.gz -C $HAXE_INSTALLDIR - mkdir $HAXELIB_ROOT && haxelib setup $HAXELIB_ROOT + - export PATH=$PATH:$HAXE_INSTALLDIR - haxelib install lime 7.9.0 - haxelib install openfl - haxelib install flixel From eee873342c1b66a0c05fe7890b6bac99e9280e14 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:41:37 +0000 Subject: [PATCH 30/44] I FORGOT -y --- appveyor-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index c14c3b5..b16bb38 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -9,7 +9,7 @@ install: - cd /home/appveyor - sudo add-apt-repository ppa:haxe/releases -y - sudo apt update - - sudo apt install neko tar + - sudo apt install neko tar -y - wget https://github.com/HaxeFoundation/haxe/releases/download/4.1.5/haxe-4.1.5-linux64.tar.gz - mkdir $HAXE_INSTALLDIR - tar -xf haxe-4.1.5-linux64.tar.gz -C $HAXE_INSTALLDIR From 6ddb47bf301386d6d02c9bfaa7d8fe432af779a5 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:46:06 +0000 Subject: [PATCH 31/44] Why is there a Folder in the Tar --- appveyor-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index b16bb38..43469e4 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -12,7 +12,7 @@ install: - sudo apt install neko tar -y - wget https://github.com/HaxeFoundation/haxe/releases/download/4.1.5/haxe-4.1.5-linux64.tar.gz - mkdir $HAXE_INSTALLDIR - - tar -xf haxe-4.1.5-linux64.tar.gz -C $HAXE_INSTALLDIR + - tar -xf haxe-4.1.5-linux64.tar.gz -C $HAXE_INSTALLDIR/haxe_20201231082044_5e33a78aa - mkdir $HAXELIB_ROOT && haxelib setup $HAXELIB_ROOT - export PATH=$PATH:$HAXE_INSTALLDIR - haxelib install lime 7.9.0 From e8726cebac0a30f8dc04eb4b089f0310f7a64a7e Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 03:49:09 +0000 Subject: [PATCH 32/44] i am really dumb and this commit proves it --- appveyor-linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index 43469e4..241fb12 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -12,9 +12,9 @@ install: - sudo apt install neko tar -y - wget https://github.com/HaxeFoundation/haxe/releases/download/4.1.5/haxe-4.1.5-linux64.tar.gz - mkdir $HAXE_INSTALLDIR - - tar -xf haxe-4.1.5-linux64.tar.gz -C $HAXE_INSTALLDIR/haxe_20201231082044_5e33a78aa + - tar -xf haxe-4.1.5-linux64.tar.gz -C $HAXE_INSTALLDIR + - export PATH=$PATH:$HAXE_INSTALLDIR/haxe_20201231082044_5e33a78aa - mkdir $HAXELIB_ROOT && haxelib setup $HAXELIB_ROOT - - export PATH=$PATH:$HAXE_INSTALLDIR - haxelib install lime 7.9.0 - haxelib install openfl - haxelib install flixel From 4a692336b3c3d8cbd95b9f9eac1c456fcd2b5ee4 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 04:02:00 +0000 Subject: [PATCH 33/44] quite dumb, i am --- appveyor-linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index 241fb12..706ff1a 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -30,6 +30,7 @@ install: - haxelib git polymod https://github.com/larsiusprime/polymod.git - haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc - haxelib list + - cd /home/appveyor/projects/kade-engine-linux build_script: - haxelib run lime build linux From 3d35f7adff0108debd6988f0b9455d30ee9e40b0 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 04:39:22 +0000 Subject: [PATCH 34/44] remove Newgrounds --- source/Highscore.hx | 4 ++-- source/PlayState.hx | 2 +- source/TitleState.hx | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/Highscore.hx b/source/Highscore.hx index 5fbc732..044ffb6 100644 --- a/source/Highscore.hx +++ b/source/Highscore.hx @@ -17,7 +17,7 @@ class Highscore #if !switch - NGio.postScore(score, song); + //NGio.postScore(score, song); #end @@ -34,7 +34,7 @@ class Highscore { #if !switch - NGio.postScore(score, "Week " + week); + //NGio.postScore(score, "Week " + week); #end diff --git a/source/PlayState.hx b/source/PlayState.hx index aa54b97..efc2c39 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2099,7 +2099,7 @@ class PlayState extends MusicBeatState if (SONG.validScore) { - NGio.unlockMedal(60961); + //NGio.unlockMedal(60961); Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty); } diff --git a/source/TitleState.hx b/source/TitleState.hx index e38e58e..9d3458c 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -80,8 +80,8 @@ class TitleState extends MusicBeatState // NGio.noLogin(APIStuff.API); #if ng - var ng:NGio = new NGio(APIStuff.API, APIStuff.EncKey); - trace('NEWGROUNDS LOL'); + //var ng:NGio = new NGio(APIStuff.API, APIStuff.EncKey); + //trace('NEWGROUNDS LOL'); #end FlxG.save.bind('funkin', 'ninjamuffin99'); @@ -284,11 +284,11 @@ class TitleState extends MusicBeatState if (pressedEnter && !transitioning && skippedIntro) { #if !switch - NGio.unlockMedal(60960); + //NGio.unlockMedal(60960); // If it's Friday according to da clock - if (Date.now().getDay() == 5) - NGio.unlockMedal(61034); + //if (Date.now().getDay() == 5) + //NGio.unlockMedal(61034); #end titleText.animation.play('press'); From 0d704f2d3bfa978b842cf87a1c8fa387591d960a Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 05:08:36 +0000 Subject: [PATCH 35/44] test thing --- appveyor-linux.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index 706ff1a..de5fbf1 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -33,9 +33,10 @@ install: - cd /home/appveyor/projects/kade-engine-linux build_script: - - haxelib run lime build linux + # haxelib run lime build linux + - haxelib run lime test linux -debug artifacts: -- path: export/release/linux - name: Linux release +- path: export/ + name: Export type: zip \ No newline at end of file From 50a3a8726471520e54e7e6096df19ecf42061a91 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 05:17:38 +0000 Subject: [PATCH 36/44] Re-add newgrounds because that actually wasn't the problem and I am really quite dumb really for real --- source/Highscore.hx | 4 ++-- source/PlayState.hx | 2 +- source/TitleState.hx | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/Highscore.hx b/source/Highscore.hx index 044ffb6..5fbc732 100644 --- a/source/Highscore.hx +++ b/source/Highscore.hx @@ -17,7 +17,7 @@ class Highscore #if !switch - //NGio.postScore(score, song); + NGio.postScore(score, song); #end @@ -34,7 +34,7 @@ class Highscore { #if !switch - //NGio.postScore(score, "Week " + week); + NGio.postScore(score, "Week " + week); #end diff --git a/source/PlayState.hx b/source/PlayState.hx index efc2c39..aa54b97 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2099,7 +2099,7 @@ class PlayState extends MusicBeatState if (SONG.validScore) { - //NGio.unlockMedal(60961); + NGio.unlockMedal(60961); Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty); } diff --git a/source/TitleState.hx b/source/TitleState.hx index 9d3458c..e38e58e 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -80,8 +80,8 @@ class TitleState extends MusicBeatState // NGio.noLogin(APIStuff.API); #if ng - //var ng:NGio = new NGio(APIStuff.API, APIStuff.EncKey); - //trace('NEWGROUNDS LOL'); + var ng:NGio = new NGio(APIStuff.API, APIStuff.EncKey); + trace('NEWGROUNDS LOL'); #end FlxG.save.bind('funkin', 'ninjamuffin99'); @@ -284,11 +284,11 @@ class TitleState extends MusicBeatState if (pressedEnter && !transitioning && skippedIntro) { #if !switch - //NGio.unlockMedal(60960); + NGio.unlockMedal(60960); // If it's Friday according to da clock - //if (Date.now().getDay() == 5) - //NGio.unlockMedal(61034); + if (Date.now().getDay() == 5) + NGio.unlockMedal(61034); #end titleText.animation.play('press'); From 98e806cc9def9084d8a4c0823d20e85983081152 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 05:24:43 +0000 Subject: [PATCH 37/44] oops accidentally made ci run the game hehe --- appveyor-linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index de5fbf1..61d19ff 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -33,8 +33,8 @@ install: - cd /home/appveyor/projects/kade-engine-linux build_script: - # haxelib run lime build linux - - haxelib run lime test linux -debug + - haxelib run lime build linux + # haxelib run lime test linux -debug artifacts: - path: export/ From a3294ea2e81fb7535b2eb17dc21bfad18cff960a Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 05:35:53 +0000 Subject: [PATCH 38/44] i may be stupid --- appveyor-linux.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index 61d19ff..706ff1a 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -34,9 +34,8 @@ install: build_script: - haxelib run lime build linux - # haxelib run lime test linux -debug artifacts: -- path: export/ - name: Export +- path: export/release/linux + name: Linux release type: zip \ No newline at end of file From 45238551f290c949379e875ef7a1373bee0bd5ab Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 05:44:55 +0000 Subject: [PATCH 39/44] remove duplicate flixel-addons --- appveyor-linux.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index 706ff1a..c3e2d89 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -25,7 +25,6 @@ install: - haxelib install flixel-ui - haxelib install hscript - haxelib install newgrounds - - haxelib install flixel-addons - haxelib git faxe https://github.com/uhrobots/faxe - haxelib git polymod https://github.com/larsiusprime/polymod.git - haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc From 516047d4809eef99abcf95ee6714828bae997cca Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 06:07:48 +0000 Subject: [PATCH 40/44] Tar stuff --- appveyor-linux.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/appveyor-linux.yml b/appveyor-linux.yml index c3e2d89..bc3bed6 100644 --- a/appveyor-linux.yml +++ b/appveyor-linux.yml @@ -34,7 +34,9 @@ install: build_script: - haxelib run lime build linux +after_build: + - tar -cvf funkin-ke.tar -C /home/appveyor/projects/kade-engine-linux/export/release/linux/bin . + artifacts: -- path: export/release/linux - name: Linux release - type: zip \ No newline at end of file +- path: funkin-ke.tar + name: Linux build \ No newline at end of file From c1ff4ffaf001699733cdce0c608a5acd70b8e819 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 06:38:12 +0000 Subject: [PATCH 41/44] Change README for PR --- README.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index cd01fc5..3bb9a06 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,3 @@ -# daniel11420/Kade-Engine - -The point of this fork of Kade-Engine is to build it with AppVeyor. Nothing else is changed. - -Windows: [AppVeyor Project](https://ci.appveyor.com/project/daniel11420/kade-engine-windows) | [Artifacts (downloads)](https://ci.appveyor.com/project/daniel11420/kade-engine-windows/build/artifacts) - -Linux: [AppVeyor Project](https://ci.appveyor.com/project/daniel11420/kade-engine-linux) | [Artifacts (downloads)](https://ci.appveyor.com/project/daniel11420/kade-engine-linux/build/artifacts) - ![KadeEngineLogo](https://user-images.githubusercontent.com/26305836/110529589-4b4eb600-80ce-11eb-9c44-e899118b0bf0.png) **Download the latest release [here](https://github.com/KadeDev/Kade-Engine/releases/latest)** @@ -23,11 +15,20 @@ Linux: [AppVeyor Project](https://ci.appveyor.com/project/daniel11420/kade-engin This is the repository for Friday Night Funkin' Kade Engine, a game originally made for Ludum Dare 47 "Stuck In a Loop". And a completely reworked engine. +### Links to the original game Play the Ludum Dare prototype here: https://ninja-muffin24.itch.io/friday-night-funkin Play the Newgrounds one here: https://www.newgrounds.com/portal/view/770371 Support the project on the itch.io page: https://ninja-muffin24.itch.io/funkin +### Links to Kade Engine Mod Page: https://gamebanana.com/gamefiles/16761 + +Latest GitHub release: https://github.com/KadeDev/Kade-Engine/releases/latest + +AppVeyor CI (Automatic builds of the latest commit): +- Windows: [AppVeyor Project](https://ci.appveyor.com/project/daniel11420/kade-engine-windows) | [Artifacts (downloads)](https://ci.appveyor.com/project/daniel11420/kade-engine-windows/build/artifacts) + +- Linux: [AppVeyor Project](https://ci.appveyor.com/project/daniel11420/kade-engine-linux) | [Artifacts (downloads)](https://ci.appveyor.com/project/daniel11420/kade-engine-linux/build/artifacts) ## What is Kade Engine? From c4c7d8d6c0cd1336fd6f49dc4e477937cce3e8c7 Mon Sep 17 00:00:00 2001 From: daniel11420 <15311104+daniel11420@users.noreply.github.com> Date: Tue, 6 Apr 2021 07:04:49 +0000 Subject: [PATCH 42/44] Upload only "bin" folder for linux builds --- appveyor-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor-windows.yml b/appveyor-windows.yml index 7d9799b..801fd23 100644 --- a/appveyor-windows.yml +++ b/appveyor-windows.yml @@ -40,6 +40,6 @@ build_script: # haxelib run lime build linux artifacts: - - path: export/release/windows + - path: export/release/windows/bin name: Windows release type: zip \ No newline at end of file From fce30d38f0a59d88ca2c9e62d8e1190727b100df Mon Sep 17 00:00:00 2001 From: Kade M Date: Tue, 6 Apr 2021 00:23:49 -0700 Subject: [PATCH 43/44] update names --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3bb9a06..3ce98be 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,9 @@ Mod Page: https://gamebanana.com/gamefiles/16761 Latest GitHub release: https://github.com/KadeDev/Kade-Engine/releases/latest AppVeyor CI (Automatic builds of the latest commit): -- Windows: [AppVeyor Project](https://ci.appveyor.com/project/daniel11420/kade-engine-windows) | [Artifacts (downloads)](https://ci.appveyor.com/project/daniel11420/kade-engine-windows/build/artifacts) +- Windows: [AppVeyor Project](https://ci.appveyor.com/project/KadeDev/kade-engine-windows) | [Artifacts (downloads)](https://ci.appveyor.com/project/KadeDev/kade-engine-windows/build/artifacts) -- Linux: [AppVeyor Project](https://ci.appveyor.com/project/daniel11420/kade-engine-linux) | [Artifacts (downloads)](https://ci.appveyor.com/project/daniel11420/kade-engine-linux/build/artifacts) +- Linux: [AppVeyor Project](https://ci.appveyor.com/project/KadeDev/kade-engine-linux) | [Artifacts (downloads)](https://ci.appveyor.com/project/KadeDev0/kade-engine-linux/build/artifacts) ## What is Kade Engine? From ac4900190c0c9f2452e77fdfe6125737c90b9410 Mon Sep 17 00:00:00 2001 From: Kade M Date: Tue, 6 Apr 2021 01:05:41 -0700 Subject: [PATCH 44/44] fk --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ce98be..5a01629 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Latest GitHub release: https://github.com/KadeDev/Kade-Engine/releases/latest AppVeyor CI (Automatic builds of the latest commit): - Windows: [AppVeyor Project](https://ci.appveyor.com/project/KadeDev/kade-engine-windows) | [Artifacts (downloads)](https://ci.appveyor.com/project/KadeDev/kade-engine-windows/build/artifacts) -- Linux: [AppVeyor Project](https://ci.appveyor.com/project/KadeDev/kade-engine-linux) | [Artifacts (downloads)](https://ci.appveyor.com/project/KadeDev0/kade-engine-linux/build/artifacts) +- Linux: [AppVeyor Project](https://ci.appveyor.com/project/KadeDev/kade-engine-linux) | [Artifacts (downloads)](https://ci.appveyor.com/project/KadeDev/kade-engine-linux/build/artifacts) ## What is Kade Engine?