Eric Myllyoja 7fbdbcdfad Fix merge issues

2022-09-16 15:38:36 -04:00

..

character

Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor

2022-09-16 15:38:19 -04:00

scoring

Work in progress on Week 8 stuff (animation offsets, death animation)

2022-07-06 21:49:42 -04:00

song

Finished song data loader

2022-09-16 15:37:00 -04:00

stage

Work in progress on HaxeUI chart editor

2022-09-07 19:07:08 -04:00

AnimationData.hx

Fixed Week 4 boppers and car.

2022-04-18 19:36:09 -04:00

Countdown.hx

Many bug fixes; combo meter now works; main menu graphics split up

2022-03-29 21:56:04 -04:00

Fighter.hx

Ported all base game characters

2022-03-23 01:18:23 -04:00

GameOverSubstate.hx

Latest WIP on Weekend 1 appearance stuff

2022-08-16 20:26:34 -04:00

HealthIcon.hx

Work in progress on Week 8 stuff (animation offsets, death animation)

2022-07-06 21:49:42 -04:00

PicoFight.hx

Fix merge issues

2022-09-16 15:38:36 -04:00

PlayState.hx

Fix merge issues

2022-09-16 15:38:36 -04:00

Strumline.hx

Fix merge issues

2022-09-16 15:38:36 -04:00

VanillaCutscenes.hx

Merge remote-tracking branch 'origin/feature/scripted-modules' into feature/scripted-characters

2022-04-18 20:39:41 -04:00