Commit Graph

133 Commits (13866edfd03aec9b724b2d0e14ec89e76a583783)

Author SHA1 Message Date
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
Yan Wittmann 33ada24b84 Modified collision checking sprite selection once more 2023-03-28 20:01:09 +02:00
Eren Saglam 6770e9495a spikes placement 2023-03-28 19:51:55 +02:00
Skyball2000 0b3ff79002 More optimisations 2023-03-28 19:46:54 +02:00
Yan Wittmann 01147960cb Removed code to set visibility of colliders and sprites, as it is no longer needed. 2023-03-28 19:39:26 +02:00
Yan Wittmann 9dfc487e9a Optimize PhysicsElementsHandler.py by checking collisions only with closest sprites.
Improve UiElement.py to cache and reuse scaled images for better performance.
2023-03-28 19:35:42 +02:00
Stephan Halder 0778fef354 Merge remote-tracking branch 'origin/main' 2023-03-28 18:09:36 +02:00
Stephan Halder e4c2007928 GoalDoorReceiverLevelElement added 2023-03-28 18:09:29 +02:00
Eren Saglam 01b8898405 Level 1-4 got changed a bit. Overall gravity has to be modified 2023-03-28 17:59:08 +02:00
Jonas Wächter 2f38db4eea fixed pressure plate 2023-03-28 17:43:20 +02:00
Skyball2000 139fa557a9 Merge remote-tracking branch 'origin/main' 2023-03-28 17:35:04 +02:00
Skyball2000 1f6f8b4552 Minor optimization 2023-03-28 17:34:58 +02:00
Jonas Wächter 6f11408528 Merge remote-tracking branch 'origin/main' 2023-03-28 17:29:56 +02:00
Jonas Wächter b6d20996f3 changed castle_bg and pressuplate 2023-03-28 17:29:43 +02:00
Stephan Halder 8aba74aa70 removed unused import 2023-03-28 17:28:54 +02:00
Stephan Halder 3ea61ef674 Merge remote-tracking branch 'origin/main' 2023-03-28 17:27:07 +02:00
Stephan Halder 5381bb2c20 spikeElements implemented 2023-03-28 17:26:47 +02:00
Yan Wittmann a104409677 Merge remote-tracking branch 'origin/main' into main 2023-03-28 17:18:00 +02:00
Yan Wittmann 447ebdd5a8 Another attempt at optimization 2023-03-28 17:17:51 +02:00
Mike 78776f5ced add background to LevelMenu 2023-03-28 16:59:29 +02:00
Eren Saglam 0853c04844 Kommentare hinzugefügt, die auskommentiert werden können, damit Hintergründe ausgetestet werden können. 2023-03-28 16:47:24 +02:00
Fabian Hoppe a8d0a9627c Adjust position of lever in levels 3, 5, 8, and 9 but still needs adjustment for pressure plates and movable boxes 2023-03-28 16:00:01 +02:00
Fabian Hoppe 20231556e7 Merge remote-tracking branch 'origin/main' 2023-03-28 15:25:06 +02:00
Fabian Hoppe 9f7f7eeb38 Adjust position of lever in levels 0, 1, 2, 4, 6 and 7 2023-03-28 15:24:49 +02:00
Mike 28d650dd3e show/hide LeveMenu when pressing escape 2023-03-28 14:51:17 +02:00
Fabian Hoppe 5d742a527e Add first version of level 9 2023-03-28 14:24:01 +02:00
Fabian Hoppe 6446382679 Add first versions of levels 7 and 9 2023-03-28 14:21:58 +02:00
Jonas Wächter fb41ab5df8 Merge remote-tracking branch 'origin/main' 2023-03-28 13:11:27 +02:00
Jonas Wächter c9ca1de866 Added All blocks zu sprites file 2023-03-28 13:11:20 +02:00
Mike 14a057cbba load selected level 2023-03-28 12:45:22 +02:00
Mike 0d25ce06c5 Merge remote-tracking branch 'origin/main' 2023-03-28 12:30:33 +02:00
Mike 09a2489703 create correct bounding boxes for text label 2023-03-28 12:30:12 +02:00
Fabian Hoppe f0a78ce442 Add levels 2 to 6 and edit levels.json accordingly 2023-03-28 12:18:45 +02:00
Thomas 37e786eb30 changed pressureplate sprite back to original(resized) 2023-03-28 11:47:32 +02:00