Commit Graph

165 Commits (06e81d4646caf7299c0af483477d57015833be27)

Author SHA1 Message Date
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
bob 0f69b3595a Update 2022-06-13 13:11:27 -04:00
Chara1236 e698273bfa Working on moving block 2022-06-12 23:55:19 -04:00
bob a6e1ffe98c Some comments 2022-06-12 18:22:13 -04:00
Chara1236 1c3ae30225 Moving Blocks ProtoType 2022-06-12 17:28:27 -04:00
Chara1236 17d49895f7 Added Breakable Blocks 2022-06-12 14:11:09 -04:00
Chara1236 f7b071b624 Dead enemies dont kill 2022-06-11 23:48:57 -04:00
Chara1236 deed563819 Bomb Direction line added 2022-06-11 20:02:41 -04:00
John 189b029bbc Add loading object to file and reading object from file 2022-06-10 11:23:28 -04:00
John 04e8cb3453 Create UtilityFunction class, enable displaying of no keybind, allow escaping from keybind menu 2022-06-10 11:01:23 -04:00
John 15ceff8c92 Merge remote-tracking branch 'origin/master' 2022-06-09 14:53:33 -04:00
John 070e5eeb2a Display current character for control 2022-06-09 14:53:25 -04:00
bob 057e7692f7 Fixed bug that lava doesnt kill 2022-06-09 14:53:03 -04:00
bob d00b7c4834 Added Non Bomb collidable blocks like lava and finish. 2022-06-09 14:48:21 -04:00
bob 78b6c197e8 Merge remote-tracking branch 'origin/master' 2022-06-09 14:19:35 -04:00
bob 6bee3d58f7 Changed Mouse Click 2022-06-09 14:19:23 -04:00
John 4dd4d78103 Merge remote-tracking branch 'origin/master' 2022-06-09 14:18:29 -04:00
John 46fc50be93 Made camera consistent across panels, add middleware class to enable key changes, add settings panel 2022-06-09 14:18:16 -04:00
bob 64f99d66b0 Mer 2022-06-09 13:40:43 -04:00
bob 5c5ccc5188 Only top lava gives particles 2022-06-09 13:05:42 -04:00
Chara1236 b307fe06a2 Merge remote-tracking branch 'origin/master' 2022-06-09 00:07:54 -04:00
Chara1236 6f12ed702f Bomb arraylist 2022-06-09 00:07:44 -04:00
John 7649f19215 Add duck typing equals check to TextBox 2022-06-08 19:03:06 -04:00
bob 0fbe9cf522 Made lava particles better 2022-06-08 14:50:45 -04:00
bob ac873cf221 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/GamePanel.java
2022-06-08 14:35:13 -04:00
bob a43a199c15 Improving Particles 2022-06-08 14:32:31 -04:00
John 69dc890d2d Added pauses, bomb explosion 2022-06-08 13:36:47 -04:00
John bfa449e8a0 Merge remote-tracking branch 'origin/master' 2022-06-08 12:35:47 -04:00