Skip to content

Commit b0ae99c

Browse files
Jamextreme140Jamextreme140
committed
Merge branch 'main' into stage-rewrite
2 parents 22e29a5 + 53d3b55 commit b0ae99c

19 files changed

Lines changed: 367 additions & 44 deletions

File tree

‎.github/workflows/macos.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,18 @@ jobs:
178178
cp -R intel/CodenameEngine.app CodenameEngine.app
179179
lipo -create "$INTEL/CodenameEngine" "$ARM/CodenameEngine" -output "$BIN/CodenameEngine"
180180
lipo -create "$INTEL/lime.ndll" "$ARM/lime.ndll" -output "$BIN/lime.ndll"
181+
- name: Tar files
182+
run: tar -zcvf CodenameEngine.tar.gz CodenameEngine.app
181183
- name: Uploading Universal Mac OS bundle (executable)
182184
uses: actions/upload-artifact@v7
183185
with:
184186
name: Codename Engine (Executable Only)
185187
path: CodenameEngine.app/Contents/MacOS/CodenameEngine
186-
- name: Uploading Universal Mac OS bundle
188+
- name: Uploading Universal Mac OS bundle (entire build)
187189
uses: actions/upload-artifact@v7
188190
with:
189191
name: Codename Engine
190-
path: CodenameEngine.app
192+
path: CodenameEngine.tar.gz
191193

192194
# didnt compile debug in the same job or github would have said that job wasn't completed until debug was done too (debug uploads are not essential)
193195
intel_debug_build:
@@ -357,9 +359,10 @@ jobs:
357359
cp -R intel/CodenameEngine.app CodenameEngine.app
358360
lipo -create "$INTEL/CodenameEngine" "$ARM/CodenameEngine" -output "$BIN/CodenameEngine"
359361
lipo -create "$INTEL/lime.ndll" "$ARM/lime.ndll" -output "$BIN/lime.ndll"
360-
- name: Uploading Universal Mac OS bundle
362+
- name: Tar files
363+
run: tar -zcvf CodenameEngine.tar.gz CodenameEngine.app
364+
- name: Uploading Universal Mac OS bundle (entire build)
361365
uses: actions/upload-artifact@v7
362366
with:
363367
name: Codename Engine Debug
364-
path: CodenameEngine.app
365-
368+
path: CodenameEngine.tar.gz

‎assets/data/characters/gf-car.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE codename-engine-character>
22
<character isPlayer="false" flipX="false" x="75" y="335" centercam="false" icon="gf" color="#A5004D">
3-
<anim name="danceLeft" anim="GF Dancing Beat Hair blowing CAR" fps="24" loop="false" x="0" y="0" indices="0..15" />
4-
<anim name="danceRight" anim="GF Dancing Beat Hair blowing CAR" fps="24" loop="false" x="0" y="0" indices="16..30" />
3+
<anim name="danceLeft" anim="GF Dancing Beat Hair blowing CAR" indices="0..15" />
4+
<anim name="danceRight" anim="GF Dancing Beat Hair blowing CAR" indices="16..30" />
55
</character>

‎assets/data/characters/gf-christmas.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<!DOCTYPE codename-engine-character>
22
<character x="115" y="325" sprite="gf-christmas" icon="gf" centercam="false" color="#A5004D">
3-
<anim name="danceLeft" anim="GF Dancing Beat" x="0" y="-9" fps="24" loop="false" indices="0..14"/>
4-
<anim name="danceRight" anim="GF Dancing Beat" x="0" y="-9" fps="24" loop="false" indices="15..30"/>
5-
<anim name="cheer" anim="GF Cheer" x="0" y="-9" fps="24" loop="false"/>
6-
<anim name="sad" anim="gf sad" x="-51" y="306" fps="24" loop="true" indices="0..12"/>
3+
<anim name="danceLeft" anim="GF Dancing Beat" y="-9" indices="0..14"/>
4+
<anim name="danceRight" anim="GF Dancing Beat" y="-9" indices="15..30"/>
5+
<anim name="cheer" anim="GF Cheer" y="-9"/>
6+
<anim name="sad" anim="gf sad" x="-51" y="306" loop="true" indices="0..12"/>
7+
<anim name="combo50" anim="GF Cheer" y="-9"/>
78
</character>

