Cannon logic is good, damging not working. Gonna jsut splice it with leo's...
Finished merging
fixed some conflicts.
fixed problem with merge
Merge branch 'mines' into john
Cannons working now. Hurray! Also fixed small bugs with not updated the x and y values of ship squares and an error caused when rotating over obstructions with coordinateString
Cannons are still working. Damage shows up properly. Different kinds of armor and damage are represented by different colours. Bases also show damage.
Merged with charlieSetup
Did more stuff with the colours and changed it so that bases can be damaged (hopefully destroyed) too
merged with master
merging john
fixed merge conflicts, walking on sunshine
Merge branch 'master' of https://github.com/amedeedaboville/battleships