Commit Graph

33 Commits

Author SHA1 Message Date
KahootChampion
8c776b769b wrote javadocs for authorname 2019-03-11 18:47:10 -06:00
KahootChampion
762b399c4b Added JavaDocs for ShipWarfare 2019-03-11 15:33:08 -06:00
11b16b4e40 Finished cleaning up the code. Ready for Demo 2 2019-03-11 02:05:26 -06:00
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
KahootChampion
0af20d9f67 Changed one line of text in shipwarfare GUI 2019-03-10 23:42:46 -06:00
KahootChampion
4d09891665 Added to my javadocs a bit 2019-03-10 23:03:30 -06:00
KahootChampion
ba16ea1809 Completed javadocs for shipwarfare GUI 2019-03-10 22:58:43 -06:00
KahootChampion
c6df980f8e Fixed ShipWarfare bug about one-shotting. 2019-03-10 22:43:46 -06:00
f4fbc474e7 Finished the End Game Screen 2019-03-10 22:10:45 -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
a0e0ab517d Merged Travel and Ship warfare 2019-03-10 17:35:46 -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
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
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
5a7d1e7c34 Missed one statement that I needed to encapsulate 2019-03-09 18:33:33 -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