search

AllanBellum / Project-Pending

Working repository for Team Pending's group project
2 stars 0 forks source link

Animation #78

Closed InfernoX5515 closed 1 year ago

InfernoX5515 commented 1 year ago

Trying to get this branch ready to be merged -- disregard until I update

InfernoX5515 commented 1 year ago

I resolved all conflicts between this branch and main. Since this was such an old branch, the code was pretty heavily modified to work with main. If we are ready to merge, go ahead. If not, feel free to close this request and we can merge at a later date.

The important part is that this branch is now up to date with main and should not have as many conflicts when we do go to merge.