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 |
|
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 |
|
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 |