Nathan Lum
b1421e19d4
Added Javadoc comments
2019-02-25 21:15:46 -07:00
Nathan Lum
55e1ae2d5f
Added Javadoc comments
2019-02-25 21:12:33 -07:00
Vikramb987
697c221323
Update Player.java
2019-02-25 20:19:40 -07:00
Vikramb987
4aaff2809a
Update main.java
2019-02-25 20:19:14 -07:00
KahootChampion
581bee7bfe
Test out this code BOIZ
2019-02-25 20:20:11 -07:00
KahootChampion
1295d625fb
KK
2019-02-25 20:07:21 -07:00
KahootChampion
52ec4c2422
Aight fixed some stuff
2019-02-25 20:06:21 -07:00
KahootChampion
27ac100618
Test this Vikram
2019-02-25 20:01:21 -07:00
Vikramb987
94762234af
Update main.java
2019-02-25 19:58:32 -07:00
Vikramb987
207d258e05
Update Start.java
...
very small change -- again just for testing
2019-02-25 19:47:20 -07:00
Vikramb987
f236650611
Update TaipanShop.java
...
javadocs and some changes to how the game ends
2019-02-25 19:46:09 -07:00
Vikramb987
757d258e3d
Update Player.java
...
changes to how the game ends
2019-02-25 19:44:21 -07:00
KahootChampion
e7a0ddf085
Small change to javadocs for shipwarfare
2019-02-25 19:42:19 -07:00
KahootChampion
70b698c22e
Java Docs BOIZ for ShipWarafare
2019-02-25 19:35:50 -07:00
Siddhant Dewani
4cc9ac5d26
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
2019-02-25 19:16:09 -07:00
Siddhant Dewani
c66e3d5d70
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
2019-02-25 19:06:02 -07:00
Siddhant Dewani
2ae60073c0
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
2019-02-25 18:53:25 -07:00
Vikram
c4c4a41776
Merge remote-tracking branch 'origin/master'
2019-02-25 18:43:11 -07:00
Vikram
6b379bae3a
minor changes. Still in progress.
2019-02-25 18:42:48 -07:00
Siddhant Dewani
67ddc34c65
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
2019-02-25 18:42:40 -07:00
Vikram
b6b5c14c56
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# out/production/TaipanClone/ShipWarfare.class
2019-02-25 18:33:26 -07:00
Vikram
d1c3fe0f7e
minor changes. Still in progress.
2019-02-25 18:31:54 -07:00
Nathan Lum
fcb0b50468
Added Javadocs comments
2019-02-25 17:45:06 -07:00
KahootChampion
237ce1da27
Stupid error was fixed
2019-02-25 17:42:58 -07:00
Nathan Lum
3b068d869b
Update main.java
2019-02-25 16:28:36 -07:00
Nathan Lum
70d9a36af5
Update Start.java
2019-02-25 16:28:09 -07:00
Vikramb987
06739ed20c
Update loanShark.java
2019-02-25 14:31:34 -07:00
Vikramb987
6f3bb7d7c4
Update Bank.java
...
removed rartedness
2019-02-25 12:55:06 -07:00
Vikramb987
1bad8198a1
Update ShipWarfare.java
...
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:41:58 -07:00
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
Vikramb987
600fe404d5
Update ShipWarfare.java
...
somehow, the comment doesn't let me compile the file.
2019-02-25 07:35:41 -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
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
