Commit Graph

341 Commits

Author SHA1 Message Date
KahootChampion
271a37877b Notified of getting attacked 2019-03-09 16:09:15 -07:00
KahootChampion
89188152e6 Added time stuff to Shipwarfare GUI 2019-03-09 15:00:00 -07:00
6b9e3dcc06 Added some logic to ShipWarfareGUI 2019-03-09 14:33:27 -07:00
14e5eb2d30 Added basic functionality with KahootChampion 2019-03-09 14:28:02 -07:00
bf2d1c3fb0 Basic layout for ShipwarefareGUI. 2019-03-09 14:14:03 -07:00
Vikramb987
b62274cda3 Update ShopGUI
another set of updates.
2019-03-09 12:04:18 -07:00
Vikramb987
72708e53f2 Update ShopGUI
small change.
2019-03-08 19:44:05 -07:00
Vikramb987
540605f0f1 Update ShopGUI
Updated. Still a w.i.p
2019-03-08 19:36:55 -07:00
Vikramb987
f6fa9dc646 Create ShopGUI
This file is the temporary placeholder for my shop GUI. Very much still in progress.
2019-03-07 20:57:36 -07:00
93f16751f1 Fixed some little problems with documenting. 1.3 2019-02-25 23:47:34 -07:00
507fe4debd Fixed some little problems with documenting. 2019-02-25 23:42:27 -07:00
2d1864bb87 Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs. 2019-02-25 23:31:39 -07:00
Nathan Lum
de3c686db7 Added Javadoc comments 2019-02-25 22:50:58 -07:00
Nathan Lum
2abef09de8 Added Javadoc comments 2019-02-25 22:00:01 -07:00
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
40ba6b0c9b Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with. 2019-02-25 18:53:51 -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 1.2 2019-02-25 14:31:34 -07:00
Vikramb987
6f3bb7d7c4 Update Bank.java
removed rartedness
1.1
2019-02-25 12:55:06 -07:00
KahootChampion
f1bc7681b2 Update README.md 1.0 2019-02-25 12:42:48 -07:00
Vikramb987
c39394e538 Update README.md 2019-02-25 07:51:52 -07:00
Vikram
8d35d073e4 Merge remote-tracking branch 'origin/master' 2019-02-25 07:42:13 -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