search

PlaceholderGames / 2016-SoS-Game

0 stars 0 forks source link

master merge #48

Open jonnyboy0868 opened 7 years ago

jonnyboy0868 commented 7 years ago

im taking all the individual branches off the repo and merging them all into the master, so we can fix any issues and have a semi working game

jonnyboy0868 commented 7 years ago

pushed updated mainMenu branch made by nick

jonnyboy0868 commented 7 years ago

issue has come up with Elliot's branch as he has been working off a diverged master. this required manual merging of the repo and the local content. master is up to date now

jonnyboy0868 commented 7 years ago

jacobs master has had the same issue as elliots on first impression but, should be fixable