Commit Graph

36 Commits

Author SHA1 Message Date
Vikramb987
db0d8ec2db Update TaipanShopGUI.java
fixed formatting
2019-03-25 12:51:59 -06:00
Vikramb987
c008a68166 Update TaipanShopGUI.java
epic final changes boi
2019-03-25 12:18:11 -06:00
Vikramb987
85b2043ebf Update TaipanShopGUI.java
fixed some formatting
2019-03-25 12:14:34 -06:00
KahootChampion
5caca9c9e3 Fixed silk issue 2019-03-25 11:03:16 -06:00
bf53113834 Made it so that the user doesn't get pushed into travel if they press enter while buying something 2019-03-24 22:21:15 -06:00
b8ed9bdb87 Made warehouse reappear 2019-03-24 16:12:30 -06:00
9d113a656f Finished game saves 2019-03-23 18:13:07 -06:00
e6e1f02ea9 File saving is work in progress
Added a css file for the game
Made it so that you can press enter to continue forwars
Made folder for both images and save files
2019-03-23 03:37:41 -06:00
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
Vikram
2bc96e5d07 made everything use inheritance instead of whatever we were doing before. 2019-03-19 17:14:42 -06:00
Vikram
db4a06e652 javadocs update. 2019-03-11 19:36:23 -06:00
Vikram
c179ac17ae fixed one small issue. 2019-03-11 19:17:13 -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
Vikramb987
f1a43a279a Update TaipanShopGUI.java 2019-03-11 15:18:05 -06:00
Vikramb987
696af67665 Update TaipanShopGUI.java
comment
2019-03-11 14:07:12 -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
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 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
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
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
91bb72351e Fixed the Game End screen into Taipan Shop 2019-03-10 23:00:25 -06:00
Vikram
89f9e47921 some changes... 2019-03-10 22:42:40 -06:00
Vikram
ffb77b14a0 some changes... 2019-03-10 21:49:50 -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
KahootChampion
664d194d7b Completed SHipWarfareGUI 2019-03-10 20:00:36 -06:00
0f2e8848ad Merged together Taipanshop with both Loanshark and Bank GUI 2019-03-10 18:36:54 -06:00
9a15f6bc63 Merged TaipanShop and Warehouse. Just need to add functionality to warehouse. 2019-03-10 18:28:59 -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