|
|
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: #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: #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: #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: Spafi/game#7
|
2024-03-10 21:29:19 +00:00 |
|
|
|
73508253c4
|
Merge pull request 'storyline' (#79) from Lyzzy/game:main into Development
Reviewed-on: #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: #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 |
|
|
|
01c3aeae4a
|
Merge pull request 'Development' (#10) from InfoProjekt/game:Development into main
Reviewed-on: Lyzzy/game#10
|
2024-03-10 09:32:18 +00:00 |
|
|
|
3232096d66
|
Merge pull request 'changed stuff' (#76) from Spafi/game:main into Development
Reviewed-on: #76
|
2024-03-10 08:27:07 +00:00 |
|
|
|
e8d81dfb11
|
Merge pull request 'InfoProjekt-Development3' (#6) from InfoProjekt-Development3 into main
Reviewed-on: Spafi/game#6
|
2024-03-10 08:26:52 +00:00 |
|
SpagettiFisch
|
0032f8b2e1
|
Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game into InfoProjekt-Development3
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
|
2024-03-10 09:23:59 +01:00 |
|
SpagettiFisch
|
b1b7b21aa2
|
changed stuff
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
|
2024-03-10 09:17:22 +01:00 |
|
|
|
523b34615b
|
Merge pull request 'Changed Book and fixed NPC convo' (#75) from Lyzzy/game:main into Development
Reviewed-on: #75
|
2024-03-10 08:16:42 +00:00 |
|
|
|
3fe22ff6ac
|
updated convo, still weird tho
|
2024-03-09 21:27:54 +01:00 |
|
|
|
9147971be8
|
added house
|
2024-03-09 20:14:40 +01:00 |
|
|
|
52d3ec6e8d
|
fixed that herberts attributes stay the same
|
2024-03-09 16:26:53 +01:00 |
|
|
|
c17b65d2f3
|
added village somehow
|
2024-03-09 15:54:19 +01:00 |
|
|
|
67f1e081fa
|
added village
|
2024-03-09 14:00:00 +01:00 |
|
|
|
2970e5cecd
|
fixed Convo
|
2024-03-09 12:03:59 +01:00 |
|
|
|
614654692f
|
changed Book and Convo, renamed Speech
|
2024-03-09 11:11:28 +01:00 |
|
|
|
1f38a04004
|
Merge pull request 'Development' (#9) from InfoProjekt/game:Development into main
Reviewed-on: Lyzzy/game#9
|
2024-03-09 09:06:05 +00:00 |
|
|
|
d85c6ec22c
|
Merge pull request 'fixed wall colision' (#74) from Spafi/game:main into Development
Reviewed-on: #74
|
2024-03-08 07:36:57 +00:00 |
|
SpagettiFisch
|
bd5ff8b3fe
|
fixed wall colision
added object collision for mobs
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
|
2024-03-08 08:36:13 +01:00 |
|
|
|
091726b8ca
|
Merge pull request 'attack now with left mouse click' (#73) from Spafi/game:main into Development
Reviewed-on: #73
|
2024-03-07 20:05:46 +00:00 |
|
SpagettiFisch
|
31a9742a9c
|
attack now with left mouse click
emter conversaton now with f
no change to leave conversation
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
|
2024-03-07 20:50:09 +01:00 |
|
|
|
4d228bf6e0
|
test2
|
2024-03-07 16:44:38 +01:00 |
|
