Commit Graph

24 Commits

Author SHA1 Message Date
Vikramb987
283e51c375 Update TravelGUI.java
fixed formatting
2019-03-25 12:52:53 -06:00
Vikramb987
3ac1087741 Update TravelGUI.java
epicchanges
2019-03-25 12:19:05 -06:00
0f56a515c1 Fixed some of the code related with Liu Yuen and fixed some of the javadocing 2019-03-24 23:31:05 -06:00
KahootChampion
f379278dc8 Completed ShipWarfareGUI 2019-03-24 21:58:53 -06:00
566cc9dfb2 Warehouse and Travel events are still work in progress but added their code to the github repo 2019-03-24 19:11:54 -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
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
4efe650091 Fixed the problem where shipwarfare didn't run after Travel 2019-03-11 19:40:13 -06:00
923ff50c87 Finished the fix for negative numbers and Strings messing up the travel textField 2019-03-11 19:07:11 -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
4e4d30c222 Update TravelGUI.java
aesthetic changes
2019-03-11 12:41:32 -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
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
ffb77b14a0 some changes... 2019-03-10 21:49:50 -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
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
75673d40e1 Finished TravelGUI and StartGUI 2019-03-09 23:26:25 -07:00