Skip to content
Merged

Dev #85

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ on:

env:
APP_VERSION: 4.0.0-${{ github.run_id }}
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true

jobs:
# ╔═══════════════════════════════════════════════════════════════════╗
Expand Down Expand Up @@ -155,7 +156,7 @@ jobs:
steps:
- uses: actions/checkout@v6.0.2

- uses: krdlab/setup-haxe@v2.0.2
- uses: sirthegamercoder/setup-haxe@master
with:
haxe-version: 4.3.7

Expand Down Expand Up @@ -193,7 +194,7 @@ jobs:
steps:
- uses: actions/checkout@v6.0.2

- uses: krdlab/setup-haxe@v2.0.2
- uses: sirthegamercoder/setup-haxe@master
with:
haxe-version: 4.3.7

Expand Down Expand Up @@ -244,7 +245,7 @@ jobs:
steps:
- uses: actions/checkout@v6.0.2

- uses: krdlab/setup-haxe@v2.0.2
- uses: sirthegamercoder/setup-haxe@master
with:
haxe-version: 4.3.7

Expand Down Expand Up @@ -280,7 +281,7 @@ jobs:
steps:
- uses: actions/checkout@v6.0.2

- uses: krdlab/setup-haxe@v2.0.2
- uses: sirthegamercoder/setup-haxe@master
with:
haxe-version: 4.3.7

Expand Down Expand Up @@ -329,7 +330,7 @@ jobs:
steps:
- uses: actions/checkout@v6.0.2

- uses: krdlab/setup-haxe@v2.0.2
- uses: sirthegamercoder/setup-haxe@master
with:
haxe-version: 4.3.7

Expand Down Expand Up @@ -370,7 +371,7 @@ jobs:
steps:
- uses: actions/checkout@v6.0.2

- uses: krdlab/setup-haxe@v2.0.2
- uses: sirthegamercoder/setup-haxe@master
with:
haxe-version: 4.3.7

Expand All @@ -383,14 +384,14 @@ jobs:
- name: Setup Android SDK
uses: amyu/setup-android@v5.5
with:
sdk-version: 35
build-tools-version: 35.0.0
sdk-version: 36
build-tools-version: 36.0.0
ndk-version: 27.3.13750724
generate-job-summary: false

- name: Install SDK components
run: |
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platforms;android-35" "build-tools;35.0.0" "ndk;27.3.13750724" "cmdline-tools;latest"
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platforms;android-36" "build-tools;36.0.0" "ndk;27.3.13750724" "cmdline-tools;latest"
- name: Install Haxelib
run: |
Expand Down Expand Up @@ -443,7 +444,7 @@ jobs:
steps:
- uses: actions/checkout@v6.0.2

- uses: krdlab/setup-haxe@v2.0.2
- uses: sirthegamercoder/setup-haxe@master
with:
haxe-version: 4.3.7

Expand Down
4 changes: 3 additions & 1 deletion Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project>
<!-- _________________________ Application Settings _________________________ -->

<app title="Friday Night Funkin': Plus Engine" file="PlusEngine" packageName="com.leninasto.plusengine" package="com.leninasto.plusengine" main="Main" version="1.2.5" company="LeninAsto" />
<app title="Friday Night Funkin': Plus Engine" file="PlusEngine" packageName="com.leninasto.plusengine" package="com.leninasto.plusengine" main="Main" version="1.2.7" company="LeninAsto" />
<app title="FNF: Plus Engine" if="android" />

<!--Switch Export with Unique ApplicationID and Icon-->
Expand Down Expand Up @@ -191,6 +191,8 @@

<!--Enable this for Nape release builds for a serious peformance improvement-->
<haxedef name="NAPE_RELEASE_BUILD" unless="debug" />

<haxeflag name="-D" value="HXCPP_GC_BIG_BLOCKS" />

<!--Used for crash handler-->
<section if="cpp">
Expand Down
4 changes: 2 additions & 2 deletions README.es-LA.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ relájate — el progreso no espera.
Necesitas tener:

- Android Build Tools / Android Command Line Tools
- Android SDK 35
- Android SDK 36
- Android NDK r27d
- Java JDK 17
- Java JDK 21

# Características después de 1.0.4

Expand Down
4 changes: 2 additions & 2 deletions README.id-ID.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ tenang — kemajuan tidak menunggu.
Anda memerlukan:

- Android Build Tools / Android Command Line Tools
- Android SDK 35
- Android SDK 36
- Android NDK r27d
- Java JDK 17
- Java JDK 21

# Fitur-fitur setelah 1.0.4

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ relax — progress doesn’t wait.
You need to have:

- Android Build Tools / Android Command Line Tools
- Android SDK 35
- Android SDK 36
- Android NDK r27d
- Java JDK 17
- Java JDK 21

