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