mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-08-20 07:25:59 +00:00
Merge branch 'rewrite/master' into feature/chart-editor-backup-popup
This commit is contained in:
commit
dbaaf639ac
15
.github/workflows/build-shit.yml
vendored
15
.github/workflows/build-shit.yml
vendored
|
@ -5,11 +5,14 @@ on:
|
|||
|
||||
jobs:
|
||||
check_date:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: [self-hosted, linux]
|
||||
container: ubuntu:latest
|
||||
name: Check latest commit
|
||||
outputs:
|
||||
should_run: ${{ steps.should_run.outputs.should_run }}
|
||||
steps:
|
||||
- name: ensure git cli is installed
|
||||
run: apt update && apt install sudo git -y
|
||||
- uses: actions/checkout@v3
|
||||
- name: print latest_commit
|
||||
run: echo ${{ github.sha }}
|
||||
|
@ -21,8 +24,15 @@ jobs:
|
|||
create-nightly-html5:
|
||||
needs: check_date
|
||||
if: ${{ needs.check_date.outputs.should_run != 'false'}}
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: [self-hosted, linux]
|
||||
container: ubuntu:latest
|
||||
steps:
|
||||
- name: prepare container
|
||||
run: |
|
||||
apt update
|
||||
apt install sudo git curl unzip -y
|
||||
echo $GITHUB_WORKSPACE
|
||||
git config --global --add safe.directory $GITHUB_WORKSPACE
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
|
@ -30,7 +40,6 @@ jobs:
|
|||
- uses: ./.github/actions/setup-haxeshit
|
||||
- name: Build game
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y libx11-dev xorg-dev libgl-dev libxi-dev libxext-dev libasound2-dev libxinerama-dev libxrandr-dev libgl1-mesa-dev
|
||||
haxelib run lime build html5 -release --times
|
||||
ls
|
||||
|
|
|
@ -7,6 +7,7 @@ import funkin.ui.MusicBeatSubState;
|
|||
import funkin.ui.TextMenuList;
|
||||
import funkin.ui.debug.charting.ChartEditorState;
|
||||
import funkin.ui.MusicBeatSubState;
|
||||
import funkin.util.logging.CrashHandler;
|
||||
|
||||
class DebugMenuSubState extends MusicBeatSubState
|
||||
{
|
||||
|
@ -50,7 +51,9 @@ class DebugMenuSubState extends MusicBeatSubState
|
|||
createItem("ANIMATION EDITOR", openAnimationEditor);
|
||||
createItem("STAGE EDITOR", openStageEditor);
|
||||
createItem("TEST STICKERS", testStickers);
|
||||
|
||||
#if sys
|
||||
createItem("OPEN CRASH LOG FOLDER", openLogFolder);
|
||||
#end
|
||||
FlxG.camera.focusOn(new FlxPoint(camFocusPoint.x, camFocusPoint.y));
|
||||
FlxG.camera.focusOn(new FlxPoint(camFocusPoint.x, camFocusPoint.y + 500));
|
||||
}
|
||||
|
@ -101,6 +104,22 @@ class DebugMenuSubState extends MusicBeatSubState
|
|||
trace('Stage Editor');
|
||||
}
|
||||
|
||||
#if sys
|
||||
function openLogFolder()
|
||||
{
|
||||
#if windows
|
||||
Sys.command('explorer', [CrashHandler.LOG_FOLDER]);
|
||||
#elseif mac
|
||||
// mac could be fuckie with where the log folder is relative to the game file...
|
||||
// if this comment is still here... it means it has NOT been verified on mac yet!
|
||||
Sys.command('open', [CrashHandler.LOG_FOLDER]);
|
||||
#end
|
||||
|
||||
// TODO: implement linux
|
||||
// some shit with xdg-open :thinking: emoji...
|
||||
}
|
||||
#end
|
||||
|
||||
function exitDebugMenu()
|
||||
{
|
||||
// TODO: Add a transition?
|
||||
|
|
|
@ -3466,13 +3466,14 @@ class ChartEditorState extends HaxeUIState
|
|||
gridGhostHoldNote.noteData = gridGhostNote.noteData;
|
||||
gridGhostHoldNote.noteDirection = gridGhostNote.noteData.getDirection();
|
||||
|
||||
gridGhostHoldNote.setHeightDirectly(dragLengthPixels);
|
||||
gridGhostHoldNote.setHeightDirectly(dragLengthPixels, true);
|
||||
|
||||
gridGhostHoldNote.updateHoldNotePosition(renderedHoldNotes);
|
||||
}
|
||||
else
|
||||
{
|
||||
gridGhostHoldNote.visible = false;
|
||||
gridGhostHoldNote.setHeightDirectly(0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@ import flixel.graphics.frames.FlxTileFrames;
|
|||
import flixel.math.FlxPoint;
|
||||
import funkin.play.notes.SustainTrail;
|
||||
import funkin.data.song.SongData.SongNoteData;
|
||||
import flixel.math.FlxMath;
|
||||
|
||||
/**
|
||||
* A sprite that can be used to display the trail of a hold note in a chart.
|
||||
|
@ -42,9 +43,12 @@ class ChartEditorHoldNoteSprite extends SustainTrail
|
|||
* Set the height directly, to a value in pixels.
|
||||
* @param h The desired height in pixels.
|
||||
*/
|
||||
public function setHeightDirectly(h:Float)
|
||||
public function setHeightDirectly(h:Float, ?lerp:Bool = false)
|
||||
{
|
||||
sustainLength = h / (getScrollSpeed() * Constants.PIXELS_PER_MS);
|
||||
if (lerp != null && lerp) sustainLength = FlxMath.lerp(sustainLength, h / (getScrollSpeed() * Constants.PIXELS_PER_MS), 0.25);
|
||||
else
|
||||
sustainLength = h / (getScrollSpeed() * Constants.PIXELS_PER_MS);
|
||||
|
||||
fullSustainLength = sustainLength;
|
||||
}
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ import flixel.util.FlxSignal.FlxTypedSignal;
|
|||
@:nullSafety
|
||||
class CrashHandler
|
||||
{
|
||||
static final LOG_FOLDER = 'logs';
|
||||
public static final LOG_FOLDER = 'logs';
|
||||
|
||||
/**
|
||||
* Called before exiting the game when a standard error occurs, like a thrown exception.
|
||||
|
|
Loading…
Reference in a new issue