Woah cool! Looks good so far, good luck on finishing this!

ughhh now i have to align and scale the hitboxes for real now 😩

i took a break and still can't figure out how to align and scale the hitboxes for real 🙁

my branch is probably super behind, too.

my branch is probably super behind, too.

Yeah... I can resolve the conflicts if you'd like, it'll probably take me a little while because while you were gone we set up clang-format.

my branch is probably super behind, too.

Yeah... I can resolve the conflicts if you'd like, it'll probably take me a little while because while you were gone we set up clang-format.

Yeah, that would be nice, thanks. I'm gone again on vacation this time, so I guess I don't mind the wait.

i got a little question

by "just boxes" does it mean it could be boxes too if it weren't a line (like you filled that test sprite to not have a transparent filling)? would it like have a shaped outline thing and then boxes where the fill is?

OK, sorry I forgot about this, but I've started on conflict resolution.

i got a little question

by "just boxes" does it mean it could be boxes too if it weren't a line (like you filled that test sprite to not have a transparent filling)? would it like have a shaped outline thing and then boxes where the fill is?

nah right now it only supports the bitmap mode so it doesn't know lines from fills. it just makes the shape based on which pixels are filled in the image

I tried and failed to do the merge, there's just so much that changed, entire files got deleted.

EDIT: I got it closer with the clang-format change, but it's still a nearly 300 commit difference.

aw shoot, it might just be more worth it to just start over with the newer code. i haven't changed much so it would probably be pretty easy to get to the same point

I would absolutely recommend restarting. If you already know how you implemented it, it shouldn't be hard recreating it.

Since it looks like a new PR might be made (with code taken from this one), and do to the amount of conflicts i'm going to close this PR, feel free to ping me here or in the Discord if you would like this re-opened.