Commit Graph

46 Commits (master)

Author SHA1 Message Date
Chara1236 0d80e25d1f Merge remote-tracking branch 'origin/master' 2022-06-20 22:21:05 -04:00
Chara1236 7020dcb336 Your mom 2022-06-20 22:20:58 -04:00
John 270ec6ba3a Minor adjustment to level 2022-06-20 19:17:41 -07:00
John d6896ac30b Change levels 2022-06-20 18:47:22 -07:00
John e330df0209 Add dialogue sound 2022-06-20 18:21:47 -07:00
Chara1236 db9ff7c98d Finished Levels 2022-06-20 20:57:30 -04:00
Chara1236 ce257dcf3f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	saves/Level1-signs.txt
2022-06-20 20:52:48 -04:00
Chara1236 4d56984b3e Commenting 2022-06-20 20:52:03 -04:00
John 6624ffb16d Change signs, dialogue 2022-06-20 17:47:34 -07:00
Chara1236 55a19bf5f5 Commenting player class, fixed steel bug 2022-06-20 20:32:40 -04:00
Chara1236 01340ca01c Level 5 finished 2022-06-20 19:26:18 -04:00
bob a85893fd06 Merge just cus 2022-06-20 14:48:46 -04:00
bob 9f71e0d1ba Level 5 2022-06-20 13:59:41 -04:00
bob e7555330a8 lEVEL 4 2022-06-20 13:50:52 -04:00
bob 52800c5a9b Merge remote-tracking branch 'origin/master' 2022-06-20 11:30:06 -04:00
bob 341f26b6bb Fixing bugs 2022-06-20 11:29:54 -04:00
John af47165a4a Allow empty dialogue 2022-06-20 11:15:28 -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
Chara1236 ba2c43b7bb First level done for real 2022-06-19 21:46:00 -04:00
Chara1236 06849a5078 First level done 2022-06-19 21:30:25 -04: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 a086ac65ae added first level 2022-06-19 20:18:58 -04:00
Chara1236 a7b27828bb More sounds 2022-06-19 18:10:09 -04:00
Chara1236 d478bdab58 I think Im finished Fireballs 2022-06-19 17:23:27 -04:00
Chara1236 d071e51c5b ignore 2022-06-19 16:20:31 -04:00
John 80e5b90603 Add loading dialogue 2022-06-19 14:31:19 -04:00
bob 0f254b4607 Starting to add fireball blocks 2022-06-17 13:50:22 -04:00
bob e1231d1ada WOrking o n steel 2022-06-15 11:25:38 -04:00
Chara1236 a569a84a7e Working on moving block 2022-06-14 21:35: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
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
bob d00b7c4834 Added Non Bomb collidable blocks like lava and finish. 2022-06-09 14:48:21 -04:00
bob 5c5ccc5188 Only top lava gives particles 2022-06-09 13:05:42 -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 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 e8a1dea2d6 Finished Collision Physics 2022-06-05 11:53:03 -04:00
bob 8a01e8d541 Sound Class and some Tile Ids I guess 2022-06-03 13:50:13 -04:00