Commit Graph

178 Commits (0f39c420069e94c01d37dcd7a2a8faf0a162c177)

Author SHA1 Message Date
John 0f39c42006 Fix p, add loading screen 2022-06-20 11:32:02 -04:00
John af47165a4a Allow empty dialogue 2022-06-20 11:15:28 -04:00
John ed37999f02 Fix continue bug 2022-06-20 11:06:00 -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 f86c6260c7 Add tip to return from settings 2022-06-19 19:01:59 -07:00
John fcf21cd48d Fix continue bug and remove legacy dialogue 2022-06-19 18:53:37 -07:00
Chara1236 a2b8a12550 Merge remote-tracking branch 'origin/master' 2022-06-19 21:46:07 -04:00
Chara1236 ba2c43b7bb First level done for real 2022-06-19 21:46:00 -04:00
John 751126c598 Fix pause menu bug 2022-06-19 18:39:40 -07:00
Chara1236 99439bd4b2 Merge remote-tracking branch 'origin/master' 2022-06-19 21:30:31 -04:00
Chara1236 06849a5078 First level done 2022-06-19 21:30:25 -04:00
John 70746385f8 Ensure unix compliance by ending every text file with a newline 2022-06-19 18:18:08 -07:00
John 06e81d4646 Allow left click to place steel 2022-06-19 18:02:55 -07:00
Chara1236 90589ca7d7 Merge remote-tracking branch 'origin/master' 2022-06-19 20:54:11 -04:00
Chara1236 009a18ad3b working on signs on first level 2022-06-19 20:54:04 -04:00
John bbadd99a6f Merge remote-tracking branch 'origin/master' 2022-06-19 17:53:59 -07:00
John 061ca4ddda Remove extraneous print statement 2022-06-19 17:53:52 -07:00
John a81c4e21c4 Fix sign bug 2022-06-19 17:53:08 -07: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 16fd96b3b6 Close scanner after use 2022-06-19 15:52:03 -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 e8c16f0625 Merge remote-tracking branch 'origin/master' 2022-06-19 18:10:16 -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
John 45e3911815 Fix access denied bug 2022-06-19 14:37:40 -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 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