|
|
e1671d8d21
|
Merge remote-tracking branch 'origin/master'
|
2019-03-10 23:50:56 -06:00 |
|
|
|
e6a67ce1e4
|
Removed previous textbased game
|
2019-03-10 23:50:41 -06:00 |
|
Nathan Lum
|
1ac82edf1e
|
Added Javadoc comments
|
2019-03-10 23:43:19 -06:00 |
|
Nathan Lum
|
1df0cbec36
|
Added Javadoc comments
|
2019-03-10 23:42:24 -06:00 |
|
KahootChampion
|
0af20d9f67
|
Changed one line of text in shipwarfare GUI
|
2019-03-10 23:42:46 -06:00 |
|
Vikramb987
|
5b8682a900
|
Update TaipanShopGUI.java
finished javadocs
|
2019-03-10 23:18:20 -06:00 |
|
|
|
a58d0fa184
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/WarehouseGUI.java
|
2019-03-10 23:05:39 -06:00 |
|
KahootChampion
|
4d09891665
|
Added to my javadocs a bit
|
2019-03-10 23:03:30 -06:00 |
|
|
|
91bb72351e
|
Fixed the Game End screen into Taipan Shop
|
2019-03-10 23:00:25 -06:00 |
|
KahootChampion
|
ba16ea1809
|
Completed javadocs for shipwarfare GUI
|
2019-03-10 22:58:43 -06:00 |
|
Nathan Lum
|
9b9af573a8
|
Added Javadoc comments
|
2019-03-10 22:56:26 -06:00 |
|
KahootChampion
|
c6df980f8e
|
Fixed ShipWarfare bug about one-shotting.
|
2019-03-10 22:43:46 -06:00 |
|
Vikram
|
666e409e74
|
Merge remote-tracking branch 'origin/master'
|
2019-03-10 22:42:55 -06:00 |
|
Vikram
|
89f9e47921
|
some changes...
|
2019-03-10 22:42:40 -06:00 |
|
|
|
414a9634b5
|
Merge remote-tracking branch 'origin/master'
|
2019-03-10 22:11:07 -06:00 |
|
|
|
f4fbc474e7
|
Finished the End Game Screen
|
2019-03-10 22:10:45 -06:00 |
|
Vikram
|
4c8b99d4bb
|
Merge remote-tracking branch 'origin/master'
|
2019-03-10 21:50:27 -06:00 |
|
Vikram
|
ffb77b14a0
|
some changes...
|
2019-03-10 21:49:50 -06:00 |
|
Vikramb987
|
0c5317cf6f
|
Update TaipanShopGUI.java
fixed to adapt to loanshark
|
2019-03-10 21:15:38 -06:00 |
|
Vikram
|
461171ff46
|
minor changes. Still in progress.
|
2019-03-10 21:12:44 -06:00 |
|
Vikramb987
|
13f30b681a
|
Update TaipanShopGUI.java
made it so that certain buttons are invisible in certain locations.
|
2019-03-10 21:12:26 -06:00 |
|
Siddhant Dewani
|
1d5e5aa706
|
Fixed bank and loanshark
|
2019-03-10 21:11:49 -06:00 |
|
Vikramb987
|
01ee9b2600
|
Update TaipanShopGUI.java
fixed shop prices not changing
|
2019-03-10 20:49:45 -06:00 |
|
|
|
3aa6ad619d
|
Merge remote-tracking branch 'origin/master'
|
2019-03-10 20:13:33 -06:00 |
|
|
|
0b8b8ed50c
|
Fixed output for travel
|
2019-03-10 20:13:06 -06:00 |
|
KahootChampion
|
df372522e4
|
Probably should upload
|
2019-03-10 20:12:01 -06:00 |
|
KahootChampion
|
4fd40af606
|
Completed ShipWarfareGUI
|
2019-03-10 20:01:20 -06:00 |
|
KahootChampion
|
664d194d7b
|
Completed SHipWarfareGUI
|
2019-03-10 20:00:36 -06:00 |
|
KahootChampion
|
2198fffbd5
|
A lot of errors but easily fixable SHipwarfareGUI
|
2019-03-10 19:41:43 -06:00 |
|
|
|
d395d91730
|
Made it so you're not locked out of Taipan shop for Bank and Loanshark
|
2019-03-10 18:54:03 -06:00 |
|
|
|
31e93f6997
|
Fixed BorderPane issue in Warehouse
|
2019-03-10 18:38:24 -06:00 |
|
|
|
0f2e8848ad
|
Merged together Taipanshop with both Loanshark and Bank GUI
|
2019-03-10 18:36:54 -06:00 |
|
|
|
c3f7cc16d2
|
Merge remote-tracking branch 'origin/master'
|
2019-03-10 18:29:17 -06:00 |
|
|
|
9a15f6bc63
|
Merged TaipanShop and Warehouse. Just need to add functionality to warehouse.
|
2019-03-10 18:28:59 -06:00 |
|
Siddhant Dewani
|
680225550f
|
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
|
2019-03-10 18:23:48 -06:00 |
|
Siddhant Dewani
|
6778aa5737
|
Merge remote-tracking branch 'origin/master'
|
2019-03-10 18:07:34 -06:00 |
|
Siddhant Dewani
|
46624389f5
|
Finished LoanShark!!
|
2019-03-10 18:06:03 -06:00 |
|
|
|
a0e0ab517d
|
Merged Travel and Ship warfare
|
2019-03-10 17:35:46 -06:00 |
|
Nathan Lum
|
5e33374e3c
|
Add files via upload
|
2019-03-10 17:27:17 -06:00 |
|
|
|
325c4127dd
|
Fix bunch of issues with Travel and Taipanshop, also merged Main, Shop, Travel and Start. Now attempting to merge in ship.
|
2019-03-10 16:06:48 -06:00 |
|
KahootChampion
|
fde76a5bfb
|
Just checking
|
2019-03-10 15:45:31 -06:00 |
|
KahootChampion
|
888d8a1c92
|
Fined minor bugs in shipwarfareGUI including the "gun frustration" variable
|
2019-03-10 12:10:33 -06:00 |
|
KahootChampion
|
42c4534f52
|
Fixed probability of ships running away
|
2019-03-10 12:00:00 -06:00 |
|
KahootChampion
|
a07d633ff9
|
Basic functionality of buttons completed, think all I have to do now is to find a way to break the code when the user wins, loses or runs away.
|
2019-03-10 11:26:54 -06:00 |
|
KahootChampion
|
b4e0e18d20
|
Completely ruined shipWarfare with a previous edit, fixed it and added a better loot feature for peasant ships
|
2019-03-10 03:30:28 -06:00 |
|
KahootChampion
|
d558e7cf0c
|
Fixed the loot system a bit
|
2019-03-10 01:44:02 -07:00 |
|
KahootChampion
|
36aa789590
|
Fixed numOfShips method for ShipWarfareGUI
|
2019-03-10 01:14:37 -07:00 |
|
KahootChampion
|
e5807a46af
|
Shipwarfare fight button GUI almost complete
|
2019-03-10 00:39:59 -07:00 |
|
KahootChampion
|
5f6abbc817
|
ShipWarfare fight button coming along nicely
|
2019-03-09 23:52:51 -07:00 |
|
|
|
b376ad5284
|
Fixed loop problem ShipwarfareGUI
|
2019-03-09 23:36:58 -07:00 |
|
