Chara1236
|
7ee87d65eb
|
Merge remote-tracking branch 'origin/master'
|
2022-06-19 15:57:30 -04:00 |
|
Chara1236
|
8430e3ef7e
|
Working on fireball
|
2022-06-19 15:57:22 -04:00 |
John
|
e194a2f290
|
Possibly fix bug
|
2022-06-19 12:54:59 -07:00 |
|
John
|
80e5b90603
|
Add loading dialogue
|
2022-06-19 14:31:19 -04:00 |
|
John
|
7a63db1349
|
Add SoundWrapper class
|
2022-06-19 13:54:38 -04:00 |
|
John
|
3359ab9ff1
|
Fix sound bug on game resume
|
2022-06-18 22:27:44 -04:00 |
|
Chara1236
|
5ae603cb06
|
Fireball but not really
|
2022-06-17 23:36:52 -04:00 |
|
Chara1236
|
4dd2f808b8
|
Fireball
|
2022-06-17 21:41:42 -04:00 |
|
Chara1236
|
267fb5308b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/GamePanel.java
|
2022-06-17 21:40:10 -04:00 |
|
Chara1236
|
ae4e8906fb
|
Fireball
|
2022-06-17 21:39:14 -04:00 |
|
John
|
c07142bc0d
|
Fix for new game bug
|
2022-06-17 21:38:25 -04:00 |
John
|
5080aeb539
|
Merge remote-tracking branch 'origin/master'
|
2022-06-17 13:55:32 -04:00 |
|
John
|
a226a30862
|
Add stuff
|
2022-06-17 13:55:23 -04:00 |
bob
|
22d23a125d
|
Merge remote-tracking branch 'origin/master'
|
2022-06-17 13:50:46 -04:00 |
|
bob
|
0f254b4607
|
Starting to add fireball blocks
|
2022-06-17 13:50:22 -04:00 |
|
John
|
16d1da6fa1
|
Add torch image (for shooting boxes)
|
2022-06-17 13:38:27 -04:00 |
|
John
|
1d13e661ad
|
Merge remote-tracking branch 'origin/master'
|
2022-06-17 13:33:04 -04:00 |
|
John
|
ed150b6629
|
Add clouds, fix ghost keypresses after load from save, add example dialogue
|
2022-06-17 13:32:53 -04:00 |
|
bob
|
4213b1f4c4
|
Merge remote-tracking branch 'origin/master'
|
2022-06-17 13:28:48 -04:00 |
|
bob
|
68c80c2a31
|
Finished Moving Steel
|
2022-06-17 13:28:39 -04:00 |
|
John
|
6c60709b93
|
Merge remote-tracking branch 'origin/master'
|
2022-06-17 13:10:01 -04:00 |
|
John
|
b796df4759
|
Add boss portrait, reduce frequency of saves
|
2022-06-17 13:09:50 -04:00 |
|
bob
|
63ed2e6165
|
Working on moving steel
|
2022-06-17 13:03:38 -04:00 |
|
John
|
75257a29fe
|
Add right side DialogueMenu
|
2022-06-16 17:57:35 -04:00 |
|
John
|
e49c4cf4e8
|
Fixed serialization bugs, bomb bug during dialogue
|
2022-06-16 17:28:59 -04:00 |
|
bob
|
6fac8e9a59
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/FileManager.java
|
2022-06-16 13:33:17 -04:00 |
|
bob
|
149b689893
|
Working on moving steel
|
2022-06-16 13:32:58 -04:00 |
|
John
|
7cbd8f780d
|
Close FileManager after use, add atomic saves and saves every tick, fixed BIW flipping, add dialogue array and delayed dialogue print
|
2022-06-16 13:31:44 -04:00 |
|
John
|
53145345a9
|
Change gitignore, add padding between DialogueMenu and bottom of screen
|
2022-06-16 10:10:37 -04:00 |
|
John
|
7b7821faed
|
Fix bugs
|
2022-06-15 22:18:19 -04:00 |
|
John
|
02ef7f3292
|
Make serialization to file efficient
|
2022-06-15 22:08:35 -04:00 |
|
John
|
6a2d2361c7
|
Finish DialogueMenu
|
2022-06-15 14:55:39 -04:00 |
|
John
|
913b742a18
|
Merge remote-tracking branch 'origin/master'
|
2022-06-15 14:55:30 -04:00 |
|
John
|
9911ae1a4d
|
Finish DialogueMenu
|
2022-06-15 14:55:22 -04:00 |
|
bob
|
537e3939ea
|
Adding reach for steel block using BFS
|
2022-06-15 14:54:21 -04:00 |
|
bob
|
35fa4639e1
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/GamePanel.java
|
2022-06-15 11:26:43 -04:00 |
|
bob
|
e1231d1ada
|
WOrking o n steel
|
2022-06-15 11:25:38 -04:00 |
|
John
|
4c02b86b55
|
Added double parallax, dialogue menu
|
2022-06-15 11:24:45 -04:00 |
|
John
|
4aa0bd2022
|
Various persistent state things
|
2022-06-15 10:26:28 -04:00 |
|
John
|
e4b18eaa85
|
Fix bug, introduced new particles bug
|
2022-06-14 22:00:27 -04:00 |
|
Chara1236
|
3c90ee6aa3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/NonPlayer.java
# src/Player.java
|
2022-06-14 21:38:25 -04:00 |
|
Chara1236
|
a569a84a7e
|
Working on moving block
|
2022-06-14 21:35:05 -04:00 |
|
John
|
406dcfb9df
|
Made changes to allow for serialization, removed unnecessary statics from GameFrame and moved them to GamePanel (GamePanel.game.{var} instead of GameFrame.{var})
|
2022-06-14 21:34:35 -04:00 |
|
John
|
3caa0b8c37
|
Merge remote-tracking branch 'origin/master'
|
2022-06-14 14:55:05 -04:00 |
|
John
|
b0ccf9697b
|
Various persistent state things
|
2022-06-14 14:54:55 -04:00 |
|
bob
|
30779b1cc0
|
WOrking o n steel
|
2022-06-14 13:34:18 -04:00 |
|
bob
|
d73b2d20a2
|
Merge remote-tracking branch 'origin/master'
|
2022-06-13 13:54:15 -04:00 |
|
bob
|
4b4b89dc89
|
WOrking o n steel
|
2022-06-13 13:53:58 -04:00 |
|
John
|
be648a8f3f
|
Merge remote-tracking branch 'origin/master'
|
2022-06-13 13:42:13 -04:00 |
|
John
|
a7500073e3
|
Added fade, refactored SettingPanel
|
2022-06-13 13:42:05 -04:00 |