cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 07:27:12 +00:00
Code Issues Releases Wiki Activity

Fix merge issues

Browse source
This commit is contained in:
Eric Myllyoja 2022-09-16 15:38:36 -04:00
parent 79751222e1
commit 7fbdbcdfad
3 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/funkin/play/PicoFight.hx
View file

@ -1,16 +1,10 @@
package funkin.play; package funkin.play;
import flixel.FlxObject;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.addons.effects.FlxTrail; import flixel.addons.effects.FlxTrail;
import flixel.group.FlxGroup.FlxTypedGroup; import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.math.FlxMath; import flixel.math.FlxMath;
import flixel.util.FlxColor; import flixel.util.FlxColor;
<<<<<<< HEAD
import flixel.util.FlxDirectionFlags;
import funkin.Note.NoteData;
=======
>>>>>>> origin/note-redux
import funkin.audiovis.PolygonSpectogram; import funkin.audiovis.PolygonSpectogram;
import funkin.noteStuff.NoteBasic.NoteData; import funkin.noteStuff.NoteBasic.NoteData;

4
source/funkin/play/PlayState.hx
View file

@ -16,10 +16,6 @@ import flixel.ui.FlxBar;
import flixel.util.FlxColor; import flixel.util.FlxColor;
import flixel.util.FlxSort; import flixel.util.FlxSort;
import flixel.util.FlxTimer; import flixel.util.FlxTimer;
<<<<<<< HEAD
import funkin.Note;
=======
>>>>>>> origin/note-redux
import funkin.Section.SwagSection; import funkin.Section.SwagSection;
import funkin.SongLoad.SwagSong; import funkin.SongLoad.SwagSong;
import funkin.charting.ChartingState; import funkin.charting.ChartingState;

5
source/funkin/play/Strumline.hx
View file

@ -2,16 +2,11 @@ package funkin.play;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup; import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
<<<<<<< HEAD
=======
import flixel.math.FlxPoint; import flixel.math.FlxPoint;
>>>>>>> origin/note-redux
import flixel.tweens.FlxEase; import flixel.tweens.FlxEase;
import flixel.tweens.FlxTween;
import funkin.noteStuff.NoteBasic.NoteColor; import funkin.noteStuff.NoteBasic.NoteColor;
import funkin.noteStuff.NoteBasic.NoteDir; import funkin.noteStuff.NoteBasic.NoteDir;
import funkin.noteStuff.NoteBasic.NoteType; import funkin.noteStuff.NoteBasic.NoteType;
import funkin.ui.PreferencesMenu;
import funkin.util.Constants; import funkin.util.Constants;
/** /**