Closed paulpaterson closed 9 years ago
My previous note might not be clear ... here's the sequence,
Because of #6, if I try to merge the master back into my bingo branch then it blows away all my recent changes!
Let me know what I need to do to get this back in sync.
Trying to figure it out currently... Don't really understand why it doesn't see the difference in the repos. Looking over cherry-pick but not sure if that is the right path.
I'll have a go from my end and see if I can unravel it
I think I know the answer, but your code still doesn't run on my end. Please see the reddit thread I made for the traceback I am getting.
-Mek
I'm not sure if this is going to work!
These are the missing files from the previous pull. However, all the other changes are not in here. When I tried to merge with iminurnamez:master it reverts all my bingo changes because master includes the revert!
I think you may need to merge the bingo branch in the master and then merge this.
This is the UI redesign and the first fully playable version. The menu bar buttons are non functional but everything else should be working.
Give it a try. Choose 5 bingo cards for a wild ride!
There are a ton of changes in here but only to bingo files.
I'll clean up the graphics into sprite sheets in a subsequent pull.