Commit Graph

155 Commits (51dd969e23689e3c4bc68b33e9632ef59279e800)

Author SHA1 Message Date
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
Thomas 83ddf6697c added cave bg 2023-03-28 11:39:40 +02:00
Jonas Wächter ebd20555e9 Added 2 backgrounds 2023-03-28 11:31:56 +02:00
Mike 417c28bd60 add next steps for level menu 2023-03-28 10:13:03 +02:00
Thomas 4c66ff4a10 added all variants of themed blocks 2023-03-28 10:07:08 +02:00
Jonas Wächter 5a43d417ec Lever Resized 2023-03-28 10:00:11 +02:00
Jonas Wächter 19310dc1ff Character Resized 2023-03-28 09:56:54 +02:00
Jonas Wächter 8fdec68faa Added directional spikes 2023-03-28 09:37:09 +02:00
Jonas Wächter bcc5f5f55c Merge remote-tracking branch 'origin/main' 2023-03-28 09:25:37 +02:00
Jonas Wächter f22ce1a4d9 Added movable Box image 2023-03-28 09:25:25 +02:00
Skyball2000 383ff935f4 Fixed sprite error 2023-03-27 18:56:18 +02:00
Eren Saglam 984e056a21 Merge remote-tracking branch 'origin/main' 2023-03-27 18:52:41 +02:00
Yan Wittmann ea0b86faba Merge remote-tracking branch 'origin/main' into main 2023-03-27 18:52:54 +02:00
Yan Wittmann 1a24f7c091 Fixed issue in box collision 2023-03-27 18:52:49 +02:00
Eren Saglam 7382c404d0 Added cave sprites for cave theme 2023-03-27 18:52:34 +02:00
Yan Wittmann e83a418702 Made fonts higher resolution 2023-03-27 18:41:12 +02:00
Eren Saglam afe6945d94 Merge remote-tracking branch 'origin/main' 2023-03-27 18:41:04 +02:00
Eren Saglam 092d753770 Level 2 prototype is working 2023-03-27 18:40:54 +02:00
Yan Wittmann 3f90be42d0 Merge remote-tracking branch 'origin/main' into main 2023-03-27 18:37:35 +02:00
Yan Wittmann 85a34b01d8 Added pushable boxes.
Added click event handler
2023-03-27 18:37:30 +02:00
Thomas 46e7d91f52 added cave-themed blocks 2023-03-27 18:24:55 +02:00
Eren Saglam 6147541a9e Merge remote-tracking branch 'origin/main' 2023-03-27 18:07:29 +02:00
Eren Saglam 575dc00ade Level 1 prototype is working 2023-03-27 18:07:21 +02:00
Mike 070aa5497a fix position of text labels in LevelMenu 2023-03-27 17:48:28 +02:00
Yan Wittmann 121dbb31f9 Level demo changes 2023-03-27 17:19:06 +02:00
Yan Wittmann ad8d0b77b8 Implemented a first version of gate output/input 2023-03-27 16:07:42 +02:00
Yan Wittmann 4ec230419d Merge remote-tracking branch 'origin/main' into main 2023-03-27 15:17:44 +02:00
Yan Wittmann 7a5987b3d2 Performance improvements 2023-03-27 15:17:01 +02:00
Mike 4aef777081 add first steps for LevelMenu 2023-03-27 15:11:35 +02:00
Eren Saglam f8a46052e7 Merge remote-tracking branch 'origin/main' 2023-03-27 14:57:32 +02:00
Eren Saglam dbc33f603b Changed 0-tutorial.csv 2023-03-27 14:57:04 +02:00
Yan Wittmann 7cac2c2a7a Merge remote-tracking branch 'origin/main' into main 2023-03-27 14:47:19 +02:00
Yan Wittmann 5db9b7c627 Minor performance improvement 2023-03-27 14:47:12 +02:00
Eren Saglam 82722753f9 Added 0-tutorial.csv 2023-03-27 14:45:29 +02:00
Yan Wittmann f400b374fd Partial collision 2023-03-27 14:38:52 +02:00
Yan Wittmann 44d3ab01bf Optimization on level loading 2023-03-27 13:08:22 +02:00
Yan Wittmann 48c8163609 Frame rate counter 2023-03-27 12:54:09 +02:00
Yan Wittmann ac0b8dc2f5 Initial button logic 2023-03-27 12:51:44 +02:00
Yan Wittmann f25bc0112c Added missing sprite texture for level elements 2023-03-27 12:15:35 +02:00
Jonas Wächter bb19ba4602 ghost idle anim. uses all images 2023-03-27 12:13:28 +02:00
Yan Wittmann ccbf871e47 Started writing button element 2023-03-27 11:57:35 +02:00
Jonas Wächter 8ca9bc03ee Merge remote-tracking branch 'origin/main' 2023-03-27 11:46:24 +02:00
Yan Wittmann 123a028257 Sprite changes 2023-03-27 11:46:19 +02:00
Jonas Wächter 120fb42b5a removed wall in name 2023-03-27 11:46:17 +02:00
Yan Wittmann e53c1084df Started writing new level creation 2023-03-27 11:46:03 +02:00
Jonas Wächter fd29b7f1df Added Staubsauger on and off 2023-03-27 11:35:59 +02:00
Jonas Wächter a3648312fa Renamed to blocks 2023-03-27 11:24:02 +02:00
Jonas Wächter b2af6689fe Merge remote-tracking branch 'origin/main' 2023-03-27 11:03:49 +02:00
Jonas Wächter f3a82461b0 Added Character sprites, Tutorial blocks and staubsauger 2023-03-27 11:03:42 +02:00
Thomas c00945e551 changed dimensions of pressureplate 2023-03-27 10:48:07 +02:00
Jonas Wächter 2e28b93d53 Added Sprites 2023-03-27 09:53:52 +02:00
Stephan Halder ef9b2d179f countinued working on level loading 2023-03-26 17:33:01 +02:00
Stephan Halder 34f3203c7a Merge remote-tracking branch 'origin/main' 2023-03-26 17:20:04 +02:00
Stephan Halder 4892c1a9ff countinued working on level loading 2023-03-26 17:19:30 +02:00
Yan Wittmann 7d5f37367f Random block variants 2023-03-26 17:14:02 +02:00
Jonas Wächter 29950fb0f8 castle sprites working 2023-03-26 17:12:12 +02:00
Jonas Wächter 8b6267e9cb Merge remote-tracking branch 'origin/main' 2023-03-26 17:01:43 +02:00
Yan Wittmann f2fab23b75 New collision system 2023-03-26 17:01:28 +02:00
Jonas Wächter 01f27da224 added castle sprites 2023-03-26 17:01:25 +02:00
Stephan Halder bf0688408e countinued working on level loading 2023-03-26 15:14:06 +02:00
Yan Wittmann 7f6e37d8bc Pushed main changes 2023-03-26 15:01:58 +02:00
Yan Wittmann cd8fa05c41 Added files for testing level loading and controller 2023-03-26 15:00:29 +02:00
Stephan Halder a3a09f2c11 started implementing level creation logic 2023-03-26 14:12:46 +02:00
Yan Wittmann 65c8a17543 Implemented framework for player controller and input handling 2023-03-26 12:46:41 +02:00
Yan Wittmann da20414611 Template sprite file 2023-03-26 11:46:51 +02:00
Yan Wittmann 7d3dd16fe5 Added structure for Level loading 2023-03-26 11:21:22 +02:00
Yan Wittmann f1709229c5 Screen to world coordinate translation and click listeners 2023-03-26 11:13:34 +02:00
Stephan Halder 975948f068 TextLabel click listener 2023-03-26 11:11:10 +02:00
Yan Wittmann ec550683f8 Minor adjustments to physics 2023-03-26 10:40:17 +02:00
Yan Wittmann e6d34fcbf2 Interactions between elements in between layers 2023-03-26 10:05:23 +02:00
Yan Wittmann 72fd82c5a6 Generalized UI Elements 2023-03-26 09:51:11 +02:00
Yan Wittmann 8cbf623247 Made simulation even more satisfying 2023-03-25 18:27:54 +01:00
Jonas Wächter d8ed9dee24 made physics demo more satisfying 2023-03-25 18:22:37 +01:00
Yan Wittmann 88b3c4724c Fixed timing delta in physics calculation
(Big Push)
2023-03-25 18:19:03 +01:00
Yan Wittmann 3e622e272b Merge remote-tracking branch 'origin/main' into main 2023-03-25 18:14:56 +01:00
Yan Wittmann 30c153e555 Physics engine improvements 2023-03-25 18:14:47 +01:00
Jonas Wächter 3489ae90ad test texte für TextLabel 2023-03-25 18:13:59 +01:00
Jonas Wächter c5ce98b255 working TextLabel 2023-03-25 18:11:41 +01:00
Yan Wittmann e3744241ea First implementation of physics 2023-03-25 17:18:43 +01:00