|
|
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 |
|
|
|
b945cafe98
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/workspace.xml
|
2019-03-09 23:27:03 -07:00 |
|
|
|
75673d40e1
|
Finished TravelGUI and StartGUI
|
2019-03-09 23:26:25 -07:00 |
|
KahootChampion
|
9feac6e90e
|
Forces you to fight in ShipWarfareGUI unfortunately
|
2019-03-09 22:52:30 -07:00 |
|
KahootChampion
|
1bb00d0d01
|
Super broken but fight button is in progress for shipwarfare
|
2019-03-09 22:32:45 -07:00 |
|
KahootChampion
|
80102eabee
|
Please find error
|
2019-03-09 20:03:51 -07:00 |
|
KahootChampion
|
f5845cb8df
|
Messed up player by setting money to 1000
|
2019-03-09 18:34:27 -07:00 |
|
KahootChampion
|
5a7d1e7c34
|
Missed one statement that I needed to encapsulate
|
2019-03-09 18:33:33 -07:00 |
|
KahootChampion
|
370b3ee041
|
Made ShipWarfare easier to access by ShipWarfareGUI
|
2019-03-09 18:28:44 -07:00 |
|
Vikramb987
|
7314bc174f
|
Update ShopGUI
Mostly done.
|
2019-03-09 16:51:26 -07:00 |
|
KahootChampion
|
5c78f561d8
|
Added fight stuff
|
2019-03-09 16:13:36 -07:00 |
|
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 |
|
