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
got a textbox with a name that changes the name of the game on keyup.
changed typo, really though to find
Added a button to change name
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
sad -am commit to mark progress at midnight, after hours of fruitless modifications. save/load is still not properly working.
reworked mine sonar/laymine area. fixed small bug: selectedShip was not updated. set it to undefined for now
started working on sonar
added sonar class
sonar works. It is not shown diferrently, but it works
ships are hit sideways now. (testing)
ships properly hit sideways (fixed minor mistake)
Merge pull request #11 from amedeedaboville/charlieSetup

fixed very minor mistakes. pulling it now. hopefully
Merge branch 'master' into mines
succesfully update mines, their sonar and torpedoes hit ship sideways if possible