Commit Graph

261 Commits

Author SHA1 Message Date
KahootChampion
bf21232510 Small error in animation whcih shoots even if no guns must fix that 2019-03-24 21:02:13 -06:00
KahootChampion
31c72b3a1c changed some stuff related to the fight button animation 2019-03-24 19:50:42 -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
KahootChampion
68f2c345d9 Merge remote-tracking branch 'origin/master' 2019-03-24 19:08:11 -06:00
KahootChampion
f27ee3d1d5 Made fight button basically functional for AnimationTesting 2019-03-24 19:07:51 -06:00
9012da0b3d Merge remote-tracking branch 'origin/master' 2019-03-24 16:13:46 -06:00
b8ed9bdb87 Made warehouse reappear 2019-03-24 16:12:30 -06:00
KahootChampion
3b38c2475b Sep up the scene which will be used for animation 2019-03-23 22:12:51 -06:00
KahootChampion
ddc8cd4a06 Litty Animation Practice littier 2019-03-23 19:19:44 -06:00
KahootChampion
55b3dbe0b6 Added method for animation 2019-03-23 19:18:39 -06:00
519ddec330 Merge remote-tracking branch 'origin/master' 2019-03-23 19:04:53 -06:00
cf287833f6 Made animation testing same as everyother class, can run from other classes. 2019-03-23 19:04:37 -06:00
KahootChampion
d15e0fd7d7 Added gifs back 2019-03-23 18:57:47 -06:00
KahootChampion
7ec7f00983 Litty Animation Practice 2019-03-23 18:39:20 -06:00
0024e7a5ab Should completely get rid of error messages and print statements related to save state 2019-03-23 18:15:59 -06:00
30cd4805d9 Merge remote-tracking branch 'origin/master' 2019-03-23 18:13:26 -06:00
9d113a656f Finished game saves 2019-03-23 18:13:07 -06:00
3bdd7fb55b Fixed buttons being too large on Linux and Mac 2019-03-23 15:59:35 -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
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