mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2025-03-23 10:29:29 +00:00
dope shit in progress
This commit is contained in:
parent
b3aec93d45
commit
a041da2012
|
@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
### Fixed
|
### Fixed
|
||||||
- Old Verison popup screen weirdness ([Thanks to gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/155))
|
- Old Verison popup screen weirdness ([Thanks to gedehari for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/155))
|
||||||
- Song no longer loops when finishing the song. ([Thanks Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/132))
|
- Song no longer loops when finishing the song. ([Thanks Injourn for the Pull Request!](https://github.com/ninjamuffin99/Funkin/pull/132))
|
||||||
|
- Screen wipe being cut off in the limo/mom stage.
|
||||||
|
|
||||||
## [0.2.5] - 2020-12-27
|
## [0.2.5] - 2020-12-27
|
||||||
### Added
|
### Added
|
||||||
|
|
|
@ -225,8 +225,6 @@ class Character extends FlxSprite
|
||||||
|
|
||||||
animation.addByPrefix('scared', 'BF idle shaking', 24);
|
animation.addByPrefix('scared', 'BF idle shaking', 24);
|
||||||
|
|
||||||
antialiasing = true;
|
|
||||||
|
|
||||||
addOffset('idle', -5);
|
addOffset('idle', -5);
|
||||||
addOffset("singUP", -29, 27);
|
addOffset("singUP", -29, 27);
|
||||||
addOffset("singRIGHT", -38, -7);
|
addOffset("singRIGHT", -38, -7);
|
||||||
|
@ -256,8 +254,6 @@ class Character extends FlxSprite
|
||||||
animation.addByPrefix('singRIGHTmiss', 'BF NOTE RIGHT MISS', 24, false);
|
animation.addByPrefix('singRIGHTmiss', 'BF NOTE RIGHT MISS', 24, false);
|
||||||
animation.addByPrefix('singDOWNmiss', 'BF NOTE DOWN MISS', 24, false);
|
animation.addByPrefix('singDOWNmiss', 'BF NOTE DOWN MISS', 24, false);
|
||||||
|
|
||||||
antialiasing = true;
|
|
||||||
|
|
||||||
addOffset('idle', -5);
|
addOffset('idle', -5);
|
||||||
addOffset("singUP", -29, 27);
|
addOffset("singUP", -29, 27);
|
||||||
addOffset("singRIGHT", -38, -7);
|
addOffset("singRIGHT", -38, -7);
|
||||||
|
@ -283,8 +279,34 @@ class Character extends FlxSprite
|
||||||
animation.addByPrefix('singDOWN-alt', 'Parent Down Note Mom', 24, false);
|
animation.addByPrefix('singDOWN-alt', 'Parent Down Note Mom', 24, false);
|
||||||
animation.addByPrefix('singLEFT-alt', 'Parent Left Note Mom', 24, false);
|
animation.addByPrefix('singLEFT-alt', 'Parent Left Note Mom', 24, false);
|
||||||
animation.addByPrefix('singRIGHT-alt', 'Parent Right Note Mom', 24, false);
|
animation.addByPrefix('singRIGHT-alt', 'Parent Right Note Mom', 24, false);
|
||||||
|
|
||||||
|
addOffset('idle');
|
||||||
|
addOffset("singUP", -20, 50);
|
||||||
|
addOffset("singRIGHT", -51);
|
||||||
|
addOffset("singLEFT", -30);
|
||||||
|
addOffset("singDOWN", -30, -40);
|
||||||
|
addOffset("singUP-alt", -20, 50);
|
||||||
|
addOffset("singRIGHT-alt", -51);
|
||||||
|
addOffset("singLEFT-alt", -30);
|
||||||
|
addOffset("singDOWN-alt", -30, -40);
|
||||||
|
case 'monster-christmas':
|
||||||
|
frames = FlxAtlasFrames.fromSparrow('assets/images/christmas/Monster_Assets_Christmas.png',
|
||||||
|
'assets/images/christmas/Monster_Assets_Christmas.xml');
|
||||||
|
animation.addByPrefix('idle', 'monster idle', 24, false);
|
||||||
|
animation.addByPrefix('singUP', 'monster up note', 24, false);
|
||||||
|
animation.addByPrefix('singDOWN', 'monster down', 24, false);
|
||||||
|
animation.addByPrefix('singLEFT', 'Monster left note', 24, false);
|
||||||
|
animation.addByPrefix('singRIGHT', 'Monster Right note', 24, false);
|
||||||
|
|
||||||
|
addOffset('idle');
|
||||||
|
addOffset("singUP", -20, 50);
|
||||||
|
addOffset("singRIGHT", -51);
|
||||||
|
addOffset("singLEFT", -30);
|
||||||
|
addOffset("singDOWN", -30, -40);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
antialiasing = true;
|
||||||
|
|
||||||
playAnim('singUP');
|
playAnim('singUP');
|
||||||
|
|
||||||
if (isPlayer)
|
if (isPlayer)
|
||||||
|
|
|
@ -208,7 +208,9 @@ class ChartingState extends MusicBeatState
|
||||||
stepperBPM.value = Conductor.bpm;
|
stepperBPM.value = Conductor.bpm;
|
||||||
stepperBPM.name = 'song_bpm';
|
stepperBPM.name = 'song_bpm';
|
||||||
|
|
||||||
var characters:Array<String> = ["bf", 'dad', 'gf', 'spooky', 'monster', 'pico', 'mom', 'mom-car', 'bf-car'];
|
var characters:Array<String> = [
|
||||||
|
"bf", 'dad', 'gf', 'spooky', 'monster', 'pico', 'mom', 'mom-car', 'bf-car', 'parents-christmas', 'monster-christmas'
|
||||||
|
];
|
||||||
|
|
||||||
for (i in Assets.getText('assets/images/custom_chars/charlist.txt').split('\n'))
|
for (i in Assets.getText('assets/images/custom_chars/charlist.txt').split('\n'))
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,6 +3,7 @@ package;
|
||||||
import flixel.FlxG;
|
import flixel.FlxG;
|
||||||
import flixel.addons.transition.FlxTransitionableState;
|
import flixel.addons.transition.FlxTransitionableState;
|
||||||
import flixel.addons.ui.FlxUIState;
|
import flixel.addons.ui.FlxUIState;
|
||||||
|
import flixel.math.FlxRect;
|
||||||
import flixel.util.FlxTimer;
|
import flixel.util.FlxTimer;
|
||||||
|
|
||||||
class MusicBeatState extends FlxUIState
|
class MusicBeatState extends FlxUIState
|
||||||
|
@ -22,6 +23,9 @@ class MusicBeatState extends FlxUIState
|
||||||
|
|
||||||
override function create()
|
override function create()
|
||||||
{
|
{
|
||||||
|
if (transIn != null)
|
||||||
|
trace('reg ' + transIn.region);
|
||||||
|
|
||||||
#if (!web)
|
#if (!web)
|
||||||
TitleState.soundExt = '.ogg';
|
TitleState.soundExt = '.ogg';
|
||||||
#end
|
#end
|
||||||
|
|
|
@ -16,6 +16,7 @@ import flixel.graphics.frames.FlxAtlasFrames;
|
||||||
import flixel.group.FlxGroup.FlxTypedGroup;
|
import flixel.group.FlxGroup.FlxTypedGroup;
|
||||||
import flixel.math.FlxMath;
|
import flixel.math.FlxMath;
|
||||||
import flixel.math.FlxPoint;
|
import flixel.math.FlxPoint;
|
||||||
|
import flixel.math.FlxRect;
|
||||||
import flixel.system.FlxSound;
|
import flixel.system.FlxSound;
|
||||||
import flixel.text.FlxText;
|
import flixel.text.FlxText;
|
||||||
import flixel.tweens.FlxEase;
|
import flixel.tweens.FlxEase;
|
||||||
|
|
|
@ -106,12 +106,9 @@ class TitleState extends MusicBeatState
|
||||||
diamond.destroyOnNoUse = false;
|
diamond.destroyOnNoUse = false;
|
||||||
|
|
||||||
FlxTransitionableState.defaultTransIn = new TransitionData(FADE, FlxColor.BLACK, 1, new FlxPoint(0, -1), {asset: diamond, width: 32, height: 32},
|
FlxTransitionableState.defaultTransIn = new TransitionData(FADE, FlxColor.BLACK, 1, new FlxPoint(0, -1), {asset: diamond, width: 32, height: 32},
|
||||||
new FlxRect(0, 0, FlxG.width, FlxG.height));
|
new FlxRect(-200, 0, FlxG.width * 1.4, FlxG.height));
|
||||||
FlxTransitionableState.defaultTransOut = new TransitionData(FADE, FlxColor.BLACK, 0.7, new FlxPoint(0, 1),
|
FlxTransitionableState.defaultTransOut = new TransitionData(FADE, FlxColor.BLACK, 0.7, new FlxPoint(0, 1),
|
||||||
{asset: diamond, width: 32, height: 32}, new FlxRect(0, 0, FlxG.width, FlxG.height));
|
{asset: diamond, width: 32, height: 32}, new FlxRect(-200, 0, FlxG.width * 1.4, FlxG.height));
|
||||||
|
|
||||||
FlxTransitionableState.defaultTransIn.tileData = {asset: diamond, width: 32, height: 32};
|
|
||||||
FlxTransitionableState.defaultTransOut.tileData = {asset: diamond, width: 32, height: 32};
|
|
||||||
|
|
||||||
transIn = FlxTransitionableState.defaultTransIn;
|
transIn = FlxTransitionableState.defaultTransIn;
|
||||||
transOut = FlxTransitionableState.defaultTransOut;
|
transOut = FlxTransitionableState.defaultTransOut;
|
||||||
|
|
Loading…
Reference in a new issue