Commit Graph

43 Commits (a226a30862f50d8b37bc847b9ffb52f6cc0e7f8b)

Author SHA1 Message Date
bob 68c80c2a31 Finished Moving Steel 2022-06-17 13:28:39 -04:00
bob 63ed2e6165 Working on moving steel 2022-06-17 13:03:38 -04:00
John e49c4cf4e8 Fixed serialization bugs, bomb bug during dialogue 2022-06-16 17:28:59 -04:00
bob 149b689893 Working on moving steel 2022-06-16 13:32:58 -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
bob 537e3939ea Adding reach for steel block using BFS 2022-06-15 14:54:21 -04:00
bob e1231d1ada WOrking o n steel 2022-06-15 11:25:38 -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
bob 30779b1cc0 WOrking o n steel 2022-06-14 13:34:18 -04:00
bob 4b4b89dc89 WOrking o n steel 2022-06-13 13:53:58 -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 deed563819 Bomb Direction line added 2022-06-11 20:02:41 -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
Chara1236 6f12ed702f Bomb arraylist 2022-06-09 00:07:44 -04:00
bob a43a199c15 Improving Particles 2022-06-08 14:32:31 -04:00
bob 6af212ab1c Added Particles 2022-06-08 11:23:57 -04:00
Chara1236 d5bf288c26 Added Lava 2022-06-07 23:59:19 -04:00
Chara1236 8f3f35a4af Changed collisions to 2d array, fixed collision checking for sprites 2022-06-07 22:12:40 -04:00
bob 2a194e1f8b Bomb Physics 2022-06-07 14:46:45 -04:00
bob e856a93fb9 Bomb 2022-06-07 13:12:48 -04:00
bob 544a069f65 Added finish block 2022-06-06 11:24:46 -04:00
Chara1236 2f5ded58ab Enemy Causes Death 2022-06-05 22:18:10 -04:00
Chara1236 f5b809473a Fixing Collisions, added level manager 2022-06-05 17:33:24 -04:00
Chara1236 4d58cece36 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/GamePanel.java
#	src/Player.java
#	src/Tile.java
2022-06-05 12:01:21 -04:00
Chara1236 e8a1dea2d6 Finished Collision Physics 2022-06-05 11:53:03 -04:00
John f66fcb5ca2 Add NPCs 2022-06-03 17:33:21 -04:00
bob 8a01e8d541 Sound Class and some Tile Ids I guess 2022-06-03 13:50:13 -04:00
bob c8e72b1b65 Swtiched to 2D x-scrolling 2022-06-02 13:21:29 -04:00
John 21edb5f4f4 Minor adjustments 2022-06-01 14:48:46 -04:00
John fe43eb9c3b Add sprite spinning, persistent sprite positions, menu 2022-06-01 14:39:57 -04:00
bob bf7d6e4b19 Fixing Jump Bug 2022-06-01 13:52:13 -04:00
John ded45824eb Add sprites 2022-05-31 13:19:23 -04:00