Vikram 672707f5b6 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	.idea/workspace.xml
#	src/ShipWarfare.java

2019-02-25 07:40:36 -07:00

..

compiler.xml

new updated project

2019-02-17 19:13:24 -07:00

description.html

new updated project

2019-02-17 19:13:24 -07:00

encodings.xml

new updated project

2019-02-17 19:13:24 -07:00

misc.xml

Worked On Sid's class a bit

2019-02-24 19:56:16 -07:00

modules.xml

new updated project

2019-02-17 19:13:24 -07:00

uiDesigner.xml

Created Player class

2019-02-18 18:47:00 -07:00

vcs.xml

This should fix the ShipWarfare file and bring it up to date with the rest of the file.

2019-02-17 19:54:29 -07:00

workspace.xml

the comment somehow made it so that I couldn't compile (using the command line i couldn't compile, i could compile file using intellij) Also, you the file extended player, which is not necessary. You also were calling gameOver() and getName() directly, you needed "player." before all those methods.

2019-02-25 07:39:57 -07:00