|
|
ca778137a5
|
Fixed duplication between Shop and Travel
|
2019-04-07 12:35:20 -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
|
6bbd852c8b
|
Failed attempt at separating logic and GUI but saving just in case I need it later
|
2019-04-04 22:13:17 -06:00 |
|
Vikramb987
|
9c17adfb38
|
Create TaipanShopLogic.java
|
2019-04-02 18:52:51 -06:00 |
|
Vikramb987
|
bd162428a5
|
Create TaipanShopText.java
|
2019-04-02 18:52:17 -06:00 |
|
Vikramb987
|
9ee378279b
|
Update TaipanShopGUI.java
|
2019-04-02 18:49:59 -06:00 |
|
KahootChampion
|
61ba606e89
|
Playing with miss animation
|
2019-03-29 08:20:56 -06:00 |
|
KahootChampion
|
02efa7a9ba
|
Fixed an issue with ShipWarfareGUI with the ships running away label
|
2019-03-25 18:32:17 -06:00 |
|
|
|
b39ddffcf8
|
Fixed demo 3
3.1
|
2019-03-25 13:43:36 -06:00 |
|
KahootChampion
|
7e9ba348b2
|
Ship Warfare "dang it" issue fixed
|
2019-03-25 13:35:11 -06:00 |
|
|
|
a96de93b13
|
Added libraries to the file
|
2019-03-25 13:31:01 -06:00 |
|
|
|
4cf4bc3cb9
|
Merge remote-tracking branch 'origin/master'
|
2019-03-25 13:26:20 -06:00 |
|
|
|
55214ce652
|
Made it so that randomEventGUI looks normal on Linux
|
2019-03-25 13:26:01 -06:00 |
|
Vikramb987
|
19134408a8
|
Update FileSaving.java
changes to how we deal with saving when it comes to the terminal
|
2019-03-25 13:18:16 -06:00 |
|
Vikramb987
|
77e43f0fd2
|
Update TaipanShopGUI.java
saving changes
|
2019-03-25 13:17:43 -06:00 |
|
|
|
69a4f121c5
|
Demo 3
Added part with jar files and test file
|
2019-03-25 13:17:13 -06:00 |
|
Vikramb987
|
1d970b201c
|
Update BankGUI.java
changed some text.
|
2019-03-25 13:07:03 -06:00 |
|
Vikramb987
|
fd921053d3
|
Update LoanSharkGUI.java
changed some text
|
2019-03-25 13:01:16 -06:00 |
|
Vikramb987
|
283e51c375
|
Update TravelGUI.java
fixed formatting
|
2019-03-25 12:52:53 -06:00 |
|
Vikramb987
|
db0d8ec2db
|
Update TaipanShopGUI.java
fixed formatting
|
2019-03-25 12:51:59 -06:00 |
|
Vikramb987
|
45d6d794f9
|
Update ShipWarfareGUI.java
added title
|
2019-03-25 12:49:43 -06:00 |
|
|
|
dc28fb504d
|
Finished PlayerTest
|
2019-03-25 12:48:13 -06:00 |
|
|
|
5a43adf7ad
|
Merge remote-tracking branch 'origin/master'
|
2019-03-25 12:29:56 -06:00 |
|
|
|
290dce81db
|
Player Test
|
2019-03-25 12:28:51 -06:00 |
|
Vikramb987
|
6e43912b2e
|
Update ShipWarfareGUI.java
fixed error with terminal
|
2019-03-25 12:25:59 -06:00 |
|
Vikramb987
|
3ac1087741
|
Update TravelGUI.java
epicchanges
|
2019-03-25 12:19:05 -06:00 |
|
Vikramb987
|
c008a68166
|
Update TaipanShopGUI.java
epic final changes boi
|
2019-03-25 12:18:11 -06:00 |
|
Vikramb987
|
85b2043ebf
|
Update TaipanShopGUI.java
fixed some formatting
|
2019-03-25 12:14:34 -06:00 |
|
KahootChampion
|
61f88c0a86
|
Completed ShipWarfareGUI
|
2019-03-25 11:06:39 -06:00 |
|
KahootChampion
|
5caca9c9e3
|
Fixed silk issue
|
2019-03-25 11:03:16 -06:00 |
|
|
|
24cb7ea70e
|
Pushed the fix for ship repair while 100 hp
|
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
|
2019-03-24 23:31:05 -06:00 |
|
Siddhant Dewani
|
4d8265ea79
|
added javadocs
|
2019-03-24 22:45:58 -06:00 |
|
Siddhant Dewani
|
0d548442d4
|
Merge remote-tracking branch 'origin/master'
|
2019-03-24 22:45:25 -06:00 |
|
|
|
f0b1d42892
|
Merge remote-tracking branch 'origin/master'
|
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
|
2019-03-24 22:21:15 -06:00 |
|
Siddhant Dewani
|
ffc2000c70
|
Added javadocs
|
2019-03-24 22:20:00 -06:00 |
|
Vikramb987
|
016b765e3a
|
Update Player.java
completed javadocs
|
2019-03-24 22:10:30 -06:00 |
|
|
|
384a874e09
|
Merge remote-tracking branch 'origin/master'
|
2019-03-24 22:08:05 -06:00 |
|
|
|
d82ac891f1
|
Commented a bit of Random Event
|
2019-03-24 22:07:48 -06:00 |
|
KahootChampion
|
f379278dc8
|
Completed ShipWarfareGUI
|
2019-03-24 21:58:53 -06:00 |
|
KahootChampion
|
39b494ff88
|
ShipWarfare javaDocs completed
|
2019-03-24 21:48:44 -06:00 |
|
KahootChampion
|
799704ad5c
|
Fixed the issue where the ship shot with no guns
|
2019-03-24 21:25:57 -06:00 |
|
KahootChampion
|
2fb5d2fb1a
|
Merge remote-tracking branch 'origin/master'
|
2019-03-24 21:02:20 -06:00 |
|
KahootChampion
|
bf21232510
|
Small error in animation whcih shoots even if no guns must fix that
|
2019-03-24 21:02:13 -06:00 |
|
|
|
68431ccad8
|
Merge remote-tracking branch 'origin/master'
|
2019-03-24 20:15:28 -06:00 |
|
|
|
b889ccd2bd
|
Finished Warehouse
|
2019-03-24 20:15: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 |
|
