Skip to content
This repository has been archived by the owner on Jan 26, 2025. It is now read-only.

Commit

Permalink
the real shit is private until i clean it lol
Browse files Browse the repository at this point in the history
  • Loading branch information
MaybeMaru committed Dec 8, 2023
1 parent 77cdd80 commit f2e0d5d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 21 deletions.
Binary file modified assets/shared/images/skins/default/noteAssets.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 15 additions & 18 deletions assets/shared/images/skins/default/noteAssets.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Created with Free texture packer v0.6.7 http://free-tex-packer.com
-->
<TextureAtlas imagePath="noteAssets.png" width="446" height="327">
<SubTexture name="red0000" x="4" y="4" width="154" height="157" frameX="-0" frameY="-0" frameWidth="154" frameHeight="157"/>
<SubTexture name="blue0000" x="166" y="4" width="154" height="157" rotated="true" frameX="-0" frameY="-0" frameWidth="157" frameHeight="154"/>
<SubTexture name="green0000" x="4" y="169" width="157" height="154" frameX="-0" frameY="-0" frameWidth="157" frameHeight="154"/>
<SubTexture name="purple0000" x="169" y="169" width="157" height="154" rotated="true" frameX="-0" frameY="-0" frameWidth="154" frameHeight="157"/>
<SubTexture name="red hold end0000" x="328" y="4" width="50" height="64" frameX="-0" frameY="-0" frameWidth="50" frameHeight="64"/>
<SubTexture name="blue hold end0000" x="328" y="76" width="50" height="64" frameX="-0" frameY="-0" frameWidth="50" frameHeight="64"/>
<SubTexture name="green hold end0000" x="334" y="148" width="50" height="64" frameX="-0" frameY="-0" frameWidth="50" frameHeight="64"/>
<SubTexture name="purple hold end0000" x="386" y="4" width="50" height="64" frameX="-0" frameY="-0" frameWidth="50" frameHeight="64"/>
<SubTexture name="purple hold piece0000" x="386" y="76" width="50" height="44" frameX="-0" frameY="-0" frameWidth="50" frameHeight="44"/>
<SubTexture name="blue hold piece0000" x="334" y="220" width="50" height="44" frameX="-0" frameY="-0" frameWidth="50" frameHeight="44"/>
<SubTexture name="green hold piece0000" x="334" y="272" width="50" height="44" frameX="-0" frameY="-0" frameWidth="50" frameHeight="44"/>
<SubTexture name="red hold piece0000" x="392" y="128" width="50" height="44" frameX="-0" frameY="-0" frameWidth="50" frameHeight="44"/>
</TextureAtlas>
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="noteAssets.png">
<SubTexture name="blue hold end0" x="321" y="68" width="51" height="64"/>
<SubTexture name="blue hold piece0" x="374" y="48" width="51" height="44"/>
<SubTexture name="blue0" x="2" y="2" width="158" height="154"/>
<SubTexture name="green hold end0" x="321" y="2" width="51" height="64"/>
<SubTexture name="green hold piece0" x="374" y="2" width="51" height="44"/>
<SubTexture name="green0" x="162" y="2" width="157" height="154"/>
<SubTexture name="purple hold end0" x="314" y="224" width="51" height="64"/>
<SubTexture name="purple hold piece0" x="367" y="180" width="51" height="44"/>
<SubTexture name="purple0" x="158" y="158" width="154" height="157"/>
<SubTexture name="red hold end0" x="314" y="158" width="51" height="64"/>
<SubTexture name="red hold piece0" x="367" y="134" width="51" height="44"/>
<SubTexture name="red0" x="2" y="158" width="154" height="157"/>
</TextureAtlas>
4 changes: 2 additions & 2 deletions source/funkin/graphics/FlxSpriteExt.hx
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ class FlxSpriteExt extends FlxSkewedSprite {
public var specialAnim:Bool = false;
public var _packer:PackerType = IMAGE;

public function new(?X:Float = 0, ?Y:Float = 0):Void {
public function new(?X:Float = 0, ?Y:Float = 0, ?SimpleGraphic:FlxGraphicAsset):Void {
animOffsets = new Map<String, FlxPoint>();
animDatas = new Map<String, SpriteAnimation>();
super(X,Y);
super(X,Y,SimpleGraphic);
}

inline public function setScale(_scale:Float = 1, updateBox:Bool = true) {
Expand Down
1 change: 0 additions & 1 deletion source/funkin/objects/funkui/FunkBar.hx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package funkin.objects.funkui;

import flixel.graphics.frames.FlxFrame;
import flixel.graphics.frames.FlxFrame.FlxFrameAngle;
import haxe.ds.Vector;

Expand Down

0 comments on commit f2e0d5d

Please sign in to comment.