Vikram
|
666e409e74
|
Merge remote-tracking branch 'origin/master'
|
2019-03-10 22:42:55 -06:00 |
|
Vikram
|
89f9e47921
|
some changes...
|
2019-03-10 22:42:40 -06:00 |
|
|
|
414a9634b5
|
Merge remote-tracking branch 'origin/master'
|
2019-03-10 22:11:07 -06:00 |
|
|
|
f4fbc474e7
|
Finished the End Game Screen
|
2019-03-10 22:10:45 -06:00 |
|
Vikram
|
ffb77b14a0
|
some changes...
|
2019-03-10 21:49:50 -06:00 |
|
Vikram
|
461171ff46
|
minor changes. Still in progress.
|
2019-03-10 21:12:44 -06:00 |
|
|
|
325c4127dd
|
Fix bunch of issues with Travel and Taipanshop, also merged Main, Shop, Travel and Start. Now attempting to merge in ship.
|
2019-03-10 16:06:48 -06:00 |
|
KahootChampion
|
36aa789590
|
Fixed numOfShips method for ShipWarfareGUI
|
2019-03-10 01:14:37 -07:00 |
|
KahootChampion
|
f5845cb8df
|
Messed up player by setting money to 1000
|
2019-03-09 18:34:27 -07:00 |
|
KahootChampion
|
5a7d1e7c34
|
Missed one statement that I needed to encapsulate
|
2019-03-09 18:33:33 -07:00 |
|
|
|
2d1864bb87
|
Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs.
|
2019-02-25 23:31:39 -07:00 |
|
Nathan Lum
|
2abef09de8
|
Added Javadoc comments
|
2019-02-25 22:00:01 -07:00 |
|
Vikramb987
|
697c221323
|
Update Player.java
|
2019-02-25 20:19:40 -07:00 |
|
KahootChampion
|
581bee7bfe
|
Test out this code BOIZ
|
2019-02-25 20:20:11 -07:00 |
|
Vikramb987
|
757d258e3d
|
Update Player.java
changes to how the game ends
|
2019-02-25 19:44:21 -07:00 |
|
Vikram
|
b6b5c14c56
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# out/production/TaipanClone/ShipWarfare.class
|
2019-02-25 18:33:26 -07:00 |
|
Vikram
|
d1c3fe0f7e
|
minor changes. Still in progress.
|
2019-02-25 18:31:54 -07:00 |
|
KahootChampion
|
237ce1da27
|
Stupid error was fixed
|
2019-02-25 17:42:58 -07:00 |
|
Siddhant Dewani
|
3ecc99a879
|
Small thing, changed an output of warehouse a bit, shows user its the warehouse they are concerned with.
|
2019-02-24 21:24:45 -07:00 |
|
Vikram
|
0f20b9a8ec
|
bunch of revisions, still in progress
|
2019-02-24 16:53:45 -07:00 |
|
Vikram
|
210f64cb2f
|
bunch of revisions, still in progress
|
2019-02-24 15:58:17 -07:00 |
|
Vikram
|
dabedd8a72
|
fixed the player object not retaining the changes that were applied
|
2019-02-24 15:44:13 -07:00 |
|
|
|
36f3b84eb8
|
Brought back Vikram's changes
|
2019-02-22 16:44:52 -07:00 |
|
Nathan Lum
|
01acec2b16
|
Update Player.java
|
2019-02-22 13:28:06 -07:00 |
|
KahootChampion
|
4b047f46c4
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/ShipWarfare.java
# src/TaipanShop.java
|
2019-02-21 23:44:57 -07:00 |
|
KahootChampion
|
f9435e7309
|
Sloppy but completed ShipWarfare class
|
2019-02-21 23:44:30 -07:00 |
|
Vikramb987
|
2395eb3298
|
Update Player.java
|
2019-02-21 22:07:27 -07:00 |
|
KahootChampion
|
3bd9f58fb1
|
Added loot. Still need to have ships escape sometimes and Liu yen
|
2019-02-21 21:39:24 -07:00 |
|
siddhantdewani
|
5c5aff2ae0
|
Update Player.java
|
2019-02-21 20:55:23 -07:00 |
|
KahootChampion
|
03b08e4de3
|
Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot)
|
2019-02-20 16:07:44 -07:00 |
|
KahootChampion
|
b4b2d3377b
|
Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot)
|
2019-02-20 09:47:51 -07:00 |
|
KahootChampion
|
73f757890a
|
Perhaps done basic ship warfare?
|
2019-02-20 07:47:04 -07:00 |
|
KahootChampion
|
6c36073e87
|
Added GameOver() Method to Player class, btw System.out.flush just straight up Thanos's the terminal at the time (clears it).
|
2019-02-18 22:50:24 -07:00 |
|
|
|
08edd6069b
|
Created Player class
|
2019-02-18 19:36:03 -07:00 |
|
KahootChampion
|
534b8728a5
|
Used Harkamal's dumb extended class thingy cuz he begged me tod do it.
|
2019-02-18 19:13:39 -07:00 |
|
|
|
1a06ba4c0e
|
Fixed the setters to be greater than 0
|
2019-02-18 19:02:31 -07:00 |
|
|
|
a5cbc87906
|
Created Player class
|
2019-02-18 18:56:45 -07:00 |
|
|
|
509a587447
|
Created Player class
|
2019-02-18 18:47:00 -07:00 |
|
