Skip to content

Commit 4d84e65

Browse files
YoshiCrafter29KolzeYTHEIHUAaFrakits
authored
flixel-animate implementation (#893)
* added flixel-animate to libs * I BROKE THE OFFSETS FUCK . * yes it does blehtty wdym?? * Removed flxanimate entirely + Fixed transition + Fixed offsets * Deleted caches (relaunching actions) * frameOffset for atlases (need testing) * useRenderTexture added to xml * Fixed atlases for mods * a simple redirect so old mods wont break that badly (#879) * Update FunkinSprite.hx * remove trace * Fixed ghosts for atlases * usable character editor (not entirely fixed) * fixed zoomFactor + temp fix for atlas popping * early structure for character editor atlas anim display * zoomFactor for atlases * Animate Atlas character editor previews * FlxAnimateSettings specification * fixed animation swapping on atlas characters * OH YEA BABY NEW FLXANIMATE UPDATE THAT MADE CODE 50X SIMPLER **AGAIN** 💖 /pos * Added label checkbox in Character Editor * Fixed culling issues with FlxAnimate (fr this time) * fixed some atlases * HOW THE FUCK * gf sad fix + AliasMacro (for backwards comp, manual impl for now) * Fixed pop-ins * Update Character.hx * applyStageMatrix * FlxAnimate pull request merge (empty commit) * flixel-animate** i'm clumsy asf i meant the lib not the class name fuck * Update libs.xml * Merge changes from main (#892) * repair ScriptableShader.shader = null (#877) * optimize updateInput (#878) * optimize updateInput * resize optimize * __notePerStrum optimize * Update StrumLine.hx * NoteGroup optimize (#881) * NoteGroup optimize * CoolUtil.bound faster * makes commit with github desktop W FRAKITS * Use fastSinCos for notes (#889) * Update Strum.hx * Update Strum.hx --------- Co-authored-by: HEIHUAa <112499486+HEIHUAa@users.noreply.github.com> Co-authored-by: Frakits <90983918+Frakits@users.noreply.github.com> --------- Co-authored-by: Kolze <53307233+KolzeYT@users.noreply.github.com> Co-authored-by: HEIHUAa <112499486+HEIHUAa@users.noreply.github.com> Co-authored-by: Frakits <90983918+Frakits@users.noreply.github.com>
1 parent f8f9d6e commit 4d84e65

43 files changed

Lines changed: 11169 additions & 146841 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎assets/data/characters/gf-christmas.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22
<character x="115" y="325" sprite="gf-christmas" icon="gf" color="#A5004D">
33
<anim name="danceLeft" anim="GF Dancing Beat" x="0" y="-9" fps="24" loop="false" indices="0..14"/>
44
<anim name="danceRight" anim="GF Dancing Beat" x="0" y="-9" fps="24" loop="false" indices="15..30"/>
5-
<anim name="singUP" anim="GF Up Note" x="0" y="-9" fps="24" loop="false"/>
6-
<anim name="singDOWN" anim="GF Down Note" x="0" y="-9" fps="24" loop="false"/>
7-
<anim name="singLEFT" anim="GF left note" x="0" y="-9" fps="24" loop="false"/>
8-
<anim name="singRIGHT" anim="GF Right Note" x="0" y="-9" fps="24" loop="false"/>
9-
<anim name="scared" anim="GF FEAR" x="0" y="-9" fps="24" loop="true"/>
10-
<anim name="hairBlow" anim="GF Dancing Beat Hair blowing" x="0" y="-9" fps="24" loop="false" indices="0..3"/>
11-
<anim name="hairFall" anim="GF Dancing Beat Hair Landing" x="0" y="-9" fps="24" loop="false" indices="0..11"/>
125
<anim name="cheer" anim="GF Cheer" x="0" y="-9" fps="24" loop="false"/>
136
<anim name="sad" anim="gf sad" x="-51" y="306" fps="24" loop="true" indices="0..12"/>
147
</character>

‎assets/data/characters/gf.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<!DOCTYPE codename-engine-character>
2-
<character x="100" y="275" sprite="gf" icon="gf" color="#A5004D">
3-
<anim name="cheer" anim="GF Cheer" x="0" y="0" fps="24" loop="false"/>
4-
<anim name="singUP" anim="GF Up Note" x="0" y="0" fps="24" loop="false"/>
5-
<anim name="singLEFT" anim="GF left note" x="0" y="0" fps="24" loop="false"/>
6-
<anim name="singRIGHT" anim="GF Right Note" x="0" y="0" fps="24" loop="false"/>
7-
<anim name="singDOWN" anim="GF Down Note" x="0" y="0" fps="24" loop="false"/>
8-
<anim name="danceLeft" anim="GF Dancing Beat" x="0" y="0" fps="24" loop="false" indices="0..14"/>
9-
<anim name="danceRight" anim="GF Dancing Beat" x="0" y="0" fps="24" loop="false" indices="15..30"/>
10-
<anim name="hairBlow" anim="GF Dancing Beat Hair blowing" x="0" y="0" fps="24" loop="true" indices="0,1,2,3"/>
11-
<anim name="hairFall" anim="GF Dancing Beat Hair Landing" x="0" y="0" fps="24" loop="false" indices="0..11"/>
12-
<anim name="scared" anim="GF FEAR" x="0" y="0" fps="24" loop="true"/>
13-
<anim name="sad" anim="gf sad" x="0" y="0" fps="24" loop="true" indices="0..12"/>
2+
<character x="100" y="275" color="#A5004D">
3+
<anim name="cheer" anim="GF Cheer"/>
4+
<anim name="singUP" anim="GF Up Note"/>
5+
<anim name="singLEFT" anim="GF left note"/>
6+
<anim name="singRIGHT" anim="GF Right Note"/>
7+
<anim name="singDOWN" anim="GF Down Note"/>
8+
<anim name="danceLeft" anim="GF Dancing Beat" indices="0..14"/>
9+
<anim name="danceRight" anim="GF Dancing Beat" indices="15..30"/>
10+
<anim name="hairBlow" anim="GF Dancing Beat Hair blowing" loop="true" indices="0..3"/>
11+
<anim name="hairFall" anim="GF Dancing Beat Hair Landing" indices="0..11"/>
12+
<anim name="scared" anim="GF FEAR " loop="true"/>
13+
<anim name="sad" anim="gf sad" x="-51" y="315" loop="true" indices="0..12"/>
1414
</character>

‎assets/data/stages/mall.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<sprite name="fgSnow" x="-600" y="680" sprite="fgSnow"/>
1212

1313

14-
<girlfriend x="540" y="110"/>
14+
<girlfriend x="440" y="110"/>
1515
<dad/>
1616
<boyfriend x="1030" camyoffset="-150" camxoffset="-150"/>
1717

0 commit comments

Comments
 (0)