Vikram
|
8d64fd95fe
|
now fully uses the player class
|
2019-02-19 10:11:20 -07:00 |
|
Vikram
|
b324cea280
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/workspace.xml
# src/TaipanShop.java
|
2019-02-19 10:10:11 -07:00 |
|
Vikram
|
5156547ad0
|
now fully uses the player class
|
2019-02-19 10:08:52 -07:00 |
|
KahootChampion
|
fe03244b6c
|
Vikram, these are the types of changes Harkey and I meant for you to establish.
|
2019-02-18 22:35:29 -07:00 |
|
Vikram
|
5cb0237ef8
|
the shop now uses the player class as a parent class.
|
2019-02-18 19:55:32 -07:00 |
|
Vikram
|
058c745db3
|
the shop now uses the player class as a parent class.
|
2019-02-18 19:53:25 -07:00 |
|
Vikram
|
a5cc88e5ec
|
the shop now uses the player class as a parent class.
|
2019-02-18 19:47:42 -07:00 |
|
KahootChampion
|
5c41bf5b7c
|
Added retreat option (not perfected)
|
2019-02-18 19:05:14 -07:00 |
|
|
|
a5cbc87906
|
Created Player class
|
2019-02-18 18:56:45 -07:00 |
|
|
|
509a587447
|
Created Player class
|
2019-02-18 18:47:00 -07:00 |
|
|
|
53a5115f01
|
Created Core class
|
2019-02-18 18:38:01 -07:00 |
|
KahootChampion
|
bd4ddd767a
|
Added troll comments
|
2019-02-17 20:00:07 -07:00 |
|
|
|
ced54afefe
|
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 |
|
|
|
1111601c09
|
new updated project
|
2019-02-17 19:13:24 -07:00 |
|
|
|
ee071d5267
|
deleting old files before adding updated project
|
2019-02-17 19:11:07 -07:00 |
|
|
|
af6211fcc7
|
Fixed up the project folder
|
2019-02-17 16:57:12 -07:00 |
|
|
|
25766ca13b
|
Fixed up the project folder
|
2019-02-17 16:56:38 -07:00 |
|
