|
|
55214ce652
|
Made it so that randomEventGUI looks normal on Linux
|
2019-03-25 13:26:01 -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 |
|
KahootChampion
|
68f2c345d9
|
Merge remote-tracking branch 'origin/master'
|
2019-03-24 19:08:11 -06:00 |
|
KahootChampion
|
f27ee3d1d5
|
Made fight button basically functional for AnimationTesting
|
2019-03-24 19:07:51 -06:00 |
|
|
|
9012da0b3d
|
Merge remote-tracking branch 'origin/master'
|
2019-03-24 16:13:46 -06:00 |
|
|
|
b8ed9bdb87
|
Made warehouse reappear
|
2019-03-24 16:12:30 -06:00 |
|
KahootChampion
|
3b38c2475b
|
Sep up the scene which will be used for animation
|
2019-03-23 22:12:51 -06:00 |
|
KahootChampion
|
ddc8cd4a06
|
Litty Animation Practice littier
|
2019-03-23 19:19:44 -06:00 |
|
KahootChampion
|
55b3dbe0b6
|
Added method for animation
|
2019-03-23 19:18:39 -06:00 |
|
|
|
519ddec330
|
Merge remote-tracking branch 'origin/master'
|
2019-03-23 19:04:53 -06:00 |
|
|
|
cf287833f6
|
Made animation testing same as everyother class, can run from other classes.
|
2019-03-23 19:04:37 -06:00 |
|
KahootChampion
|
d15e0fd7d7
|
Added gifs back
|
2019-03-23 18:57:47 -06:00 |
|
KahootChampion
|
7ec7f00983
|
Litty Animation Practice
|
2019-03-23 18:39:20 -06:00 |
|
|
|
0024e7a5ab
|
Should completely get rid of error messages and print statements related to save state
|
2019-03-23 18:15:59 -06:00 |
|
|
|
30cd4805d9
|
Merge remote-tracking branch 'origin/master'
|
2019-03-23 18:13:26 -06:00 |
|
|
|
9d113a656f
|
Finished game saves
|
2019-03-23 18:13:07 -06:00 |
|
|
|
3bdd7fb55b
|
Fixed buttons being too large on Linux and Mac
|
2019-03-23 15:59:35 -06:00 |
|
|
|
e6e1f02ea9
|
File saving is work in progress
Added a css file for the game
Made it so that you can press enter to continue forwars
Made folder for both images and save files
|
2019-03-23 03:37:41 -06:00 |
|
|
|
0bedf3e182
|
Made it so you can go inbetween screens by pressing enter, allowing for you to speed through the game without pressing buttons.
|
2019-03-22 23:01:31 -06:00 |
|
|
|
55ff34ef9b
|
Moved around a few of the images and changed the dimensions of the start screen
|
2019-03-22 21:05:31 -06:00 |
|
