Vikram b324cea280 Merge remote-tracking branch 'origin/master' ...

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

2019-02-19 10:10:11 -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

Vikram, these are the types of changes Harkey and I meant for you to establish.

2019-02-18 22:35:29 -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

now fully uses the player class

2019-02-19 10:08:52 -07:00