# Features after 1.0.4

Expand Down
3 changes: 3 additions & 0 deletions assets/base_game/shared/data/spaghetti/metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"albumId": "spaghetti"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/sounds/FadeTransition.mp3
Binary file not shown.
Binary file added assets/shared/sounds/FadeTransition.ogg
Binary file not shown.
13 changes: 6 additions & 7 deletions gitChangelog.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
- SScript is dead; many checks have been added to HScript for mods in both 0.7.3 and 1.0.4
- Fixed a bug that prevented the Alphabet from loading on mobile
- Fixed a crash on mobile when starting the game due to incorrect assets (uninstalling and reinstalling is required)
- Fixed a bug in the Character Editor that caused a crash when importing a Texture Atlas
- Re-added controls in freeplay mode to allow normal navigation; previously, the list could not be moved
- Some hardcoded events have been removed
- Improved Hibox Arrows on mobile
- New user interface for FreeplayState .
- Fixed storage errors on Android that caused unexpected game crashes and prevented files from being copied to their correct folders.
- Created a native file manager for Android users, allowing them to access game files without connecting their device to a PC.
- Added a new native dropdown menu for Android users, replacing the PsychUIDropdownMenu logic, which was somewhat difficult to manage on Android.
- Added several older options and more.
- Please report any bugs. Until next time.
2 changes: 1 addition & 1 deletion gitVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.6
1.2.7
23 changes: 22 additions & 1 deletion source/funkin/Preferences.hx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import funkin.ui.title.TitleState;
public var middleScroll:Bool = false;
public var opponentStrums:Bool = true;
public var showFPS:Bool = true;
public var vsync:Bool = false;
public var fpsDebugLevel:Int = 0; // FPSCounter debug level (persistent)
public var showWatermark:Bool = false;
public var flashing:Bool = true;
Expand All @@ -65,13 +66,16 @@ import funkin.ui.title.TitleState;
public var hideSustainSplash:Bool = false;
public var showKeyViewer:Bool = false;
public var iconBounceType:String = 'Default';
public var judgementCounter:Bool = true;
public var judgementCounter:Bool = false;
public var showCombo:Bool = true;
public var comboInGame:Bool = false;
public var useFreakyFont:Bool = false;
public var showStateInFPS:Bool = true;
public var showEndCountdown:Bool = false; // Enables/disables the end countdown
public var endCountdownSeconds:Int = 10; // End countdown seconds (10-30)
#if android
public var useNativeWavyTimebar:Bool = false;
#end

// ========== Modchart Config Options ==========
// Camera & 3D Settings
Expand Down Expand Up @@ -112,9 +116,12 @@ import funkin.ui.title.TitleState;
public var timeBarType:String = 'Time Left';
public var shadedTimeBar:Bool = false;
public var scoreZoom:Bool = true;
public var timeBump:Bool = false;
public var noReset:Bool = false;
public var healthBarAlpha:Float = 1;
public var smoothHealthBar:Bool = true;
public var smoothHPBug:Bool = false;
public var usePsychScoreText:Bool = true;
public var hitsoundVolume:Float = 0;
public var hitSounds:String = "None";
public var hitsoundType:String = "None";
Expand All @@ -141,6 +148,7 @@ import funkin.ui.title.TitleState;
'instakill' => false,
'practice' => false,
'botplay' => false,
'opponentdrain' => false, // JS Engine-style: opponent note hits drain player health
'opponentplay' => false,
'perfect' => false, // Perfect Mode - insta-kill on any judgement below Sick
'nodroppenalty' => false // Hold drops don't cause misses
Expand All @@ -160,6 +168,7 @@ import funkin.ui.title.TitleState;
public var loadingScreen:Bool = true;
public var language:String = 'en-US';
public var abbreviateScore:Bool = true;
public var newfreeplay:Bool = true;
public var heavyCharts:Bool = false; // Heavy Charts Mode for heavy charts
public var vanillaTransition:Bool = false; // Use vanilla Psych Engine transition instead of custom

Expand Down Expand Up @@ -346,6 +355,18 @@ class Preferences {
FlxG.drawFramerate = data.framerate;
}

#if (!html5 && !switch)
try
{
if (FlxG.stage != null && FlxG.stage.application != null && FlxG.stage.application.window != null)
Reflect.setProperty(FlxG.stage.application.window, 'vsync', data.vsync);
}
catch (e:Dynamic)
{
// Some targets may not expose window vsync.
}
#end

if(FlxG.save.data.gameplaySettings != null)
{
var savedMap:Map<String, Dynamic> = FlxG.save.data.gameplaySettings;
Expand Down
Loading