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
956c25769c
test
2024-03-07 16:41:11 +01:00
569b3394a0
Merge pull request 'Development' ( #8 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Lyzzy/game#8
2024-03-07 15:35:48 +00:00
9396218a11
Merge pull request 'main' ( #72 ) from Spafi/game:main into Development
...
Reviewed-on: #72
2024-03-07 14:27:03 +00:00
321dac7cca
wrong location
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:57 +00:00
abfa24ced8
wrong location
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:52 +00:00
11c7a9037b
wrong location
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:45 +00:00
9c36e8d570
wrong location
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:36 +00:00
SpagettiFisch
a68bba70bb
image files changed
...
new mob sprites
relocated all image files
disabled collision between player and npcs and mobs
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 14:57:18 +01:00
SpagettiFisch
b7fb7e1f1e
Merge branch 'main' of https://git.spafi.eu/Lyzzy/game
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 13:56:24 +01:00
SpagettiFisch
5010609378
relocated image files
...
changed room generation
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 13:55:01 +01:00
73165bd33e
speech and fireplace
2024-03-07 12:52:41 +00:00
b368fe4665
zombie speech and fireplace
2024-03-07 12:52:17 +00:00
af5204857b
some fixes
...
forgot what i did
2024-03-07 09:43:33 +00:00
1d03d60ac2
Merge pull request 'new river sprite file added' ( #67 ) from Spafi/game:main into Development
...
Reviewed-on: #67
2024-03-07 08:51:52 +00:00
SpagettiFisch
c3c44bbc71
new river sprite file added
...
new idea lol
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 09:50:10 +01:00
a41ee41fba
Merge pull request 'main' ( #66 ) from jaffa/game:main into Development
...
Reviewed-on: #66
2024-03-07 08:24:16 +00:00
47c93f61dc
Upload files to "art/sprite files"
2024-03-07 08:18:47 +00:00
1fd852e31e
Merge pull request 'Development' ( #1 ) from InfoProjekt/game:Development into main
...
Reviewed-on: jaffa/game#1
2024-03-07 08:13:31 +00:00
f21d980352
Merge pull request 'doubled image size' ( #65 ) from Spafi/game:main into Development
...
Reviewed-on: #65
2024-03-07 06:51:08 +00:00
SpagettiFisch
1b6ccb17b0
Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game
2024-03-07 07:49:49 +01:00
SpagettiFisch
6034a8382f
changed image size
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 07:49:16 +01:00
SpagettiFisch
746982641a
Merge https://git.spafi.eu/InfoProjekt/game
2024-03-07 07:46:26 +01:00
b3c7d87926
Merge pull request 'Added Label class' ( #64 ) from Lyzzy/game:main into Development
...
Reviewed-on: #64
2024-03-07 06:45:57 +00:00
41f8b76b90
added Label class
...
Label class in classes, added text to book, changed wind spell a bit but dunno if really good
2024-03-06 17:40:02 +00:00
96c0a691b7
empty image cuz im stupid
2024-03-06 17:36:57 +00:00