‎assets/data/characters/gf-pixel.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE codename-engine-character>
22
<character x="180" y="300" sprite="gf-pixel" scale="6" antialiasing="false" camx="180" camy="300" icon="gf-pixel" color="#C70660">
3-
<anim name="danceLeft" anim="GF IDLE" x="0" y="0" fps="24" loop="false" indices="0..14"/>
4-
<anim name="danceRight" anim="GF IDLE" x="0" y="0" fps="24" loop="false" indices="15..30"/>
3+
<anim name="danceLeft" anim="GF IDLE" indices="0..14"/>
4+
<anim name="danceRight" anim="GF IDLE" indices="15..30"/>
55
</character>

‎assets/data/characters/gf-tankmen.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE codename-engine-character>
22
<character sprite="gf-tankmen" icon="gf" centercam="false" color="#A5004D">
3-
<anim name="danceLeft" anim="GF Dancing at Gunpoint" x="0" y="0" fps="24" loop="false" indices="0..14"/>
4-
<anim name="danceRight" anim="GF Dancing at Gunpoint" x="0" y="0" fps="24" loop="false" indices="15..30"/>
5-
<anim name="dance-cutscene" anim="GF Dancing at Gunpoint" x="0" y="0" fps="24" loop="true"/>
3+
<anim name="danceLeft" anim="GF Dancing at Gunpoint" indices="0..14"/>
4+
<anim name="danceRight" anim="GF Dancing at Gunpoint" indices="15..30"/>
5+
<anim name="dance-cutscene" anim="GF Dancing at Gunpoint" loop="true"/>
66
<anim name="sad" anim="GF Crying at Gunpoint" x="-315" y="6" fps="24" loop="true" indices="0..12"/>
77
</character>

‎assets/data/characters/gf.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111
<anim name="hairFall" anim="GF Dancing Beat Hair Landing" indices="0..11"/>
1212
<anim name="scared" anim="GF FEAR " loop="true"/>
1313
<anim name="sad" anim="gf sad" x="-51" y="315" loop="true" indices="0..12"/>
14+
<anim name="combo50" anim="GF Cheer"/>
1415
</character>

‎assets/languages/en/Main.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@
6666

6767
<group name="Mods">
6868
<str id="mods.disableMods">Disable Mods</str>
69+
<str id="mods.modsTitle">Select a Mod</str>
70+
<str id="mods.addonsTitle">Toggle Addons</str>
71+
<str id="mods.addonsChanged">To apply addon changes, select a mod.</str>
6972
</group>
7073

7174
<group name="MainMenu">

‎source/funkin/backend/assets/ModsFolder.hx‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,29 @@ class ModsFolder {
9898
#end
9999
}
100100

101+
public static function getModConfig(mod:String):Map<String, Map<String, String>> {
102+
for (ext in Flags.ALLOWED_ZIP_EXTENSIONS) {
103+
var path = modsPath + mod + "." + ext;
104+
if (!FileSystem.exists(path))
105+
continue;
106+
107+
var zip = new SysZip(path);
108+
for (entry in zip.entries) {
109+
if (entry.fileName.toLowerCase() == "data/config/modpack.ini") {
110+
var bytes = zip.unzipEntry(entry);
111+
return IniUtil.parseString(bytes.getString(0, bytes.length));
112+
}
113+
}
114+
break; // theoretically once it finds a zip mod, it'll stop even if there's no config
115+
}
116+
117+
var filePath = modsPath + mod + "/data/config/modpack.ini";
118+
if (FileSystem.exists(filePath))
119+
return IniUtil.parseString(sys.io.File.getContent(filePath));
120+
121+
return [];
122+
}
123+
101124
public static function getModsList(?sortingOptions:ModSortingOptions):Array<String> {
102125
var mods:Array<String> = [];
103126
#if MOD_SUPPORT

‎source/funkin/backend/scripting/events/note/NoteHitEvent.hx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ final class NoteHitEvent extends CancellableEvent {
119119
* The attached healthIcon used distinction for icons amongst others
120120
*/
121121
public var healthIcon:HealthIcon;
122+
/**
123+
* Whenever anybody with a combo anim for your combo ought to play it (think GF's "combo50" anim).
124+
*/
125+
public var charsComboAnim:Null<Bool> = true;
122126

123127
/**
124128
* Prevents the default sing animation from being played.

‎source/funkin/backend/system/MainState.hx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ class MainState extends FlxState {
9696
if (Flags.ALLOWED_ZIP_EXTENSIONS.contains(Path.extension(addon))) addon = Path.withoutExtension(addon);
9797
else continue;
9898
}
99+
if (Options.disabledAddons.contains(addon)) continue;
99100

100101
var data:AddonInfo = {
101102
name: addon,

0 commit comments

Comments
 (0)