|
|
ea591057cd
|
Fixed the severe lack of TaipanShopText
|
2019-04-07 12:59:00 -06:00 |
|
|
|
4e53d590a9
|
Merge branch 'dedupe'
# Conflicts:
# .idea/workspace.xml
# src/ShipWarfareGUI.java
|
2019-04-07 12:48:37 -06:00 |
|
|
|
5e7667aa31
|
Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts.
|
2019-04-06 16:45:42 -06:00 |
|
KahootChampion
|
8d07d531de
|
Helath not lowering anymore
|
2019-04-06 16:24:47 -06:00 |
|
|
|
7f1e8a4be8
|
Made
|
2019-04-06 15:20:37 -06:00 |
|
|
|
3beb1ff33d
|
Merge branch 'master' of C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone with conflicts.
|
2019-04-06 14:00:33 -06:00 |
|
KahootChampion
|
61ba606e89
|
Playing with miss animation
|
2019-03-29 08:20:56 -06:00 |
|
KahootChampion
|
61f88c0a86
|
Completed ShipWarfareGUI
|
2019-03-25 11:06:39 -06:00 |
|
KahootChampion
|
7ed267a6a0
|
Ayy added all the gifs needed.
|
2019-03-20 17:21:51 -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
|
db4a06e652
|
javadocs update.
|
2019-03-11 19:36:23 -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 |
|
KahootChampion
|
762b399c4b
|
Added JavaDocs for ShipWarfare
|
2019-03-11 15:33:08 -06:00 |
|
KahootChampion
|
4d09891665
|
Added to my javadocs a bit
|
2019-03-10 23:03:30 -06:00 |
|
KahootChampion
|
ba16ea1809
|
Completed javadocs for shipwarfare GUI
|
2019-03-10 22:58:43 -06:00 |
|
KahootChampion
|
c6df980f8e
|
Fixed ShipWarfare bug about one-shotting.
|
2019-03-10 22:43:46 -06:00 |
|
Vikram
|
89f9e47921
|
some changes...
|
2019-03-10 22:42:40 -06:00 |
|
Vikram
|
ffb77b14a0
|
some changes...
|
2019-03-10 21:49:50 -06:00 |
|
KahootChampion
|
df372522e4
|
Probably should upload
|
2019-03-10 20:12:01 -06:00 |
|
KahootChampion
|
4fd40af606
|
Completed ShipWarfareGUI
|
2019-03-10 20:01:20 -06:00 |
|
KahootChampion
|
664d194d7b
|
Completed SHipWarfareGUI
|
2019-03-10 20:00:36 -06:00 |
|
KahootChampion
|
2198fffbd5
|
A lot of errors but easily fixable SHipwarfareGUI
|
2019-03-10 19:41:43 -06:00 |
|
KahootChampion
|
888d8a1c92
|
Fined minor bugs in shipwarfareGUI including the "gun frustration" variable
|
2019-03-10 12:10:33 -06:00 |
|
KahootChampion
|
42c4534f52
|
Fixed probability of ships running away
|
2019-03-10 12:00:00 -06:00 |
|
KahootChampion
|
a07d633ff9
|
Basic functionality of buttons completed, think all I have to do now is to find a way to break the code when the user wins, loses or runs away.
|
2019-03-10 11:26:54 -06:00 |
|
KahootChampion
|
d558e7cf0c
|
Fixed the loot system a bit
|
2019-03-10 01:44:02 -07:00 |
|
KahootChampion
|
36aa789590
|
Fixed numOfShips method for ShipWarfareGUI
|
2019-03-10 01:14:37 -07:00 |
|
|
|
b945cafe98
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/workspace.xml
|
2019-03-09 23:27:03 -07:00 |
|
|
|
75673d40e1
|
Finished TravelGUI and StartGUI
|
2019-03-09 23:26:25 -07:00 |
|
KahootChampion
|
9feac6e90e
|
Forces you to fight in ShipWarfareGUI unfortunately
|
2019-03-09 22:52:30 -07:00 |
|
KahootChampion
|
1bb00d0d01
|
Super broken but fight button is in progress for shipwarfare
|
2019-03-09 22:32:45 -07:00 |
|
KahootChampion
|
80102eabee
|
Please find error
|
2019-03-09 20:03:51 -07:00 |
|
KahootChampion
|
5a7d1e7c34
|
Missed one statement that I needed to encapsulate
|
2019-03-09 18:33:33 -07:00 |
|
KahootChampion
|
5c78f561d8
|
Added fight stuff
|
2019-03-09 16:13:36 -07:00 |
|
|
|
507fe4debd
|
Fixed some little problems with documenting.
|
2019-02-25 23:42:27 -07:00 |
|
KahootChampion
|
1295d625fb
|
KK
|
2019-02-25 20:07:21 -07:00 |
|
KahootChampion
|
27ac100618
|
Test this Vikram
|
2019-02-25 20:01:21 -07:00 |
|
KahootChampion
|
e7a0ddf085
|
Small change to javadocs for shipwarfare
|
2019-02-25 19:42:19 -07:00 |
|
KahootChampion
|
70b698c22e
|
Java Docs BOIZ for ShipWarafare
|
2019-02-25 19:35:50 -07:00 |
|
Vikram
|
6b379bae3a
|
minor changes. Still in progress.
|
2019-02-25 18:42:48 -07:00 |
|
Vikram
|
d1c3fe0f7e
|
minor changes. Still in progress.
|
2019-02-25 18:31:54 -07:00 |
|
Vikram
|
672707f5b6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .idea/workspace.xml
# src/ShipWarfare.java
|
2019-02-25 07:40:36 -07:00 |
|
Vikram
|
83057e863f
|
the comment somehow made it so that I couldn't compile (using the command line i couldn't compile, i could compile file using intellij) Also, you the file extended player, which is not necessary. You also were calling gameOver() and getName() directly, you needed "player." before all those methods.
|
2019-02-25 07:39:57 -07:00 |
|
KahootChampion
|
ae0e9c4659
|
Changed the timing in ShipWarfare
|
2019-02-24 23:06:05 -07:00 |
|
KahootChampion
|
e495f6e1bb
|
Sneaky bug in shipWarfare regarding having 0 guns is now fixed.
|
2019-02-24 21:33:31 -07:00 |
|
KahootChampion
|
9f23ec187c
|
Forgot a try catch in warehouse
|
2019-02-24 20:38:00 -07:00 |
|
