Deniz:
After some headaches we ended up deleting the entire dev branch of our git repository, integrating the work Jeff and I did manually from within my personal branch, and then pushed all of that into a new dev branch.
This new dev branch has working movement, jumping, racket throwing, and ball physics for 2 players that works with both keyboard and controller input. There is also racket swinging for just keyboard currently.
Now that we have the basic game completed and in version control, it's all a cakewalk from here /s. We're going to look into using UniMerge as a version control solution for merging scenes.
No comments:
Post a Comment