cfc8643907
Merge pull request 'Fixed fairy and added boss health bar' ( #92 ) from Development into main
...
Reviewed-on: #92
2024-03-13 10:52:10 +00:00
dff3b582d7
Merge pull request 'Implemented Boss bar and fixed fairy' ( #87 ) from Spafi/game:main into Development
...
Reviewed-on: #87
2024-03-13 09:43:47 +00:00
SpagettiFisch
690a00b718
Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-13 10:38:09 +01:00
SpagettiFisch
368b033aab
implemented boss health bar
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-13 10:37:44 +01:00
d01e511739
Merge pull request '0.1 Merge' ( #85 ) from Development into main
...
Reviewed-on: #85
2024-03-12 21:02:50 +00:00
57ffcf133c
changed will to live (level) back to non dev
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-12 21:02:21 +00:00
45c18a7713
changed will to live (level) back to non dev
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-12 21:00:05 +00:00
e383c8afed
Merge pull request 'changed to normal version again (no dev shortcuts)' ( #84 ) from Spafi/game:main into Development
...
Reviewed-on: #84
2024-03-12 20:51:23 +00:00
SpagettiFisch
64a3381eb9
Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-12 21:50:04 +01:00
SpagettiFisch
a72349f7df
changed to normal version again (no dev shortcuts)
...
changed font for Think (because the f looked like a p)
uploaded bossbar images
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-12 21:45:52 +01:00
3448ec4120
Update classes.py
...
sound effects für reddy, zombie, skelett, oldman attack, hurt sound effect für oldman, Tür und Portal sounds
2024-03-12 17:52:27 +00:00
c81b3fa355
Upload files to "audio/soundeffects"
2024-03-12 16:48:24 +00:00
4d90ac3e38
Upload files to "audio/soundeffects"
2024-03-12 16:47:40 +00:00
dfc2ea8086
Upload files to "audio/soundeffects"
2024-03-12 16:46:44 +00:00
b124f8817c
Upload files to "art/images/people"
2024-03-12 16:18:45 +00:00
d4da02ee8d
Delete art/images/people/fairy.png
2024-03-12 16:18:31 +00:00
7a85a049de
Delete audio/soundeffects/altefrauspeak.mp3
2024-03-12 15:57:10 +00:00
5db4df24a0
Delete audio/soundeffects/dorfaeltesterspeak.mp3
2024-03-12 15:57:04 +00:00
2f8e393c1e
Delete viecher.py
...
nichts mehr drin
2024-03-12 15:56:39 +00:00
08edd05403
Merge pull request 'room update and boss' ( #83 ) from Spafi/game:main into Development
...
Reviewed-on: #83
2024-03-12 11:52:26 +00:00
SpagettiFisch
fb3ba25b89
managed the room thing, you can now actually switch rooms
...
the boss is killable
you get a tbc screen after killing the boss
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-12 12:50:13 +01:00
SpagettiFisch
04e0b68cd7
Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-12 07:41:12 +01:00
SpagettiFisch
d132757717
added new npc
...
started migrating object creation into the room classs
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-12 07:39:36 +01:00
a13042ffdd
Upload files to "art/images/weapons"
2024-03-11 21:49:24 +00:00
f482a2445c
Delete audio/soundeffects/fireball.mp3
2024-03-11 21:44:35 +00:00
df7aff13df
Upload files to "audio/soundeffects"
2024-03-11 21:44:26 +00:00
e5adb43ec6
Delete audio/soundeffects/fireball.mp3
2024-03-11 21:44:05 +00:00
6d68ec88e0
Upload files to "audio/soundeffects"
2024-03-11 21:43:51 +00:00
f458a4e89b
Delete audio/soundeffects/fireball.mp3
2024-03-11 21:43:30 +00:00
c9c87da15a
Delete audio/soundeffects/door.mp3
2024-03-11 21:43:27 +00:00
37aee3dfff
Upload files to "audio/soundeffects"
2024-03-11 21:43:13 +00:00
38ddb5fbd6
Delete audio/soundeffects/door.mp3
2024-03-11 21:42:38 +00:00
8198079512
Delete audio/soundeffects/fireball.mp3
2024-03-11 21:42:34 +00:00
6ee5cba861
Upload files to "audio/soundeffects"
2024-03-11 21:42:12 +00:00
89255505ec
Upload files to "art/images/people"
2024-03-11 21:05:33 +00:00
a35dcfb823
Update main.py
2024-03-11 19:47:09 +00:00
d08274c2f6
Upload files to "audio/soundeffects"
2024-03-11 19:27:59 +00:00
6601e00318
Upload files to "audio/soundeffects"
2024-03-11 19:22:27 +00:00
b2ac429eaa
Delete audio/soundeffects/a
2024-03-11 19:17:12 +00:00
98b8a2bcb6
Upload files to "audio/soundeffects"
2024-03-11 19:17:07 +00:00
a7dd1dbf27
Upload files to "audio/music"
2024-03-11 19:09:46 +00:00
9e9ab2156a
Delete audio/music/a
2024-03-11 19:07:23 +00:00
3e655a09f3
Upload files to "audio/music"
2024-03-11 19:07:13 +00:00
585d19fb37
Delete audio/soundeffects/fireball.mp3
2024-03-11 18:58:17 +00:00
f755bef435
Upload files to "audio/soundeffects"
2024-03-11 18:58:10 +00:00
065036d430
Add audio/soundeffects/a
2024-03-11 18:56:13 +00:00
46c05a8de5
Delete audio/soundeffects
2024-03-11 18:55:56 +00:00
643e74ab58
Add audio/soundeffects
2024-03-11 18:55:35 +00:00
72f0050055
Add audio/music/a
2024-03-11 18:55:05 +00:00
0dda6fd38c
Delete music /a
2024-03-11 18:50:56 +00:00
