Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
aaea25bf1f |
+27
-3
@@ -19,7 +19,7 @@
|
|||||||
<!--Switch Export with Unique ApplicationID and Icon-->
|
<!--Switch Export with Unique ApplicationID and Icon-->
|
||||||
<set name="APP_ID" value="0x0100f6c013bbc000" />
|
<set name="APP_ID" value="0x0100f6c013bbc000" />
|
||||||
|
|
||||||
<!-- DO NOT REMOVE!! ALLOWS ME TO DO REGIONS LIKE IN C# AND KEEP CODE ORGANIZED. REMOVING IT WOULD BREAK THE ENGINE -->
|
<!-- DO NOT REMOVE!! -->
|
||||||
<haxedef name="REGION" />
|
<haxedef name="REGION" />
|
||||||
|
|
||||||
<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
|
<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
|
||||||
@@ -72,7 +72,11 @@
|
|||||||
|
|
||||||
<!-- Comment this out to prevent extending classes in hscript.
|
<!-- Comment this out to prevent extending classes in hscript.
|
||||||
Reduces compilation time at the cost of limited HScript flexibility. !-->
|
Reduces compilation time at the cost of limited HScript flexibility. !-->
|
||||||
<define name="CUSTOM_CLASSES" unless="STRIPPED_COMPILE" />
|
<define name="CUSTOM_CLASSES" unless="STRIPPED_COMPILE"/>
|
||||||
|
|
||||||
|
<!-- Comment this out to disable support for abstracts in hscript.
|
||||||
|
Reduces compilation time at the cost of limited HScript flexibility. !-->
|
||||||
|
<define name="HSCRIPT_ABSTRACT_SUPPORT" unless="STRIPPED_COMPILE"/>
|
||||||
|
|
||||||
<!-- Comment this out to disable multithreading !-->
|
<!-- Comment this out to disable multithreading !-->
|
||||||
<haxedef name="ALLOW_MULTITHREADING" unless="web || flash" />
|
<haxedef name="ALLOW_MULTITHREADING" unless="web || flash" />
|
||||||
@@ -115,6 +119,24 @@
|
|||||||
<!-- Disable a optimization, to allow reflection to use more functions -->
|
<!-- Disable a optimization, to allow reflection to use more functions -->
|
||||||
<define name="FLX_NO_GENERIC" />
|
<define name="FLX_NO_GENERIC" />
|
||||||
|
|
||||||
|
<!-- _______________________________ Display Server ______________________________ -->
|
||||||
|
|
||||||
|
<haxedef name="LIME_CMD" value="${project.command}"/>
|
||||||
|
<define name="LIME_DISPLAY" if="${project.command == update} || ${project.command == display} || display || display_details" />
|
||||||
|
<haxedef name="LIME_DISPLAY" if="LIME_DISPLAY" />
|
||||||
|
|
||||||
|
<section if="LIME_DISPLAY">
|
||||||
|
<!-- For display server -->
|
||||||
|
<undefine name="COMPILE_ALL_CLASSES" />
|
||||||
|
<unset name="COMPILE_ALL_CLASSES" />
|
||||||
|
|
||||||
|
<undefine name="HSCRIPT_ABSTRACT_SUPPORT" />
|
||||||
|
<unset name="HSCRIPT_ABSTRACT_SUPPORT" />
|
||||||
|
|
||||||
|
<undefine name="CUSTOM_CLASSES" />
|
||||||
|
<unset name="CUSTOM_CLASSES" />
|
||||||
|
</section>
|
||||||
|
|
||||||
<!-- _______________________________ Libraries ______________________________ -->
|
<!-- _______________________________ Libraries ______________________________ -->
|
||||||
|
|
||||||
<!-- KEEP BOTH OF THESE AS THERE ARE SOME PARTICULAR CASES! -->
|
<!-- KEEP BOTH OF THESE AS THERE ARE SOME PARTICULAR CASES! -->
|
||||||
@@ -172,7 +194,7 @@
|
|||||||
|
|
||||||
<!-- ______________________________ Haxedefines _____________________________ -->
|
<!-- ______________________________ Haxedefines _____________________________ -->
|
||||||
|
|
||||||
<haxeflag name="--macro" value="funkin.backend.system.macros.BuildInfo.printBuildInfo()" />
|
<haxeflag name="--macro" value="funkin.backend.system.macros.BuildInfo.printBuildInfo()" unless="display" />
|
||||||
|
|
||||||
<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />
|
<haxedef name="FLX_NO_FOCUS_LOST_SCREEN" />
|
||||||
|
|
||||||
@@ -219,8 +241,10 @@
|
|||||||
<haxeflag name="--macro" value="modchart.backend.macros.Macro.includeFiles()"/>
|
<haxeflag name="--macro" value="modchart.backend.macros.Macro.includeFiles()"/>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
||||||
<section if="COMPILE_ALL_CLASSES">
|
<section if="COMPILE_ALL_CLASSES">
|
||||||
<haxeflag name="-dce" value="no" />
|
<haxeflag name="-dce" value="no" />
|
||||||
|
|
||||||
<haxeflag name="--macro" value="funkin.backend.system.macros.Macros.addAdditionalClasses()" />
|
<haxeflag name="--macro" value="funkin.backend.system.macros.Macros.addAdditionalClasses()" />
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|||||||
@@ -374,6 +374,10 @@ class FunkinSprite extends FlxAnimate implements IBeatReceiver implements IOffse
|
|||||||
|
|
||||||
super.prepareDrawMatrix(matrix, camera);
|
super.prepareDrawMatrix(matrix, camera);
|
||||||
|
|
||||||
|
applyZoomFactor(matrix, camera);
|
||||||
|
}
|
||||||
|
|
||||||
|
function applyZoomFactor(matrix:FlxMatrix, camera:FlxCamera) {
|
||||||
if(__shouldDoZoomFactor()) {
|
if(__shouldDoZoomFactor()) {
|
||||||
__prepareZoomFactor(_rect2, camera);
|
__prepareZoomFactor(_rect2, camera);
|
||||||
matrix.setTo(
|
matrix.setTo(
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ class AliasMacro {
|
|||||||
}];
|
}];
|
||||||
|
|
||||||
public static function build():Array<Field> {
|
public static function build():Array<Field> {
|
||||||
#if display
|
#if LIME_DISPLAY
|
||||||
return Context.getBuildFields();
|
return Context.getBuildFields();
|
||||||
#end
|
#end
|
||||||
|
|
||||||
|
|||||||
@@ -19,9 +19,9 @@ class DefinesMacro {
|
|||||||
|
|
||||||
// INTERNAL MACROS
|
// INTERNAL MACROS
|
||||||
#if REGION
|
#if REGION
|
||||||
private static macro function __getDefines() {
|
private static macro function __getDefines():Expr {
|
||||||
#if display
|
#if display
|
||||||
return macro $v{[]};
|
return macro $v{([]:Map<String, Dynamic>)};
|
||||||
#else
|
#else
|
||||||
return macro $v{Context.getDefines()};
|
return macro $v{Context.getDefines()};
|
||||||
#end
|
#end
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ class GitCommitMacro {
|
|||||||
// INTERNAL MACROS
|
// INTERNAL MACROS
|
||||||
#if REGION
|
#if REGION
|
||||||
private static macro function __getCommitHash() {
|
private static macro function __getCommitHash() {
|
||||||
#if display
|
#if LIME_DISPLAY
|
||||||
return macro $v{"-"};
|
return macro $v{"-"};
|
||||||
#else
|
#else
|
||||||
try {
|
try {
|
||||||
@@ -78,7 +78,7 @@ class GitCommitMacro {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static macro function __getCommitNumber() {
|
private static macro function __getCommitNumber() {
|
||||||
#if display
|
#if LIME_DISPLAY
|
||||||
return macro $v{0};
|
return macro $v{0};
|
||||||
#else
|
#else
|
||||||
try {
|
try {
|
||||||
@@ -92,7 +92,7 @@ class GitCommitMacro {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static macro function __getCommitHashLong() {
|
private static macro function __getCommitHashLong() {
|
||||||
#if display
|
#if LIME_DISPLAY
|
||||||
return macro $v{"-"};
|
return macro $v{"-"};
|
||||||
#else
|
#else
|
||||||
try {
|
try {
|
||||||
@@ -106,7 +106,7 @@ class GitCommitMacro {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static macro function __getCommitMessage() {
|
private static macro function __getCommitMessage() {
|
||||||
#if display
|
#if LIME_DISPLAY
|
||||||
return macro $v{"-"};
|
return macro $v{"-"};
|
||||||
#else
|
#else
|
||||||
try {
|
try {
|
||||||
@@ -124,7 +124,7 @@ class GitCommitMacro {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static macro function __getCommitAuthor() {
|
private static macro function __getCommitAuthor() {
|
||||||
#if display
|
#if LIME_DISPLAY
|
||||||
return macro $v{"-"};
|
return macro $v{"-"};
|
||||||
#else
|
#else
|
||||||
try {
|
try {
|
||||||
@@ -138,8 +138,8 @@ class GitCommitMacro {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static macro function __getCommitDate() {
|
private static macro function __getCommitDate() {
|
||||||
#if display
|
#if LIME_DISPLAY
|
||||||
return macro $v{Date.now()};
|
return macro Date.now();
|
||||||
#else
|
#else
|
||||||
try {
|
try {
|
||||||
// get the time in UTC format
|
// get the time in UTC format
|
||||||
@@ -164,7 +164,7 @@ class GitCommitMacro {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static macro function __getCurrentBranch() {
|
private static macro function __getCurrentBranch() {
|
||||||
#if display
|
#if LIME_DISPLAY
|
||||||
return macro $v{"-"};
|
return macro $v{"-"};
|
||||||
#else
|
#else
|
||||||
try {
|
try {
|
||||||
@@ -179,7 +179,7 @@ class GitCommitMacro {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static macro function __getHasUncommittedChanges() {
|
private static macro function __getHasUncommittedChanges() {
|
||||||
#if display
|
#if LIME_DISPLAY
|
||||||
return macro $v{false};
|
return macro $v{false};
|
||||||
#else
|
#else
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
package funkin.game;
|
package funkin.game;
|
||||||
|
|
||||||
import sys.FileSystem;
|
|
||||||
import flixel.util.FlxSpriteUtil;
|
import flixel.util.FlxSpriteUtil;
|
||||||
import openfl.display.Graphics;
|
import openfl.display.Graphics;
|
||||||
import flixel.util.typeLimit.OneOfTwo;
|
import flixel.util.typeLimit.OneOfTwo;
|
||||||
@@ -90,6 +89,8 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
|
|||||||
scripts.call("create");
|
scripts.call("create");
|
||||||
buildCharacter(xml);
|
buildCharacter(xml);
|
||||||
scripts.call("postCreate");
|
scripts.call("postCreate");
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@:noCompletion var __swappedLeftRightAnims:Bool = false;
|
@:noCompletion var __swappedLeftRightAnims:Bool = false;
|
||||||
@@ -158,9 +159,9 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
|
|||||||
if (event.cancelled) return;
|
if (event.cancelled) return;
|
||||||
|
|
||||||
if (isDanceLeftDanceRight)
|
if (isDanceLeftDanceRight)
|
||||||
playAnim(((danced = !danced) ? 'danceLeft' : 'danceRight') + idleSuffix, DANCE);
|
playAnim(((danced = !danced) ? 'danceLeft' : 'danceRight') + idleSuffix, false, DANCE);
|
||||||
else
|
else
|
||||||
playAnim('idle' + idleSuffix, DANCE);
|
playAnim('idle' + idleSuffix, false, DANCE);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function tryDance() {
|
public function tryDance() {
|
||||||
|
|||||||
Reference in New Issue
Block a user