Open Ernesto01 opened 12 years ago
Dude, I'm not getting anywhere with github as far as updating and pulling the new code. I was getting the merge conflict errors, then I decided to re-add and commit the applesgame.cs file and I don't have anymore erros, however, the solution to the project will not build.
Do you have your laptop with you? We might need to use yours since, I'm unaware of the situation with Alex and the compatibility of the program on his laptop.
I think I resolved the issue. The code was plagued with lines added in from github. Some weird notation like HEAD >>>>>> and the followed by random lines of 6816846816865165165561651651 hexadecimal values? However, I'm not sure what caused this, but thankfully we're presenting today and we're learning more about bloody github
I've made a few changes to the code to clean it up while keeping game objects recognizable, which wasn't so easy. I managed to do away with most double points and reduce the average of class variables, although some classes still have 5-7 variables, some of which are provided by the framework. Anyways, this is the last update, use this code for the presentation and make sure you have an .exe ready to run. Cheers.