|
|
8c5f0b1f95
|
Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts.
|
2019-04-12 10:45:19 -06:00 |
|
Vikramb987
|
49a62c4a4d
|
Update TaipanShopLogic.java
little fix
4.1
|
2019-04-12 09:06:08 -06:00 |
|
Vikramb987
|
f0416db9c2
|
Update README.md
fixed formatting
|
2019-04-12 08:59:41 -06:00 |
|
Vikramb987
|
2d4a1add07
|
Update README.md
fixed some things + added windows instructions as well
|
2019-04-12 08:56:21 -06:00 |
|
Vikramb987
|
984beaabf9
|
Update TaipanShopGUI.java
minor formatting
|
2019-04-12 08:42:15 -06:00 |
|
Vikramb987
|
b697978614
|
Update TaipanShopGUI.java
removed the comment "//quitButton.setDefaultButton(true);", not sure who commented that in but doesn't seem necessary
|
2019-04-12 08:41:35 -06:00 |
|
|
|
805341797f
|
Added headers
4.0
|
2019-04-12 04:53:20 -06:00 |
|
|
|
6c411b6c3b
|
Updated the read me for the interactive demo
|
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
|
2019-04-12 04:45:31 -06:00 |
|
|
|
f89c1aa209
|
Redid a bunch of commenting making sure that every method was commented.
|
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
|
2019-04-12 01:07:45 -06:00 |
|
KahootChampion
|
b4f9ce761c
|
Done work on shipWarfareGUi, shortened what needed to be shortened.
|
2019-04-11 22:27:27 -06:00 |
|
KahootChampion
|
0b5df085bf
|
Done working on ShipWarfareText
|
2019-04-11 22:11:06 -06:00 |
|
KahootChampion
|
44f1ee5b2a
|
Done working on SHipWarfareText
|
2019-04-11 22:10:30 -06:00 |
|
KahootChampion
|
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
|
2019-04-11 22:01:34 -06:00 |
|
Nathan Lum
|
0221a5a2f1
|
Added Javadocs
|
2019-04-11 20:18:53 -06:00 |
|
Nathan Lum
|
7134a6825e
|
Update RandomEventLogic.java
|
2019-04-11 20:10:13 -06:00 |
|
KahootChampion
|
74f0f31a46
|
Merge remote-tracking branch 'origin/master'
|
2019-04-11 17:52:39 -06:00 |
|
KahootChampion
|
c6b34f49b3
|
Completed ShipWarfare
|
2019-04-11 17:52:24 -06:00 |
|
Vikramb987
|
36a89bc713
|
epic style fixes
|
2019-04-11 14:46:48 -06:00 |
|
Vikramb987
|
dbf92288c5
|
Update README.md
|
2019-04-11 14:41:57 -06:00 |
|
|
|
7ca1e3e4a3
|
Updated with the correct complication stuff
|
2019-04-11 14:29:32 -06:00 |
|
KahootChampion
|
ff4dd2b733
|
Merge remote-tracking branch 'origin/master'
|
2019-04-11 13:49:14 -06:00 |
|
KahootChampion
|
4ec469de7d
|
Added Javadocs for start in MainGUI and separated ShipWarfare into more methods.
|
2019-04-11 13:48:56 -06:00 |
|
Vikramb987
|
a2c7d7dd67
|
Update LoanSharkGUI.java
cutting start method -- not necessary
|
2019-04-11 13:43:17 -06:00 |
|
|
|
ea5faaca36
|
Added stuff to randomEvents logic
|
2019-04-10 23:16:20 -06:00 |
|
|
|
a2e3879cae
|
Created logic class for Warehouse
|
2019-04-10 17:58:05 -06:00 |
|
KahootChampion
|
784272e362
|
Removed some layerings from SHipWarfare related classes
|
2019-04-08 12:46:55 -06:00 |
|
Nathan Lum
|
e6b8ac33ef
|
Update StartGUI.java
|
2019-04-08 11:51:50 -06:00 |
|
Nathan Lum
|
1d47933bae
|
Update StartLogic.java
|
2019-04-08 11:51:07 -06:00 |
|
Nathan Lum
|
195c3793db
|
Update StartText.java
|
2019-04-08 11:50:32 -06:00 |
|
|
|
3f68202bb5
|
Minor changes
|
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
|
2019-04-07 16:35:22 -06:00 |
|
|
|
f37aa91fad
|
Made every appropriate Text and Logic class
|
2019-04-07 14:58:48 -06:00 |
|
|
|
e2ad32c4ee
|
Moved everything into logic classes
|
2019-04-07 14:44:41 -06:00 |
|
KahootChampion
|
9e97877e6e
|
Have logic and ShipWarfareGUI sufficiently separated
|
2019-04-07 14:17:44 -06:00 |
|
KahootChampion
|
f834afb98f
|
ShipWarfareText Complete Haris Muhammad
|
2019-04-07 14:06:25 -06:00 |
|
KahootChampion
|
fff5456b45
|
Mostly done ShiPWarfareText
|
2019-04-07 13:52:36 -06:00 |
|
KahootChampion
|
548448bda1
|
Fixed various issues but mainly with SHipWarfareText firing even when "r" was inputed as the command to run
|
2019-04-07 13:15:35 -06:00 |
|
|
|
ea591057cd
|
Fixed the severe lack of TaipanShopText
|
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
|
2019-04-07 12:52:32 -06:00 |
|
|
|
4e53d590a9
|
Merge branch 'dedupe'
# Conflicts:
# .idea/workspace.xml
# src/ShipWarfareGUI.java
|
2019-04-07 12:48:37 -06:00 |
|
|
|
5283b60c4f
|
Updated shipwarfare text to the modern era
|
2019-04-07 12:45:39 -06:00 |
|
KahootChampion
|
97927dc3f8
|
Adding ShipWarfareText
|
2019-04-07 12:41:45 -06:00 |
|
|
|
ca778137a5
|
Fixed duplication between Shop and Travel
|
2019-04-07 12:35:20 -06:00 |
|
KahootChampion
|
4db5b6e318
|
Fixed ShipWarfareGUI and ShipWarfareLogic
|
2019-04-07 12:08:05 -06:00 |
|
|
|
ab596f60b0
|
Fixed money updating after fighting for loot
|
2019-04-07 11:23:01 -06:00 |
|
|
|
ae8cac6595
|
Fixed problem with HP and Gun amount not carrying over
|
2019-04-07 11:05:09 -06:00 |
|
KahootChampion
|
5a77f8c4e8
|
Doesnt take healtha way when user wins
|
2019-04-07 10:52:42 -06:00 |
|
KahootChampion
|
cb4e13b888
|
For some reason, the setHp method works only in shipwarfareGUI but does not transfer to TaipanShopGUI
|
2019-04-06 23:16:41 -06:00 |
|
