Commit Graph

  • 384a874e09 Merge remote-tracking branch 'origin/master' Solargale 2019-03-24 22:08:05 -06:00
  • d82ac891f1 Commented a bit of Random Event Solargale 2019-03-24 22:07:48 -06:00
  • f379278dc8 Completed ShipWarfareGUI KahootChampion 2019-03-24 21:58:53 -06:00
  • 39b494ff88 ShipWarfare javaDocs completed KahootChampion 2019-03-24 21:48:44 -06:00
  • 799704ad5c Fixed the issue where the ship shot with no guns KahootChampion 2019-03-24 21:25:57 -06:00
  • 2fb5d2fb1a Merge remote-tracking branch 'origin/master' KahootChampion 2019-03-24 21:02:20 -06:00
  • bf21232510 Small error in animation whcih shoots even if no guns must fix that KahootChampion 2019-03-24 21:02:13 -06:00
  • 68431ccad8 Merge remote-tracking branch 'origin/master' Solargale 2019-03-24 20:15:28 -06:00
  • b889ccd2bd Finished Warehouse Solargale 2019-03-24 20:15:13 -06:00
  • 31c72b3a1c changed some stuff related to the fight button animation KahootChampion 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 Solargale 2019-03-24 19:11:54 -06:00
  • 68f2c345d9 Merge remote-tracking branch 'origin/master' KahootChampion 2019-03-24 19:08:11 -06:00
  • f27ee3d1d5 Made fight button basically functional for AnimationTesting KahootChampion 2019-03-24 19:07:51 -06:00
  • 9012da0b3d Merge remote-tracking branch 'origin/master' Solargale 2019-03-24 16:13:46 -06:00
  • b8ed9bdb87 Made warehouse reappear Solargale 2019-03-24 16:12:30 -06:00
  • 3b38c2475b Sep up the scene which will be used for animation KahootChampion 2019-03-23 22:12:51 -06:00
  • ddc8cd4a06 Litty Animation Practice littier KahootChampion 2019-03-23 19:19:44 -06:00
  • 55b3dbe0b6 Added method for animation KahootChampion 2019-03-23 19:18:39 -06:00
  • 519ddec330 Merge remote-tracking branch 'origin/master' Solargale 2019-03-23 19:04:53 -06:00
  • cf287833f6 Made animation testing same as everyother class, can run from other classes. Solargale 2019-03-23 19:04:37 -06:00
  • d15e0fd7d7 Added gifs back KahootChampion 2019-03-23 18:57:47 -06:00
  • 7ec7f00983 Litty Animation Practice KahootChampion 2019-03-23 18:39:20 -06:00
  • 0024e7a5ab Should completely get rid of error messages and print statements related to save state Solargale 2019-03-23 18:15:59 -06:00
  • 30cd4805d9 Merge remote-tracking branch 'origin/master' Solargale 2019-03-23 18:13:26 -06:00
  • 9d113a656f Finished game saves Solargale 2019-03-23 18:13:07 -06:00
  • 3bdd7fb55b Fixed buttons being too large on Linux and Mac Solargale 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 Solargale 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. Solargale 2019-03-22 23:01:31 -06:00
  • 55ff34ef9b Moved around a few of the images and changed the dimensions of the start screen Solargale 2019-03-22 21:05:31 -06:00
  • 60cb7b3069 Maybe this is whack idk KahootChampion 2019-03-21 12:45:39 -06:00
  • 7ed267a6a0 Ayy added all the gifs needed. KahootChampion 2019-03-20 17:21:51 -06:00
  • 55c603716c Made the fight gif runnable by everyone hopefully KahootChampion 2019-03-19 23:53:25 -06:00
  • 7b9796f92c Made the fight gif runnable by everyone hopefully KahootChampion 2019-03-19 23:49:36 -06:00
  • a33273035a Added fight Button gif. Might not work on your computers yet though... I inputed my own local documents folder as the library temporarily. KahootChampion 2019-03-19 23:34:54 -06:00
  • 2bc96e5d07 made everything use inheritance instead of whatever we were doing before. Vikram 2019-03-19 17:14:42 -06:00
  • c24d485463 Adding back the old files legacy Solargale 2019-03-12 08:45:44 -06:00
  • ae39a210be Remade Legacy branch after destroying it Solargale 2019-03-12 08:44:25 -06:00
  • 0f9ef34f54 Merge remote-tracking branch 'origin/master' Vikram 2019-03-11 19:42:14 -06:00
  • 36f72b22e4 Merge remote-tracking branch 'origin/master' Solargale 2019-03-11 19:40:25 -06:00
  • 4efe650091 Fixed the problem where shipwarfare didn't run after Travel Solargale 2019-03-11 19:40:13 -06:00
  • e341112aec Update TaipanShopGUI.java Vikramb987 2019-03-11 19:38:02 -06:00
  • db4a06e652 javadocs update. Vikram 2019-03-11 19:36:23 -06:00
  • a56a6690ee Merge remote-tracking branch 'origin/master' Vikram 2019-03-11 19:17:31 -06:00
  • c179ac17ae fixed one small issue. Vikram 2019-03-11 19:17:13 -06:00
  • 29e0f3e683 Merge remote-tracking branch 'origin/master' Solargale 2019-03-11 19:07:26 -06:00
  • 923ff50c87 Finished the fix for negative numbers and Strings messing up the travel textField Solargale 2019-03-11 19:07:11 -06:00
  • 15525d789e fixed one small issue. Vikram 2019-03-11 19:07:06 -06:00
  • e0171bacfa finished javadocs Vikram 2019-03-10 23:08:01 -06:00
  • 8c776b769b wrote javadocs for authorname KahootChampion 2019-03-11 18:46:59 -06:00
  • 428a7caf80 Fixed the problem where the player could recalculate price values by leaving and entering the travel screen. Solargale 2019-03-11 18:27:42 -06:00
  • af81624e27 Update TaipanShopGUI.java Vikramb987 2019-03-11 17:21:15 -06:00
  • 762b399c4b Added JavaDocs for ShipWarfare KahootChampion 2019-03-11 15:32:52 -06:00
  • 8402a2368c Added Javadoc comments Nathan Lum 2019-03-11 15:28:11 -06:00
  • 8c3098a498 Added Javadoc comments Nathan Lum 2019-03-11 15:20:38 -06:00
  • f1a43a279a Update TaipanShopGUI.java Vikramb987 2019-03-11 15:18:05 -06:00
  • 140e8dc706 Added Javadoc comments Nathan Lum 2019-03-11 15:17:42 -06:00
  • e21a7c9f54 Added Javadoc comments Nathan Lum 2019-03-11 15:12:03 -06:00
  • 023e77f034 Added Javadoc comments Nathan Lum 2019-03-11 15:07:35 -06:00
  • 696af67665 Update TaipanShopGUI.java Vikramb987 2019-03-11 14:07:12 -06:00
  • cf0fd1281f Update README.md Solargale 2019-03-11 13:56:54 -06:00
  • 4e4d30c222 Update TravelGUI.java Vikramb987 2019-03-11 12:41:32 -06:00
  • d2e42048b2 Update TaipanShopGUI.java Vikramb987 2019-03-11 12:40:08 -06:00
  • 303be2eea6 Fixed output for start and TaipanShop GUI KahootChampion 2019-03-11 12:27:05 -06:00
  • 963f16afca Fixed bank label Siddhant Dewani 2019-03-11 11:49:50 -06:00
  • fd03a7c588 FIXED Loanshark and bank Siddhant Dewani 2019-03-11 11:41:06 -06:00
  • c912394dd9 Update TaipanShopGUI.java Vikramb987 2019-03-11 09:09:53 -06:00
  • c0914d8e5e Renamed a few classes so that all of them are uppercase 2.1 2.0 Solargale 2019-03-11 02:12:10 -06:00
  • 11b16b4e40 Finished cleaning up the code. Ready for Demo 2 Solargale 2019-03-11 02:05:26 -06:00
  • 076ba12ef1 Update README.md Solargale 2019-03-10 23:54:43 -06:00
  • 59de84a47d Made it GUI friendly Solargale 2019-03-10 23:52:35 -06:00
  • e1671d8d21 Merge remote-tracking branch 'origin/master' Solargale 2019-03-10 23:50:56 -06:00
  • e6a67ce1e4 Removed previous textbased game Solargale 2019-03-10 23:50:41 -06:00
  • 1ac82edf1e Added Javadoc comments Nathan Lum 2019-03-10 23:43:19 -06:00
  • 1df0cbec36 Added Javadoc comments Nathan Lum 2019-03-10 23:42:24 -06:00
  • 0af20d9f67 Changed one line of text in shipwarfare GUI KahootChampion 2019-03-10 23:42:37 -06:00
  • 5b8682a900 Update TaipanShopGUI.java Vikramb987 2019-03-10 23:18:20 -06:00
  • a58d0fa184 Merge remote-tracking branch 'origin/master' Solargale 2019-03-10 23:05:39 -06:00
  • 4d09891665 Added to my javadocs a bit KahootChampion 2019-03-10 23:03:30 -06:00
  • 91bb72351e Fixed the Game End screen into Taipan Shop Solargale 2019-03-10 23:00:25 -06:00
  • ba16ea1809 Completed javadocs for shipwarfare GUI KahootChampion 2019-03-10 22:58:31 -06:00
  • 9b9af573a8 Added Javadoc comments Nathan Lum 2019-03-10 22:56:26 -06:00
  • c6df980f8e Fixed ShipWarfare bug about one-shotting. KahootChampion 2019-03-10 22:43:25 -06:00
  • 666e409e74 Merge remote-tracking branch 'origin/master' Vikram 2019-03-10 22:42:55 -06:00
  • 89f9e47921 some changes... Vikram 2019-03-10 22:42:40 -06:00
  • 414a9634b5 Merge remote-tracking branch 'origin/master' Solargale 2019-03-10 22:11:07 -06:00
  • f4fbc474e7 Finished the End Game Screen Solargale 2019-03-10 22:10:45 -06:00
  • 4c8b99d4bb Merge remote-tracking branch 'origin/master' Vikram 2019-03-10 21:50:27 -06:00
  • ffb77b14a0 some changes... Vikram 2019-03-10 21:49:50 -06:00
  • 0c5317cf6f Update TaipanShopGUI.java Vikramb987 2019-03-10 21:15:38 -06:00
  • 461171ff46 minor changes. Still in progress. Vikram 2019-02-25 19:42:37 -07:00
  • 13f30b681a Update TaipanShopGUI.java Vikramb987 2019-03-10 21:12:26 -06:00
  • 1d5e5aa706 Fixed bank and loanshark Siddhant Dewani 2019-03-10 21:11:49 -06:00
  • 01ee9b2600 Update TaipanShopGUI.java Vikramb987 2019-03-10 20:49:45 -06:00
  • 3aa6ad619d Merge remote-tracking branch 'origin/master' Solargale 2019-03-10 20:13:33 -06:00
  • 0b8b8ed50c Fixed output for travel Solargale 2019-03-10 20:13:06 -06:00
  • df372522e4 Probably should upload KahootChampion 2019-03-10 20:12:01 -06:00
  • 4fd40af606 Completed ShipWarfareGUI KahootChampion 2019-03-10 20:01:20 -06:00
  • 664d194d7b Completed SHipWarfareGUI KahootChampion 2019-03-10 20:00:36 -06:00
  • 2198fffbd5 A lot of errors but easily fixable SHipwarfareGUI KahootChampion 2019-03-10 19:41:30 -06:00
  • d395d91730 Made it so you're not locked out of Taipan shop for Bank and Loanshark Solargale 2019-03-10 18:54:03 -06:00