Skip to content

Commit

Permalink
Merge branch 'develop-0.3.3' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ninjamuffin99 committed May 15, 2024
2 parents 37fc849 + e724373 commit 1befa9f
Show file tree
Hide file tree
Showing 9 changed files with 70 additions and 34 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "assets"]
path = assets
url = https://github.com/FunkinCrew/funkin.assets
url = https://github.com/FunkinCrew/Funkin-Assets-secret
[submodule "art"]
path = art
url = https://github.com/FunkinCrew/funkin.art
url = https://github.com/FunkinCrew/Funkin-Art-secret
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,24 @@ All notable changes will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.3.3] - 2024-05-14
### Changed
- Cleaned up some code in `PlayAnimationSongEvent.hx` (thanks BurgerBalls!)
### Fixed
- Fix Web Loading Bar (thanks lemz1!)
- Don't allow any more inputs when exiting freeplay (thanks gamerbros!)
- Fixed using mouse wheel to scroll on freeplay (thanks JugieNoob!)
- Fixed the reset's of the health icons, score, and notes when re-entering gameplay from gameover (thanks ImCodist!)
- Fixed the chart editor character selector's hitbox width (thanks MadBear422!)
- Fixed camera stutter once a wipe transition to the Main Menu completes (thanks ImCodist!)
- Fixed an issue where hold note would be invisible for a single frame (thanks ImCodist!)
- Fix tween accumulation on title screen when pressing Y multiple times (thanks TheGaloXx!)
- Fix for a game over easter egg so you don't accidentally exit it when viewing
- Fix a crash when querying FlxG.state in the crash handler
- Fix an issue where the Freeplay menu never displays 100% clear
- Chart debug key now properly returns you to the previous chart editor session if you were playtesting a chart (thanks nebulazorua!)
- Hopefully fixed Freeplay crashes on AMD gpu's

## [0.3.2] - 2024-05-03
### Added
- Added `,` and `.` keybinds to the Chart Editor. These place Focus Camera events at the playhead, for the opponent and player respectively.
Expand Down
2 changes: 1 addition & 1 deletion Project.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<project>
<!-- _________________________ Application Settings _________________________ -->
<app title="Friday Night Funkin'" file="Funkin" packageName="com.funkin.fnf" package="com.funkin.fnf" main="Main" version="0.3.2" company="ninjamuffin99" />
<app title="Friday Night Funkin'" file="Funkin" packageName="com.funkin.fnf" package="com.funkin.fnf" main="Main" version="0.3.3" company="ninjamuffin99" />
<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />

Expand Down
48 changes: 24 additions & 24 deletions docs/Funkin' Debug Hotkeys.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
# Funkin' Debug Hotkeys

`F4` (EVERYWHERE) - Leave Current State and move to Main Menu
`F5` (EVERYWHERE) - Hot Reload Data Files
Most of this functionality is only available on debug builds of the game!

`Y` (Title Screen) - WOAH
## Any State
- `F2`: ***OVERLAY***: Enables the Flixel debug overlay, which has partial support for scripting.
- `F3`: ***SCREENSHOT***: Takes a screenshot of the game and saves it to the local `screenshots` directory. Works outside of debug builds too!
- `F4`: ***EJECT***: Forcibly switch state to the Main Menu (with no extra transition). Useful if you're stuck in a level and you need to get out!
- `F5`: ***HOT RELOAD***: Forcibly reload the game's scripts and data files, then restart the current state. If any files in the `assets` folder have been modified, the game should process the changes for you! NOTE: Known bug, this does not reset song charts or song scripts, but it should reset everything else (such as stage layout data and character animation data).
- `CTRL-SHIFT-L`: ***FORCE CRASH***: Immediately crash the game with a detailed crash log and a stack trace.

`~` (Main Menu) - Access Debug Menu
## **Play State**
- `H`: ***HIDE UI***: Makes the user interface invisible. Works in Pause Menu, great for screenshots.
- `1`: ***END SONG***: Immediately ends the song and moves to Results Screen on Freeplay, or next song on Story Mode.
- `2`: ***GAIN HEALTH***: Debug function, add 10% to the player's health.
- `3`: ***LOSE HEALTH***: Debug function, subtract 5% to the player's health.
- `9`: NEATO!
- `PAGEUP` (MacOS: `Fn-Up`): ***FORWARDS TIME TRAVEL****: Move forward by 2 sections. Hold SHIFT to move forward by 20 sections instead.
- `PAGEDOWN` (MacOS: `Fn-Down`): ***BACKWARDS TIME TRAVEL****: Move backward by 2 sections. Hold SHIFT to move backward by 20 sections instead.

`U` (Play) - Open Stage Editor State
`H` (Play) - Show/Hide HUD
`1` (Play) - End Song
`2` (Play) - Add 10% Health
`3` (Play) - Subtract 5% Health
`7` (Play) - (NOT WORKING) Open Chart Editor
`8` (Play) - Open Animation Editor
`9` (Play) - (Easter Egg) Classic Health Icon
`PGUP`/`Fn+Up` (Play) - Skip Forward In Time
`PGDN`/`Fn+Down` (Play) - 🦃 That's right, we're going to go BACK IN TIME
## **Freeplay State**
- `F` (Freeplay Menu) - Move to Favorites
- `Q` (Freeplay Menu) - Back one category
- `E` (Freeplay Menu) - Forward one category

