Commit graph

178 commits

Author SHA1 Message Date
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
19f5027b60 Add music /a 2024-03-11 18:49:44 +00:00
aa83465577 Upload files to "art/images/people" 2024-03-11 10:39:37 +00:00
80ec47143e Merge pull request 'Update viecher.py' (#82) from jaffa-patch-1 into Development
Reviewed-on: InfoProjekt/game#82
2024-03-11 06:56:30 +00:00
a9770aff7e Update viecher.py
added animations for old man walking, old man attacking and zombie attacking
2024-03-10 23:47:22 +00:00
cc24152e7f Upload files to "art/images/people" 2024-03-10 23:37:57 +00:00
01d91e68c7 Merge pull request 'fied a bug were the game would crash during door creation' (#81) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#81
2024-03-10 22:07:53 +00:00
SpagettiFisch
3883237f91 fied a bug were the game would crash during door creation
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 23:07:38 +01:00
8dd5ad2dc6 Merge pull request 'game icon and room update' (#80) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#80
2024-03-10 22:03:06 +00:00
SpagettiFisch
7709fd52f7 Merge branch 'main' of https://git.spafi.eu/Spafi/game 2024-03-10 22:59:55 +01:00
SpagettiFisch
0f755996b6 added icon
added door sprite
addedd startscreen

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 22:59:46 +01:00
SpagettiFisch
229435f682 added room constallations
now with useless doors

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 22:58:58 +01:00
67ba9a62a1 Merge pull request 'Development' (#7) from InfoProjekt/game:Development into main
Reviewed-on: #7
2024-03-10 21:29:19 +00:00
73508253c4 Merge pull request 'storyline' (#79) from Lyzzy/game:main into Development
Reviewed-on: InfoProjekt/game#79
2024-03-10 18:02:21 +00:00
f86f2e5dce added last part of tutorial 2024-03-10 18:42:40 +01:00
fc3773150a - 2024-03-10 16:19:57 +01:00
04547161a3 picture 2024-03-10 16:05:15 +01:00
93bbb0eb84 Stoorryy 2024-03-10 16:05:09 +01:00
4e976c3895 wuhu 2024-03-10 15:14:21 +01:00
e540693def story yea yea 2024-03-10 15:06:44 +01:00
248fc2a112 fix fix 2024-03-10 14:30:20 +01:00
726c5ee2a2 storyline 2024-03-10 14:23:22 +01:00
bb8ec349dd Merge branch 'main' of https://git.spafi.eu/Lyzzy/game 2024-03-10 13:04:29 +01:00
4d40e44e2d starting to add some storyline, added Rat 2024-03-10 12:58:59 +01:00
2a2d7b2765 Merge pull request 'Development' (#11) from InfoProjekt/game:Development into main
Reviewed-on: Lyzzy/game#11
2024-03-10 11:51:09 +00:00
4a47efe94d Merge pull request 'changed NPC talk key to f and resolved merge conflicts' (#77) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#77
2024-03-10 11:46:45 +00:00
SpagettiFisch
4ccc2dde11 Merge branch 'main' of https://git.spafi.eu/Spafi/game
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 12:42:41 +01:00
SpagettiFisch
67a0937c4b changed NPC talking key to f
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 12:42:09 +01:00