gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' into new-editors

Browse Source
This commit is contained in:
Ne_Eo
2024-07-26 04:47:10 +02:00
parent 315d5b9ecd 7607455f33
commit 7462babf0e
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/linux.yml
+1 -1
View File
@@ -36,7 +36,7 @@ jobs:
run: |
haxelib run lime build linux
- name: Tar files
run: tar -zcvf CodenameEngine.tar.gz export/release/linux/bin
run: tar -zcvf CodenameEngine.tar.gz -C export/release/linux/bin .
- name: Uploading artifact (entire build)
uses: actions/upload-artifact@v2
with:
.github/workflows/macos.yml
+1 -1
View File
@@ -33,7 +33,7 @@ jobs:
run: |
haxelib run lime build mac
- name: Tar files
run: tar -zcvf CodenameEngine.tar.gz export/release/macos/bin
run: tar -zcvf CodenameEngine.tar.gz -C export/release/macos/bin .
- name: Uploading artifact (entire build)
uses: actions/upload-artifact@v2
with:
source/funkin/backend/utils/DiscordUtil.hx
+1 -1
View File
@@ -309,7 +309,7 @@ class DiscordUtil
Logs.logText(")")
], INFO);
call("onReady", [errorCode, cast(finalMsg, String)]);
call("onDisconnected", [errorCode, cast(finalMsg, String)]);
}
private static function onError(errorCode:Int, message:cpp.ConstCharStar):Void
source/funkin/editors/charter/Charter.hx
+13 -6
View File
@@ -598,17 +598,24 @@ class Charter extends UIState {
updateWaveforms();
}
inline function isSoundLoaded(sound:FlxSound) {
@:privateAccess
return sound != null && sound._sound != null && sound._sound.length > 0;
}
public function updateWaveforms() {
var wavesToGenerate:Array<{name:String, sound:FlxSound}> = [
{name: "Inst.ogg", sound: FlxG.sound.music},
];
if (@:privateAccess vocals._sound != null) //for some reason Assets.exists returns true regardless if the file actually exists
var wavesToGenerate:Array<{name:String, sound:FlxSound}> = [];
if(isSoundLoaded(FlxG.sound.music))
wavesToGenerate.push({name: "Inst.ogg", sound: FlxG.sound.music});
if (PlayState.SONG.meta.needsVoices != false && isSoundLoaded(vocals))
wavesToGenerate.push({name: "Voices.ogg", sound: vocals});
for (strumLine in strumLines)
if (strumLine.vocals != null && strumLine.strumLine.vocalsSuffix != null && strumLine.strumLine.vocalsSuffix != "")
if (strumLine.vocals != null && strumLine.strumLine.vocalsSuffix != null && strumLine.strumLine.vocalsSuffix != "" && isSoundLoaded(strumLine.vocals))
wavesToGenerate.push({
name: 'Voices${strumLine.strumLine.vocalsSuffix}.ogg',
name: 'Voices${strumLine.strumLine.vocalsSuffix}.ogg',
sound: strumLine.vocals
});