Vikram
|
672707f5b6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/workspace.xml
# src/ShipWarfare.java
|
2019-02-25 07:40:36 -07:00 |
|
Vikram
|
83057e863f
|
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 |
|
KahootChampion
|
ae0e9c4659
|
Changed the timing in ShipWarfare
|
2019-02-24 23:06:05 -07:00 |
|
KahootChampion
|
e495f6e1bb
|
Sneaky bug in shipWarfare regarding having 0 guns is now fixed.
|
2019-02-24 21:33:31 -07:00 |
|
KahootChampion
|
9f23ec187c
|
Forgot a try catch in warehouse
|
2019-02-24 20:38:00 -07:00 |
|
KahootChampion
|
c59f06b127
|
Small thing, changed an output of warehouse a bit, shows user its the warehosue they are concerned with.
|
2019-02-24 20:30:47 -07:00 |
|
KahootChampion
|
1be615fcc4
|
Think I fixed Sid's code
|
2019-02-24 20:26:05 -07:00 |
|
KahootChampion
|
5f1e566c8f
|
Worked On Sid's class a bit
|
2019-02-24 19:56:16 -07:00 |
|
Vikram
|
0bed08ec23
|
linked all the classes together. The project is functional.
|
2019-02-24 19:03:53 -07:00 |
|
Vikram
|
5e64bc95dc
|
bunch of revisions, still in progress
|
2019-02-24 19:00:38 -07:00 |
|
Vikram
|
622c4ab672
|
bunch of revisions, still in progress
|
2019-02-24 16:55:01 -07:00 |
|
Vikram
|
0f20b9a8ec
|
bunch of revisions, still in progress
|
2019-02-24 16:53:45 -07:00 |
|
Vikram
|
210f64cb2f
|
bunch of revisions, still in progress
|
2019-02-24 15:58:17 -07:00 |
|
Vikram
|
dabedd8a72
|
fixed the player object not retaining the changes that were applied
|
2019-02-24 15:44:13 -07:00 |
|
KahootChampion
|
f2f1212436
|
Added a few comments to ShipWarfare
|
2019-02-23 13:49:29 -07:00 |
|
KahootChampion
|
6b3112dfbb
|
Added a few comments to ShipWarfare
|
2019-02-23 13:49:13 -07:00 |
|
KahootChampion
|
0bcdbd1af8
|
Fixed like 3 naming/logical errors in ShipWarfare
|
2019-02-22 00:20:57 -07:00 |
|
KahootChampion
|
f9435e7309
|
Sloppy but completed ShipWarfare class
|
2019-02-21 23:44:30 -07:00 |
|
KahootChampion
|
3bd9f58fb1
|
Added loot. Still need to have ships escape sometimes and Liu yen
|
2019-02-21 21:39:24 -07:00 |
|
KahootChampion
|
b4b2d3377b
|
Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot)
|
2019-02-20 09:47:51 -07:00 |
|
KahootChampion
|
73f757890a
|
Perhaps done basic ship warfare?
|
2019-02-20 07:47:04 -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 |
|
