Commit Graph

169 Commits (e5a13c149a6496011beb739818e8847b3885bbd1)

Author SHA1 Message Date
Skyball2000 e5a13c149a Potential fix for box stuck 2023-03-29 16:42:10 +02:00
Skyball2000 54bbcf7e86 Merge remote-tracking branch 'origin/main' 2023-03-29 16:29:51 +02:00
Skyball2000 39b8b0e92c Fixed crash on last level 2023-03-29 16:29:46 +02:00
Jonas Wächter 6a2614ec77 Merge remote-tracking branch 'origin/main' 2023-03-29 16:28:17 +02:00
Jonas Wächter d8fe902362 added intro_bg and invisible image 2023-03-29 16:28:02 +02:00
Fabian Hoppe f9e864bc5e fix spawning position of player in level 9 2023-03-29 16:26:21 +02:00
Jonas Wächter 017ff1f860 Merge remote-tracking branch 'origin/main' 2023-03-29 16:25:03 +02:00
Jonas Wächter e673c0e5be Changed Spike Texture 2023-03-29 16:24:54 +02:00
Skyball2000 720d5b9b05 Added another fix for collision on boxes 2023-03-29 16:21:11 +02:00
Fabian Hoppe 674cef3831 fix bug where you get from level directly to main menu instead of level selection pressing esc 2023-03-29 16:20:54 +02:00
Skyball2000 9acea09359 Fixed box glitch 2023-03-29 16:17:34 +02:00
Erenando 51dd969e23 playground added for testing stuff 2023-03-29 16:14:13 +02:00
Skyball2000 d006b0bc50 Added winning check 2023-03-29 16:08:12 +02:00
Stephan Halder 90b0588604 spike added 2023-03-29 16:06:08 +02:00
Erenando 678a92b0ab Merge remote-tracking branch 'origin/main' 2023-03-29 16:00:21 +02:00
Erenando fb0b030fe2 Level-01 got adapted and VacuumCleaner issue got fixed 2023-03-29 16:00:06 +02:00
Fabian Hoppe 14475314f5 Implement different screen size settings 2023-03-29 15:59:51 +02:00
Stephan Halder 3b5223da23 Merge remote-tracking branch 'origin/main' 2023-03-29 15:56:06 +02:00
Stephan Halder c359c9b5bc width of tutorial level adjusted 2023-03-29 15:55:51 +02:00
Erenando 2c63e34bba Vacuum Cleaner added to the game 2023-03-29 15:50:00 +02:00
Stephan Halder 6c57462c7a adjusted spike direction 2023-03-29 15:42:29 +02:00
Skyball2000 e9e36c1d50 Added feature for colliding sprites messaging the main level logic 2023-03-29 15:40:15 +02:00
Stephan Halder af29b1e009 adjusted spike direction 2023-03-29 15:37:44 +02:00
Stephan Halder c2e30a50e8 adjusted Box sizes 2023-03-29 15:31:19 +02:00
Erenando 1964a81027 Jumping is now possible with spacebar 2023-03-29 15:19:37 +02:00
Stephan Halder 63bf820faf missing import sys added 2023-03-29 15:11:17 +02:00
Stephan Halder fb120171e1 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	project/main.py
2023-03-29 15:07:36 +02:00
Stephan Halder 9d29da7284 changed quit() to sys.exit() 2023-03-29 15:06:18 +02:00
Erenando e85b19686d Jumping is now possible with spacebar 2023-03-29 15:04:22 +02:00
Skyball2000 7be9002778 Merge remote-tracking branch 'origin/main' 2023-03-29 15:01:52 +02:00
Skyball2000 ebfa89e374 Fixed level selection 2023-03-29 15:01:46 +02:00
Fabian Hoppe e64111b0c2 Implement Main Menu and connection to level selection 2023-03-29 14:59:37 +02:00
Erenando 4997a00be3 Jumping is now possible with spacebar 2023-03-29 14:56:12 +02:00
Erenando 13866edfd0 Level 2 theme adapted to cave 2023-03-29 14:51:33 +02:00
Skyball2000 e3927524c7 Fixed background images in level selection 2023-03-29 14:29:36 +02:00
Skyball2000 f94f33d1bb Correct background scaling 2023-03-29 14:14:45 +02:00
Erenando 1897b4be04 Level design changes 2023-03-29 14:09:05 +02:00
Skyball2000 2bc88f34f4 Background image 2023-03-29 14:01:55 +02:00
Skyball2000 e4993f39af Added playable character loading 2023-03-29 13:50:48 +02:00
Erenando 25d3305a79 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	project/main.py
2023-03-29 12:29:31 +02:00
Erenando 5aca916026 Level design changes 2023-03-29 12:29:00 +02:00
Skyball2000 8f72869e73 Added ui arrow texture 2023-03-29 10:58:11 +02:00
Skyball2000 43c3c3786f Merge remote-tracking branch 'origin/main'
# Conflicts:
#	project/data/levels/level-01.csv
2023-03-29 10:46:04 +02:00
Skyball2000 e50d280afa Introduced screen layouts and game states 2023-03-29 10:45:48 +02:00
Jonas Wächter ad73b3bf2f cave Blocks working 2023-03-29 10:30:41 +02:00
Jonas Wächter 3d1ecf99f5 cave Blocks working 2023-03-29 10:30:27 +02:00
Erenando 62726c6af8 Level design changes 2023-03-29 09:40:09 +02:00
Skyball2000 2280e81629 player animation will now update based on player input 2023-03-29 07:37:50 +02:00
Yan Wittmann 00c051de02 Another performance change 2023-03-28 20:08:52 +02:00
Yan Wittmann beea6b1ee8 Merge remote-tracking branch 'origin/main' into main
# Conflicts:
#	project/data/levels/level-01.csv
2023-03-28 20:01:23 +02:00