Skip to content

Commit 95e72c9

Browse files
committed
Fix Notes disappearing when putting high scroll speeds, and move asset forwarding to a Feature Flag.
Fixes #13
1 parent df58025 commit 95e72c9

File tree

3 files changed

+393
-393
lines changed

3 files changed

+393
-393
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
text=auto

Project.hxp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ class Project extends HXProject
3939
*/
4040
public final FUNKIN_GIT_DETAILS:FeatureFlag = 'FUNKIN_GIT_DETAILS';
4141

42+
/**
43+
* `-DFUNKIN_DOX_GENERATION`
44+
* Whether the game should forward its asset fetching to the root of the repository.
45+
* Developers can set this by checking the flag above.
46+
*/
47+
public final FUNKIN_ASSETS_FORWARDING:FeatureFlag = 'FUNKIN_DOX_GENERATION';
48+
4249
public var GIT_HASH:String = null;
4350

4451
public var GIT_BRANCH:String = null;
@@ -127,6 +134,7 @@ class Project extends HXProject
127134
FUNKIN_DISCORD_RPC.apply(this, platformType == DESKTOP && haxedefs.get('cpp')); // Will be enabled if its on desktop (windows, linux, mac)!
128135
FUNKIN_DOX_GENERATION.apply(this, false); // Will always be false unless you wanna make a documentation website.
129136
FUNKIN_GIT_DETAILS.apply(this, !['stable', 'main', 'master', null].contains(getGitBranch().toLowerCase())); // Will show if it isn't the main branch!
137+
FUNKIN_ASSETS_FORWARDING.apply(this, platformType == DESKTOP && debug);
130138
}
131139

132140
public function setupHaxelibs():Void
@@ -149,7 +157,7 @@ class Project extends HXProject
149157
public function setupHaxeDefines():Void
150158
{
151159
addHaxeDefine('doc-gen', FUNKIN_DOX_GENERATION.isEnabled(this));
152-
addHaxeDefine('FLX_CUSTOM_ASSETS_DIRECTORY', 'assets', platformType == DESKTOP && debug);
160+
addHaxeDefine('FLX_CUSTOM_ASSETS_DIRECTORY', 'assets', FUNKIN_ASSETS_FORWARDING.isEnabled(this));
153161
addHaxeDefine('FLX_NO_DEBUG', !debug);
154162
addHaxeDefine('FLX_NO_FOCUS_LOST_SCREEN');
155163
addHaxeDefine('FLX_NO_HEALTH');

0 commit comments

Comments
 (0)