From 4fae8bcad2bf4eaa38f30140da0dc28f8f077aca Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Fri, 9 Jun 2023 16:02:57 -0400 Subject: [PATCH 1/3] file renames... --- source/funkin/{MusicBeatSubstate.hx => MusicBeatSubState.hx} | 0 ...{ScriptedMusicBeatSubstate.hx => ScriptedMusicBeatSubState.hx} | 0 source/funkin/play/{GameOverSubstate.hx => GameOverSubState.hx} | 0 .../{StageOffsetSubstate.hx => StageOffsetSubState.hx} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename source/funkin/{MusicBeatSubstate.hx => MusicBeatSubState.hx} (100%) rename source/funkin/modding/base/{ScriptedMusicBeatSubstate.hx => ScriptedMusicBeatSubState.hx} (100%) rename source/funkin/play/{GameOverSubstate.hx => GameOverSubState.hx} (100%) rename source/funkin/ui/stageBuildShit/{StageOffsetSubstate.hx => StageOffsetSubState.hx} (100%) diff --git a/source/funkin/MusicBeatSubstate.hx b/source/funkin/MusicBeatSubState.hx similarity index 100% rename from source/funkin/MusicBeatSubstate.hx rename to source/funkin/MusicBeatSubState.hx diff --git a/source/funkin/modding/base/ScriptedMusicBeatSubstate.hx b/source/funkin/modding/base/ScriptedMusicBeatSubState.hx similarity index 100% rename from source/funkin/modding/base/ScriptedMusicBeatSubstate.hx rename to source/funkin/modding/base/ScriptedMusicBeatSubState.hx diff --git a/source/funkin/play/GameOverSubstate.hx b/source/funkin/play/GameOverSubState.hx similarity index 100% rename from source/funkin/play/GameOverSubstate.hx rename to source/funkin/play/GameOverSubState.hx diff --git a/source/funkin/ui/stageBuildShit/StageOffsetSubstate.hx b/source/funkin/ui/stageBuildShit/StageOffsetSubState.hx similarity index 100% rename from source/funkin/ui/stageBuildShit/StageOffsetSubstate.hx rename to source/funkin/ui/stageBuildShit/StageOffsetSubState.hx From 4daf6442846b58603f1cd13fda7a56af776be4d5 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Fri, 9 Jun 2023 16:03:45 -0400 Subject: [PATCH 2/3] ree --- source/funkin/modding/base/ScriptedMusicBeatSubState.hx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/source/funkin/modding/base/ScriptedMusicBeatSubState.hx b/source/funkin/modding/base/ScriptedMusicBeatSubState.hx index 5090bf2b4..7dab3d7dd 100644 --- a/source/funkin/modding/base/ScriptedMusicBeatSubState.hx +++ b/source/funkin/modding/base/ScriptedMusicBeatSubState.hx @@ -1,16 +1,8 @@ package funkin.modding.base; /** -<<<<<<< HEAD - * A script that can be tied to a MusicBeatSubstate. - * Create a scripted class that extends MusicBeatSubstate to use this. - */ -@:hscriptClass -class ScriptedMusicBeatSubstate extends funkin.MusicBeatSubstate implements HScriptedClass {} -======= * A script that can be tied to a MusicBeatSubState. * Create a scripted class that extends MusicBeatSubState to use this. */ @:hscriptClass class ScriptedMusicBeatSubState extends funkin.MusicBeatSubState implements HScriptedClass {} ->>>>>>> f73c34bcbea4289202f6ef90522808b211d1cf44 From c17d48f39e06c223fd31184f73c5dfbd201e3c43 Mon Sep 17 00:00:00 2001 From: Hazel Date: Mon, 12 Jun 2023 17:20:51 +0200 Subject: [PATCH 3/3] fix ci builds (#106) (common ravy W) * maybe fix html5 builds? * sudo apt -y i need to use debian based distros more dont i * also needs randr extensions * fuck it lets install all the x extensions and hope this is enough * libmesa is now libgl1-mesa * also needs alsa lib for sound man i love undocumented dependencies --- .github/workflows/build-shit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-shit.yml b/.github/workflows/build-shit.yml index 11cecd138..7115f2f6d 100644 --- a/.github/workflows/build-shit.yml +++ b/.github/workflows/build-shit.yml @@ -27,6 +27,7 @@ jobs: - uses: ./.github/actions/setup-haxeshit - name: Build game? run: | + sudo apt-get install -y libx11-dev libxinerama-dev libxrandr-dev libgl1-mesa-dev libgl-dev libxi-dev libxext-dev libasound2-dev haxelib run lime build html5 -debug --times ls - uses: ./.github/actions/upload-itch