Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
Update classes.py
2024-03-12 21:50:04 +01:00 · 2024-03-12 17:52:27 +00:00 · 2024-03-12 16:48:24 +00:00 · 2024-03-12 16:47:40 +00:00 · 2024-03-12 16:46:44 +00:00 · 2024-03-12 16:18:45 +00:00
13 changed files with 1077 additions and 1049 deletions
--- a/art/images/people/cultist.png
+++ b/art/images/people/cultist.png
--- a/art/images/people/fairy.png
+++ b/art/images/people/fairy.png
--- a/audio/soundeffects/arrowsound.mp3
+++ b/audio/soundeffects/arrowsound.mp3
--- a/audio/soundeffects/cultistattack.mp3
+++ b/audio/soundeffects/cultistattack.mp3
--- a/audio/soundeffects/door.mp3
+++ b/audio/soundeffects/door.mp3
--- a/audio/soundeffects/firebalhitl.mp3
+++ b/audio/soundeffects/firebalhitl.mp3
--- a/audio/soundeffects/hitsound.mp3
+++ b/audio/soundeffects/hitsound.mp3
--- a/audio/soundeffects/oldmanattack.mp3
+++ b/audio/soundeffects/oldmanattack.mp3
--- a/audio/soundeffects/portalsound.mp3
+++ b/audio/soundeffects/portalsound.mp3
--- a/audio/soundeffects/reddyattack.mp3
+++ b/audio/soundeffects/reddyattack.mp3
--- a/audio/soundeffects/zombieattack.mp3
+++ b/audio/soundeffects/zombieattack.mp3
--- a/classes.py
+++ b/classes.py
--- a/viecher.py
+++ b/viecher.py
Author	SHA1	Message	Date
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
Jefferson Mousikas	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
Jefferson Mousikas	c81b3fa355	Upload files to "audio/soundeffects"	2024-03-12 16:48:24 +00:00
Jefferson Mousikas	4d90ac3e38	Upload files to "audio/soundeffects"	2024-03-12 16:47:40 +00:00
Jefferson Mousikas	dfc2ea8086	Upload files to "audio/soundeffects"	2024-03-12 16:46:44 +00:00
Jefferson Mousikas	b124f8817c	Upload files to "art/images/people"	2024-03-12 16:18:45 +00:00
Jefferson Mousikas	d4da02ee8d	Delete art/images/people/fairy.png	2024-03-12 16:18:31 +00:00
Jefferson Mousikas	7a85a049de	Delete audio/soundeffects/altefrauspeak.mp3	2024-03-12 15:57:10 +00:00
Jefferson Mousikas	5db4df24a0	Delete audio/soundeffects/dorfaeltesterspeak.mp3	2024-03-12 15:57:04 +00:00
Jefferson Mousikas	2f8e393c1e	Delete viecher.py nichts mehr drin	2024-03-12 15:56:39 +00:00
Spafi	08edd05403	Merge pull request 'room update and boss' (#83 ) from Spafi/game:main into Development Reviewed-on: InfoProjekt/game#83	2024-03-12 11:52:26 +00:00