1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-28 15:57:42 +00:00

Merge branch 'master' into bugfix/attract-screen

This commit is contained in:
Cameron Taylor 2023-08-15 22:27:02 -04:00
commit 2495a71fe6
2 changed files with 4 additions and 2 deletions

View file

@ -51,7 +51,7 @@ jobs:
- uses: ./.github/actions/setup-haxeshit
- name: Build game
run: |
haxelib run lime build windows -debug
haxelib run lime build windows -debug -DNO_REDIRECT_ASSETS_FOLDER
dir
- uses: ./.github/actions/upload-itch
with:

View file

@ -181,7 +181,8 @@
<!-- pretends that the saved session Id was expired, forcing the reconnect prompt -->
<!-- <haxedef name="NG_FORCE_EXPIRED_SESSION" if="debug" /> -->
</section>
<section if="debug">
<section if="debug" unless="NO_REDIRECT_ASSETS_FOLDER || html5">
<!--
Use the parent assets folder rather than the exported one
No more will we accidentally undo our changes!
@ -189,6 +190,7 @@
-->
<haxedef name="REDIRECT_ASSETS_FOLDER" />
</section>
<!-- <prebuild haxe="trace('prebuilding');"/> -->
<!-- <postbuild haxe="art/Postbuild.hx"/> -->
<!-- <config:ios allow-provisioning-updates="true" team-id="" /> -->