Commit Graph

292 Commits

Author SHA1 Message Date
0bedf3e182 Made it so you can go inbetween screens by pressing enter, allowing for you to speed through the game without pressing buttons. 2019-03-22 23:01:31 -06:00
55ff34ef9b Moved around a few of the images and changed the dimensions of the start screen 2019-03-22 21:05:31 -06:00
KahootChampion
60cb7b3069 Maybe this is whack idk 2019-03-21 12:45:39 -06:00
KahootChampion
7ed267a6a0 Ayy added all the gifs needed. 2019-03-20 17:21:51 -06:00
KahootChampion
55c603716c Made the fight gif runnable by everyone hopefully 2019-03-19 23:53:25 -06:00
KahootChampion
7b9796f92c Made the fight gif runnable by everyone hopefully 2019-03-19 23:49:36 -06:00
KahootChampion
a33273035a Added fight Button gif. Might not work on your computers yet though... I inputed my own local documents folder as the library temporarily. 2019-03-19 23:34:54 -06:00
Vikram
2bc96e5d07 made everything use inheritance instead of whatever we were doing before. 2019-03-19 17:14:42 -06:00
Vikram
0f9ef34f54 Merge remote-tracking branch 'origin/master' 2019-03-11 19:42:14 -06:00
36f72b22e4 Merge remote-tracking branch 'origin/master' 2019-03-11 19:40:25 -06:00
4efe650091 Fixed the problem where shipwarfare didn't run after Travel 2019-03-11 19:40:13 -06:00
Vikramb987
e341112aec Update TaipanShopGUI.java
javadocs update.
2019-03-11 19:38:02 -06:00
Vikram
db4a06e652 javadocs update. 2019-03-11 19:36:23 -06:00
Vikram
a56a6690ee Merge remote-tracking branch 'origin/master' 2019-03-11 19:17:31 -06:00
Vikram
c179ac17ae fixed one small issue. 2019-03-11 19:17:13 -06:00
29e0f3e683 Merge remote-tracking branch 'origin/master' 2019-03-11 19:07:26 -06:00
923ff50c87 Finished the fix for negative numbers and Strings messing up the travel textField 2019-03-11 19:07:11 -06:00
Vikram
15525d789e fixed one small issue. 2019-03-11 19:07:06 -06:00
Vikram
e0171bacfa finished javadocs 2019-03-11 19:00:26 -06:00
KahootChampion
8c776b769b wrote javadocs for authorname 2019-03-11 18:47:10 -06:00
428a7caf80 Fixed the problem where the player could recalculate price values by leaving and entering the travel screen. 2019-03-11 18:27:42 -06:00
Vikramb987
af81624e27 Update TaipanShopGUI.java
changed the javadoc slightly.
2019-03-11 17:21:15 -06:00
KahootChampion
762b399c4b Added JavaDocs for ShipWarfare 2019-03-11 15:33:08 -06:00
Nathan Lum
8402a2368c Added Javadoc comments 2019-03-11 15:28:11 -06:00
Nathan Lum
8c3098a498 Added Javadoc comments 2019-03-11 15:20:38 -06:00
Vikramb987
f1a43a279a Update TaipanShopGUI.java 2019-03-11 15:18:05 -06:00
Nathan Lum
140e8dc706 Added Javadoc comments 2019-03-11 15:17:42 -06:00
Nathan Lum
e21a7c9f54 Added Javadoc comments 2019-03-11 15:12:03 -06:00
Nathan Lum
023e77f034 Added Javadoc comments 2019-03-11 15:07:35 -06:00
Vikramb987
696af67665 Update TaipanShopGUI.java
comment
2019-03-11 14:07:12 -06:00
cf0fd1281f Update README.md 2019-03-11 13:56:54 -06:00
Vikramb987
4e4d30c222 Update TravelGUI.java
aesthetic changes
2019-03-11 12:41:32 -06:00
Vikramb987
d2e42048b2 Update TaipanShopGUI.java
aesthetic changes boi
2019-03-11 12:40:08 -06:00
KahootChampion
303be2eea6 Fixed output for start and TaipanShop GUI 2019-03-11 12:27:17 -06:00
Siddhant Dewani
963f16afca Fixed bank label 2019-03-11 11:49:50 -06:00
Siddhant Dewani
fd03a7c588 FIXED Loanshark and bank 2019-03-11 11:41:06 -06:00
Vikramb987
c912394dd9 Update TaipanShopGUI.java
fixed minor error
2019-03-11 09:09:53 -06:00
c0914d8e5e Renamed a few classes so that all of them are uppercase 2.1 2.0 2019-03-11 02:12:10 -06:00
11b16b4e40 Finished cleaning up the code. Ready for Demo 2 2019-03-11 02:05:26 -06:00
076ba12ef1 Update README.md 2019-03-10 23:54:43 -06:00
59de84a47d Made it GUI friendly 2019-03-10 23:52:35 -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
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