Commit Graph

186 Commits (4a8f59ca4356a967100c3c84e9e229259e003f8a)

Author SHA1 Message Date
Skyball2000 4a8f59ca43 Merge remote-tracking branch 'origin/main' 2023-03-29 17:44:58 +02:00
Skyball2000 6c3918fd8b Added back to level selection on all screens 2023-03-29 17:44:53 +02:00
Jonas Wächter cb5db15771 Merge remote-tracking branch 'origin/main' 2023-03-29 17:37:30 +02:00
Jonas Wächter d8fa2aa31e Resized intro bg 2023-03-29 17:37:21 +02:00
Fabian Hoppe 695b4ad6b1 change name and add first version of start screen 2023-03-29 17:34:18 +02:00
Erenando 0ad5c47d6d Tutorial renamed 2023-03-29 17:14:24 +02:00
Skyball2000 22fb3a3c34 Added wall on left and right 2023-03-29 17:12:31 +02:00
Skyball2000 10e6ae1260 Merge remote-tracking branch 'origin/main' 2023-03-29 16:48:13 +02:00
Skyball2000 f6bf489500 Another fix for boxes 2023-03-29 16:48:09 +02:00
Thomas 18440b195a changed level-csv for lever size 2023-03-29 16:46:22 +02:00
Erenando cf94c451e2 Playground has every object 2023-03-29 16:44:25 +02:00
Jonas Wächter bc7bfc4226 Merge remote-tracking branch 'origin/main' 2023-03-29 16:42:22 +02:00
Jonas Wächter ea6b6f91bb Merge remote-tracking branch 'origin/main' 2023-03-29 16:42:17 +02:00
Skyball2000 7a9a677d60 Merge remote-tracking branch 'origin/main' 2023-03-29 16:42:14 +02:00
Skyball2000 e5a13c149a Potential fix for box stuck 2023-03-29 16:42:10 +02:00
Jonas Wächter 8972a01028 created Invisible Block 2023-03-29 16:41:35 +02:00
Fabian Hoppe bc43bf3a54 increase delay of esc in levels 2023-03-29 16:36:26 +02:00
Erenando ab04fe2985 Vacuum Cleaner has no collision anymore. Added deadly zone for it when sparkling 2023-03-29 16:34:37 +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