RecentRunner/TaipanClone
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

Commit Graph

  • 340a118ef4 Fixed shipwarfare master 4.2 Solargale 2019-04-12 14:08:16 -06:00
  • 8c5f0b1f95 Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts. Solargale 2019-04-11 14:36:52 -06:00
  • 49a62c4a4d Update TaipanShopLogic.java 4.1 Vikramb987 2019-04-12 09:06:08 -06:00
  • f0416db9c2 Update README.md Vikramb987 2019-04-12 08:59:41 -06:00
  • 2d4a1add07 Update README.md Vikramb987 2019-04-12 08:56:21 -06:00
  • 984beaabf9 Update TaipanShopGUI.java Vikramb987 2019-04-12 08:42:15 -06:00
  • b697978614 Update TaipanShopGUI.java Vikramb987 2019-04-12 08:41:35 -06:00
  • 805341797f Added headers 4.0 Solargale 2019-04-12 04:53:20 -06:00
  • 6c411b6c3b Updated the read me for the interactive demo Solargale 2019-04-12 04:51:48 -06:00
  • 8222cdaecb Fixed up last of the bug fixes, this should be it up until the interactive demo Solargale 2019-04-12 04:45:31 -06:00
  • f89c1aa209 Redid a bunch of commenting making sure that every method was commented. Solargale 2019-04-12 03:54:20 -06:00
  • 03ff12b832 Got the text version up and running, had to make a bunch of methods to get it running though Solargale 2019-04-12 01:07:45 -06:00
  • b4f9ce761c Done work on shipWarfareGUi, shortened what needed to be shortened. KahootChampion 2019-04-11 22:27:27 -06:00
  • 0b5df085bf Done working on ShipWarfareText KahootChampion 2019-04-11 22:11:06 -06:00
  • 44f1ee5b2a Done working on SHipWarfareText KahootChampion 2019-04-11 22:10:30 -06:00
  • 0086abb2a7 Fixed many issues with ShipWarfare text like the fact that the game wouldnt end when all ships were defeated until all shots had been fired KahootChampion 2019-04-11 22:01:34 -06:00
  • 0221a5a2f1 Added Javadocs Nathan Lum 2019-04-11 20:18:53 -06:00
  • 7134a6825e Update RandomEventLogic.java Nathan Lum 2019-04-11 20:10:13 -06:00
  • 74f0f31a46 Merge remote-tracking branch 'origin/master' KahootChampion 2019-04-11 17:52:39 -06:00
  • c6b34f49b3 Completed ShipWarfare KahootChampion 2019-04-11 17:52:24 -06:00
  • 36a89bc713 epic style fixes Vikramb987 2019-04-11 14:46:48 -06:00
  • dbf92288c5 Update README.md Vikramb987 2019-04-11 14:41:57 -06:00
  • 7ca1e3e4a3 Updated with the correct complication stuff Solargale 2019-04-11 14:29:32 -06:00
  • ff4dd2b733 Merge remote-tracking branch 'origin/master' KahootChampion 2019-04-11 13:49:14 -06:00
  • 4ec469de7d Added Javadocs for start in MainGUI and separated ShipWarfare into more methods. KahootChampion 2019-04-11 13:48:56 -06:00
  • a2c7d7dd67 Update LoanSharkGUI.java Vikramb987 2019-04-11 13:43:17 -06:00
  • ea5faaca36 Added stuff to randomEvents logic Solargale 2019-04-10 23:16:20 -06:00
  • a2e3879cae Created logic class for Warehouse Solargale 2019-04-10 17:58:05 -06:00
  • 784272e362 Removed some layerings from SHipWarfare related classes KahootChampion 2019-04-08 12:46:55 -06:00
  • e6b8ac33ef Update StartGUI.java Nathan Lum 2019-04-08 11:51:50 -06:00
  • 1d47933bae Update StartLogic.java Nathan Lum 2019-04-08 11:51:07 -06:00
  • 195c3793db Update StartText.java Nathan Lum 2019-04-08 11:50:32 -06:00
  • 3f68202bb5 Minor changes Solargale 2019-04-07 18:28:32 -06:00
  • 26064ebac3 Added some content to the textgame files and added some stuff to the logic files. Also fixed formating in TravelGUI Solargale 2019-04-07 16:35:22 -06:00
  • f37aa91fad Made every appropriate Text and Logic class Solargale 2019-04-07 14:58:48 -06:00
  • e2ad32c4ee Moved everything into logic classes Solargale 2019-04-07 14:44:41 -06:00
  • 9e97877e6e Have logic and ShipWarfareGUI sufficiently separated KahootChampion 2019-04-07 14:17:44 -06:00
  • f834afb98f ShipWarfareText Complete Haris Muhammad KahootChampion 2019-04-07 14:06:25 -06:00
  • fff5456b45 Mostly done ShiPWarfareText KahootChampion 2019-04-07 13:52:36 -06:00
  • 548448bda1 Fixed various issues but mainly with SHipWarfareText firing even when "r" was inputed as the command to run KahootChampion 2019-04-07 13:15:26 -06:00
  • ea591057cd Fixed the severe lack of TaipanShopText Solargale 2019-04-07 12:59:00 -06:00
  • 7901ac94c4 Finished the merger with Dedupe and the main branch. Travel and Taipan shop shouldn't have any code sharing anymore Solargale 2019-04-07 12:52:32 -06:00
  • 4e53d590a9 Merge branch 'dedupe' Solargale 2019-04-07 12:48:37 -06:00
  • 5283b60c4f Updated shipwarfare text to the modern era Solargale 2019-04-07 12:45:39 -06:00
  • 97927dc3f8 Adding ShipWarfareText KahootChampion 2019-04-07 12:41:45 -06:00
  • ca778137a5 Fixed duplication between Shop and Travel Solargale 2019-04-07 12:35:20 -06:00
  • 4db5b6e318 Fixed ShipWarfareGUI and ShipWarfareLogic KahootChampion 2019-04-07 12:08:05 -06:00
  • ab596f60b0 Fixed money updating after fighting for loot Solargale 2019-04-07 11:23:01 -06:00
  • ae8cac6595 Fixed problem with HP and Gun amount not carrying over Solargale 2019-04-07 11:05:09 -06:00
  • 5a77f8c4e8 Doesnt take healtha way when user wins KahootChampion 2019-04-07 10:52:42 -06:00
  • cb4e13b888 For some reason, the setHp method works only in shipwarfareGUI but does not transfer to TaipanShopGUI KahootChampion 2019-04-06 23:16:41 -06:00
  • 233521b6a7 Have logic and ShipWarfareGUI sufficiently separated KahootChampion 2019-04-06 22:50:54 -06:00
  • 8786e5d3c6 WIP ShipWarFareLogic GUI made it so that I can start form scratch at combining logic with GUI KahootChampion 2019-04-06 22:28:23 -06:00
  • b11db35eb0 Must fix issues with logic for shipGui still KahootChampion 2019-04-06 22:23:57 -06:00
  • f8ee683728 Before abandoning destroyLittyShipsOrEscape separation KahootChampion 2019-04-06 21:50:54 -06:00
  • 5d0e349ffb I DON'T KNOW WHAT I DID, BUT IT WORKED A LITTLE BIT Solargale 2019-04-06 18:09:04 -06:00
  • 256706377d Mesed with ship and litterally accomplished nothing KahootChampion 2019-04-06 17:44:11 -06:00
  • 9959de99f6 Fixed up problem where you don't get cash from ships. Solargale 2019-04-06 16:56:08 -06:00
  • 5e7667aa31 Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts. Solargale 2019-04-06 16:45:42 -06:00
  • 8d07d531de Helath not lowering anymore KahootChampion 2019-04-06 16:24:47 -06:00
  • 05c25c01e0 Fixed issue with Shipwarfare not loading up Solargale 2019-04-06 15:44:10 -06:00
  • 92cd1db4f5 Failed attempt at separating logic and GUI but saving just in case I need it later KahootChampion 2019-04-06 15:21:53 -06:00
  • 7f1e8a4be8 Made Solargale 2019-04-06 15:20:37 -06:00
  • 3beb1ff33d Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts. Solargale 2019-04-06 14:00:33 -06:00
  • 6bbd852c8b Failed attempt at separating logic and GUI but saving just in case I need it later KahootChampion 2019-04-04 22:13:04 -06:00
  • 9c17adfb38 Create TaipanShopLogic.java Vikramb987 2019-04-02 18:52:51 -06:00
  • bd162428a5 Create TaipanShopText.java Vikramb987 2019-04-02 18:52:17 -06:00
  • 9ee378279b Update TaipanShopGUI.java Vikramb987 2019-04-02 18:49:59 -06:00
  • 61ba606e89 Playing with miss animation KahootChampion 2019-03-29 08:20:56 -06:00
  • 02efa7a9ba Fixed an issue with ShipWarfareGUI with the ships running away label KahootChampion 2019-03-25 18:32:17 -06:00
  • b39ddffcf8 Fixed demo 3 3.1 Solargale 2019-03-25 13:43:36 -06:00
  • 7e9ba348b2 Ship Warfare "dang it" issue fixed KahootChampion 2019-03-25 13:35:11 -06:00
  • a96de93b13 Added libraries to the file Solargale 2019-03-25 13:31:01 -06:00
  • 4cf4bc3cb9 Merge remote-tracking branch 'origin/master' Solargale 2019-03-25 13:26:20 -06:00
  • 55214ce652 Made it so that randomEventGUI looks normal on Linux Solargale 2019-03-25 13:26:01 -06:00
  • 19134408a8 Update FileSaving.java Vikramb987 2019-03-25 13:18:16 -06:00
  • 77e43f0fd2 Update TaipanShopGUI.java Vikramb987 2019-03-25 13:17:43 -06:00
  • 69a4f121c5 Demo 3 Solargale 2019-03-25 13:17:13 -06:00
  • 1d970b201c Update BankGUI.java Vikramb987 2019-03-25 13:07:03 -06:00
  • fd921053d3 Update LoanSharkGUI.java Vikramb987 2019-03-25 13:01:16 -06:00
  • 283e51c375 Update TravelGUI.java Vikramb987 2019-03-25 12:52:53 -06:00
  • db0d8ec2db Update TaipanShopGUI.java Vikramb987 2019-03-25 12:51:59 -06:00
  • 45d6d794f9 Update ShipWarfareGUI.java Vikramb987 2019-03-25 12:49:43 -06:00
  • dc28fb504d Finished PlayerTest Solargale 2019-03-25 12:48:13 -06:00
  • 5a43adf7ad Merge remote-tracking branch 'origin/master' Solargale 2019-03-25 12:29:56 -06:00
  • 290dce81db Player Test Solargale 2019-03-25 12:28:51 -06:00
  • 6e43912b2e Update ShipWarfareGUI.java Vikramb987 2019-03-25 12:25:59 -06:00
  • 3ac1087741 Update TravelGUI.java Vikramb987 2019-03-25 12:19:05 -06:00
  • c008a68166 Update TaipanShopGUI.java Vikramb987 2019-03-25 12:18:11 -06:00
  • 85b2043ebf Update TaipanShopGUI.java Vikramb987 2019-03-25 12:14:34 -06:00
  • 61f88c0a86 Completed ShipWarfareGUI KahootChampion 2019-03-25 11:06:39 -06:00
  • 5caca9c9e3 Fixed silk issue KahootChampion 2019-03-25 11:03:16 -06:00
  • 24cb7ea70e Pushed the fix for ship repair while 100 hp Solargale 2019-03-25 00:08:40 -06:00
  • 0f56a515c1 Fixed some of the code related with Liu Yuen and fixed some of the javadocing 3.0 Solargale 2019-03-24 23:31:05 -06:00
  • 4d8265ea79 added javadocs Siddhant Dewani 2019-03-24 22:45:58 -06:00
  • 0d548442d4 Merge remote-tracking branch 'origin/master' Siddhant Dewani 2019-03-24 22:45:25 -06:00
  • f0b1d42892 Merge remote-tracking branch 'origin/master' Solargale 2019-03-24 22:32:49 -06:00
  • bf53113834 Made it so that the user doesn't get pushed into travel if they press enter while buying something Solargale 2019-03-24 22:21:15 -06:00
  • ffc2000c70 Added javadocs Siddhant Dewani 2019-03-24 22:20:00 -06:00
  • 016b765e3a Update Player.java Vikramb987 2019-03-24 22:10:30 -06:00