Commit Graph

342 Commits

Author SHA1 Message Date
Vikramb987
600fe404d5 Update ShipWarfare.java
somehow, the comment doesn't let me compile the file.
2019-02-25 07:35:41 -07:00
Vikramb987
602e931387 Update README.md 2019-02-25 07:22:25 -07:00
Vikramb987
ecb5072a06 Create README.md 2019-02-25 07:21:07 -07:00
KahootChampion
ae0e9c4659 Changed the timing in ShipWarfare 2019-02-24 23:06:05 -07:00
Siddhant Dewani
f6f0c960ea Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with. 2019-02-24 22:03:32 -07:00
Siddhant Dewani
1959f63821 Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with. 2019-02-24 22:01:02 -07:00
Siddhant Dewani
081892ea6d Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with. 2019-02-24 21:57:53 -07:00
Siddhant Dewani
e31587ecdc Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with. 2019-02-24 21:47:05 -07:00
Siddhant Dewani
d50058f056 Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with. 2019-02-24 21:39:26 -07:00
Siddhant Dewani
9f84e23a10 Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with. 2019-02-24 21:39:25 -07:00
KahootChampion
5d9c371e84 Really small change in Sid's code that no one will probably ever notice lol 2019-02-24 21:40:20 -07:00
KahootChampion
e495f6e1bb Sneaky bug in shipWarfare regarding having 0 guns is now fixed. 2019-02-24 21:33:31 -07:00
Siddhant Dewani
3ecc99a879 Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with. 2019-02-24 21:24:45 -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
siddhantdewani
6511f40b8b Update Warehouse.java 2019-02-24 18:21:58 -07:00
siddhantdewani
c4e8866a8f Update loanShark.java 2019-02-24 18:12:06 -07:00
siddhantdewani
0b20f2b62d Update Warehouse.java 2019-02-24 18:08:05 -07:00
siddhantdewani
915c58bcc5 Update Warehouse.java 2019-02-24 17:23:00 -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
Nathan Lum
8de19f35e4 Add files via upload 2019-02-24 15:38:51 -07:00
siddhantdewani
b17a52ceb8 Add files via upload 2019-02-24 00:15:25 -07:00
siddhantdewani
ba2ac1565d Update Warehouse.java 2019-02-24 00:13:01 -07:00
siddhantdewani
fee8309822 Update Bank.java 2019-02-24 00:12:14 -07:00
siddhantdewani
c9936e2a34 Update Bank.java 2019-02-23 17:45:45 -07:00
KahootChampion
5dee1686a1 Cited where I learned about Time Unit 2019-02-23 14:09:10 -07:00
Vikramb987
eed1ab1432 Update main.java
better encapsulation.
2019-02-23 13:51:07 -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
36f3b84eb8 Brought back Vikram's changes 2019-02-22 16:44:52 -07:00
Nathan Lum
7a947a87c2 Update Start.java 2019-02-22 15:05:43 -07:00
Nathan Lum
123d329bbf Add files via upload 2019-02-22 14:10:15 -07:00
Nathan Lum
01acec2b16 Update Player.java 2019-02-22 13:28:06 -07:00
KahootChampion
0bcdbd1af8 Fixed like 3 naming/logical errors in ShipWarfare 2019-02-22 00:20:57 -07:00
KahootChampion
4b047f46c4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/ShipWarfare.java
#	src/TaipanShop.java
2019-02-21 23:44:57 -07:00
KahootChampion
f9435e7309 Sloppy but completed ShipWarfare class 2019-02-21 23:44:30 -07:00
Vikramb987
b78ba180f5 Update Travel.java 2019-02-21 22:08:26 -07:00
Vikramb987
1540323985 Update ShipWarfare.java 2019-02-21 22:08:11 -07:00
Vikramb987
0a93de3354 Update TaipanShop.java 2019-02-21 22:07:51 -07:00
Vikramb987
2395eb3298 Update Player.java 2019-02-21 22:07:27 -07:00
Vikramb987
0a4968998c Create main.java
the main file
2019-02-21 22:07:08 -07:00
KahootChampion
3bd9f58fb1 Added loot. Still need to have ships escape sometimes and Liu yen 2019-02-21 21:39:24 -07:00
siddhantdewani
5c5aff2ae0 Update Player.java 2019-02-21 20:55:23 -07:00