mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-09-28 21:19:27 +00:00
colol workflow??
This commit is contained in:
parent
fe60d4644d
commit
e7cc77ed4d
25
.github/workflows/superlinter.yml
vendored
Normal file
25
.github/workflows/superlinter.yml
vendored
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
name: Super-Linter
|
||||||
|
|
||||||
|
# Run this workflow every time a new commit pushed to your repository
|
||||||
|
on: push
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
# Set the job key. The key is displayed as the job name
|
||||||
|
# when a job name is not provided
|
||||||
|
super-lint:
|
||||||
|
# Name the Job
|
||||||
|
name: Lint code base
|
||||||
|
# Set the type of machine to run on
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
# Checks out a copy of your repository on the ubuntu-latest machine
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
|
# Runs the Super-Linter action
|
||||||
|
- name: Run Super-Linter
|
||||||
|
uses: github/super-linter@v3
|
||||||
|
env:
|
||||||
|
DEFAULT_BRANCH: main
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
@ -5,6 +5,9 @@ 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).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
## [UNRELEASED]
|
## [UNRELEASED]
|
||||||
|
### Fixed
|
||||||
|
- When pausing music at the start, it doesn't continue the song anyways. ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48))
|
||||||
|
- IDK i think backing out of song menu should play main menu songs again hehe ([shoutouts gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/48))
|
||||||
|
|
||||||
## [0.2.4] - 2020-12-11
|
## [0.2.4] - 2020-12-11
|
||||||
### Added
|
### Added
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<project>
|
<project>
|
||||||
<!-- _________________________ Application Settings _________________________ -->
|
<!-- _________________________ Application Settings _________________________ -->
|
||||||
|
|
||||||
<app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.4" company="ninjamuffin99" />
|
<app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.4.1" company="ninjamuffin99" />
|
||||||
|
|
||||||
<!--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" />
|
||||||
|
|
|
@ -627,10 +627,7 @@ class PlayState extends MusicBeatState
|
||||||
{
|
{
|
||||||
if (FlxG.sound.music != null && !startingSong)
|
if (FlxG.sound.music != null && !startingSong)
|
||||||
{
|
{
|
||||||
FlxG.sound.music.play();
|
resyncVocals();
|
||||||
Conductor.songPosition = FlxG.sound.music.time;
|
|
||||||
vocals.time = Conductor.songPosition;
|
|
||||||
vocals.play();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!startTimer.finished)
|
if (!startTimer.finished)
|
||||||
|
@ -641,6 +638,16 @@ class PlayState extends MusicBeatState
|
||||||
super.closeSubState();
|
super.closeSubState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function resyncVocals():Void
|
||||||
|
{
|
||||||
|
vocals.pause();
|
||||||
|
|
||||||
|
FlxG.sound.music.play();
|
||||||
|
Conductor.songPosition = FlxG.sound.music.time;
|
||||||
|
vocals.time = Conductor.songPosition;
|
||||||
|
vocals.play();
|
||||||
|
}
|
||||||
|
|
||||||
private var paused:Bool = false;
|
private var paused:Bool = false;
|
||||||
var startedCountdown:Bool = false;
|
var startedCountdown:Bool = false;
|
||||||
var canPause:Bool = true;
|
var canPause:Bool = true;
|
||||||
|
@ -800,7 +807,7 @@ class PlayState extends MusicBeatState
|
||||||
switch (totalBeats)
|
switch (totalBeats)
|
||||||
{
|
{
|
||||||
case 128, 129, 130:
|
case 128, 129, 130:
|
||||||
vocals.volume = 0;
|
vocals.volume = 0;
|
||||||
// FlxG.sound.music.stop();
|
// FlxG.sound.music.stop();
|
||||||
// curLevel = 'Fresh';
|
// curLevel = 'Fresh';
|
||||||
// FlxG.switchState(new PlayState());
|
// FlxG.switchState(new PlayState());
|
||||||
|
@ -1445,12 +1452,9 @@ class PlayState extends MusicBeatState
|
||||||
{
|
{
|
||||||
if (SONG.needsVoices)
|
if (SONG.needsVoices)
|
||||||
{
|
{
|
||||||
if (vocals.time > Conductor.songPosition + Conductor.stepCrochet
|
if (vocals.time > Conductor.songPosition + 20 || vocals.time < Conductor.songPosition - 20)
|
||||||
|| vocals.time < Conductor.songPosition - Conductor.stepCrochet)
|
|
||||||
{
|
{
|
||||||
vocals.pause();
|
resyncVocals();
|
||||||
vocals.time = Conductor.songPosition;
|
|
||||||
vocals.play();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue