Commit Graph

118 Commits (b82cfd79d546596b2d094f8c826359fb8d40124e)

Author SHA1 Message Date
John e65e0fc385 Document GamePanel and remove obsolete documentation 2022-06-20 13:25:45 -04:00
John 7595603e54 Change ceiling height, default player frame 2022-06-20 12:41:58 -04:00
John f91c7416ae Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/GamePanel.java
2022-06-20 11:33:34 -04:00
John 0f39c42006 Fix p, add loading screen 2022-06-20 11:32:02 -04:00
bob 341f26b6bb Fixing bugs 2022-06-20 11:29:54 -04:00
bob d6729e3481 Level 3 2022-06-20 10:11:35 -04:00
Chara1236 3506ed941c Level2 2022-06-20 00:05:52 -04:00
John fcf21cd48d Fix continue bug and remove legacy dialogue 2022-06-19 18:53:37 -07:00
John 751126c598 Fix pause menu bug 2022-06-19 18:39:40 -07:00
John 70746385f8 Ensure unix compliance by ending every text file with a newline 2022-06-19 18:18:08 -07:00
Chara1236 009a18ad3b working on signs on first level 2022-06-19 20:54:04 -04:00
John 2e3b2eb90b Merge remote-tracking branch 'origin/master' 2022-06-19 17:31:20 -07:00
John edc1376084 Make signs work 2022-06-19 17:31:08 -07:00
Chara1236 ed5f8be65b Merge remote-tracking branch 'origin/master' 2022-06-19 20:19:05 -04:00
Chara1236 a086ac65ae added first level 2022-06-19 20:18:58 -04:00
John 07e56c49cf Move GlobalState randint to UtilityFunction 2022-06-19 16:20:58 -07:00
John ef95740a7b Fix deprecated keyevent, fix access error, center stickybomb explosion 2022-06-19 15:49:36 -07:00
Chara1236 ab3998c77c Merge remote-tracking branch 'origin/master' 2022-06-19 18:10:21 -04:00
Chara1236 a7b27828bb More sounds 2022-06-19 18:10:09 -04:00
John faca271220 Fix pause menu 2022-06-19 15:09:53 -07:00
Chara1236 cf134e3104 Merge remote-tracking branch 'origin/master' 2022-06-19 17:23:36 -04:00
Chara1236 d478bdab58 I think Im finished Fireballs 2022-06-19 17:23:27 -04:00
John b5996f64c4 Merge remote-tracking branch 'origin/master' 2022-06-19 14:21:31 -07:00
John 6114cf409e Fix bug, some other changes 2022-06-19 14:21:18 -07:00
Chara1236 d071e51c5b ignore 2022-06-19 16:20:31 -04:00
Chara1236 8430e3ef7e Working on fireball 2022-06-19 15:57:22 -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 0f254b4607 Starting to add fireball blocks 2022-06-17 13:50:22 -04:00
John ed150b6629 Add clouds, fix ghost keypresses after load from save, add example dialogue 2022-06-17 13:32:53 -04:00
John b796df4759 Add boss portrait, reduce frequency of saves 2022-06-17 13:09:50 -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 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
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