Skip to content

Commit 14c81ef

Browse files
committed
Merge branch 'main' into repurpose-variants
2 parents 62f4819 + 8ba4199 commit 14c81ef

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.github/workflows/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: actions/upload-artifact@v4
3939
with:
4040
name: Codename Engine (Executable Only)
41-
path: export/release/macos/bin/CodenameEngine
41+
path: export/release/macos/bin/CodenameEngine.app/Contents/MacOS/CodenameEngine
4242
- name: Uploading artifact (entire build)
4343
uses: actions/upload-artifact@v4
4444
with:

project.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
title="Friday Night Funkin' - Codename Engine" main="funkin.backend.system.Main"
66
file="CodenameEngine" packageName="com.yoshman29.codenameengine"
77
package="com.yoshman29.codenameengine"
8-
version="1.0.1" company="Yoshman29" />
8+
version="1.0.1-rc2" company="Yoshman29" />
99

1010
<!--
1111
CHANGE THE SAVE PATH & NAME FOR YOUR MOD HERE!

source/funkin/backend/system/Flags.hx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,8 @@ class Flags {
269269
@:bypass public static var customFlags:Map<String, String> = [];
270270

271271
public static function loadFromData(flags:Map<String, String>, data:String) {
272+
WINDOW_TITLE_USE_MOD_NAME = false;
273+
272274
if (!(data.length > 0)) return;
273275
var res = IniUtil.parseString(data);
274276

@@ -286,7 +288,7 @@ class Flags {
286288
}
287289
}
288290

289-
if (!flags.exists("WINDOW_TITLE_USE_MOD_NAME")) WINDOW_TITLE_USE_MOD_NAME = !flags.exists('TITLE');
291+
if (!flags.exists("WINDOW_TITLE_USE_MOD_NAME")) WINDOW_TITLE_USE_MOD_NAME = !flags.exists('TITLE') && flags.exists('MOD_NAME');
290292
else WINDOW_TITLE_USE_MOD_NAME = parseBool(flags.get("WINDOW_TITLE_USE_MOD_NAME"));
291293

292294
flags.remove("WINDOW_TITLE_USE_MOD_NAME");

source/funkin/backend/system/updating/UpdateUtil.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class UpdateUtil {
6363
}
6464

6565
static function __checkForUpdates():UpdateCheckCallback {
66-
var curTag = 'v${Flags.VERSION}', error = false;
66+
var curTag = 'v' + (Flags.VERSION == null ? Application.current.meta.get('version') : Flags.VERSION), error = false;
6767
var newUpdates = __doReleaseFiltering(GitHub.getReleases(Flags.REPO_OWNER, Flags.REPO_NAME, (e) -> {
6868
error = true;
6969
}), curTag);

0 commit comments

Comments
 (0)