`F` (Freeplay Menu) - Move to Favorites
`P` (Freeplay Menu) - Switch to Pico (probably doesn't work)
`T` (Freeplay Menu) - Start typing in search bar
`Q` (Freeplay Menu) - Back one letter
`E` (Freeplay Menu) - Forward one letter
## **Title State**
- `Y` - WOAH

`Arrows` (Stage Editor) - Move Prop
`Ctrl-Z` (Stage Editor) - Undo
`Y` (Stage Editor) - Leave Stage Editor

`H` (Pause Menu) - Hide the Pause Menu UI (good for screenshots!)
## **Main Menu**
- `~`: ***DEBUG****: Opens a menu to access the Chart Editor and other work-in-progress editors. Rebindable in the options menu.
- `CTRL-ALT-SHIFT-W`: ***ALL ACCESS***: Unlocks all songs in Freeplay. Only available on debug builds.
15 changes: 14 additions & 1 deletion source/funkin/input/Controls.hx
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,14 @@ class Controls extends FlxActionSet
action.inputs[i].inputID = toAdd;
}
hasReplaced = true;
} else if (input.device == KEYBOARD && input.inputID == toAdd) {
// This key is already bound!
if (hasReplaced) {
// Remove the duplicate keybind, don't replace.
action.inputs.remove(input);
} else {
hasReplaced = true;
}
}
}

Expand Down Expand Up @@ -989,6 +997,7 @@ class Controls extends FlxActionSet
for (control in Control.createAll())
{
var inputs:Array<Int> = Reflect.field(data, control.getName());
inputs = inputs.unique();
if (inputs != null)
{
if (inputs.length == 0) {
Expand Down Expand Up @@ -1038,7 +1047,11 @@ class Controls extends FlxActionSet
var inputs = getInputsFor(control, device);
isEmpty = isEmpty && inputs.length == 0;

if (inputs.length == 0) inputs = [FlxKey.NONE];
if (inputs.length == 0) {
inputs = [FlxKey.NONE];
} else {
inputs = inputs.unique();
}

Reflect.setField(data, control.getName(), inputs);
}
Expand Down
4 changes: 3 additions & 1 deletion source/funkin/play/GameOverSubState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ class GameOverSubState extends MusicBeatSubState

var isChartingMode:Bool = false;

var mustNotExit:Bool = false;

var transparent:Bool;

static final CAMERA_ZOOM_DURATION:Float = 0.5;
Expand Down Expand Up @@ -240,7 +242,7 @@ class GameOverSubState extends MusicBeatSubState
}

// KEYBOARD ONLY: Return to the menu when pressing the assigned key.
if (controls.BACK)
if (controls.BACK && !mustNotExit)
{
blueballed = false;
PlayState.instance.deathCounter = 0;
Expand Down
6 changes: 3 additions & 3 deletions source/funkin/ui/freeplay/FreeplayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -733,8 +733,8 @@ class FreeplayState extends MusicBeatSubState
}
}

lerpScore = MathUtil.coolLerp(lerpScore, intendedScore, 0.2);
lerpCompletion = MathUtil.coolLerp(lerpCompletion, intendedCompletion, 0.9);
lerpScore = MathUtil.smoothLerp(lerpScore, intendedScore, elapsed, 0.5);
lerpCompletion = MathUtil.smoothLerp(lerpCompletion, intendedCompletion, elapsed, 0.5);

if (Math.isNaN(lerpScore))
{
Expand Down Expand Up @@ -899,7 +899,7 @@ class FreeplayState extends MusicBeatSubState
if (FlxG.mouse.wheel < 0)
{
dj.resetAFKTimer();
changeSelection(-Math.round(FlxG.mouse.wheel / 4));
changeSelection(-Math.round(FlxG.mouse.wheel / 8));
}
else if (FlxG.mouse.wheel > 0)
{
Expand Down
3 changes: 2 additions & 1 deletion source/funkin/ui/transition/LoadingState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ class LoadingState extends MusicBeatSubState
{
targetShit = FlxMath.remapToRange(callbacks.numRemaining / callbacks.length, 1, 0, 0, 1);

loadBar.setGraphicSize(Std.int(FlxG.width * targetShit), loadBar.height);
var lerpWidth:Int = Std.int(FlxMath.lerp(loadBar.width, FlxG.width * targetShit, 0.2));
loadBar.setGraphicSize(lerpWidth, loadBar.height);
loadBar.updateHitbox();
FlxG.watch.addQuick('percentage?', callbacks.numRemaining / callbacks.length);
}
Expand Down
4 changes: 3 additions & 1 deletion source/funkin/util/logging/CrashHandler.hx
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ class CrashHandler

fullContents += '\n';

fullContents += 'Flixel Current State: ${Type.getClassName(Type.getClass(FlxG.state))}\n';
var currentState = FlxG.state != null ? Type.getClassName(Type.getClass(FlxG.state)) : 'No state loaded';

fullContents += 'Flixel Current State: ${currentState}\n';

fullContents += '\n';

Expand Down

0 comments on commit 1befa9f

Please sign in to comment.