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 |
|
|
|
523b34615b
|
Merge pull request 'Changed Book and fixed NPC convo' (#75) from Lyzzy/game:main into Development
Reviewed-on: InfoProjekt/game#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: InfoProjekt/game#74
|
2024-03-08 07:36:57 +00:00 |
|
|
|
091726b8ca
|
Merge pull request 'attack now with left mouse click' (#73) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#73
|
2024-03-07 20:05:46 +00: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: InfoProjekt/game#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 |
|
|
|
1d03d60ac2
|
Merge pull request 'new river sprite file added' (#67) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#67
|
2024-03-07 08:51:52 +00:00 |
|
|
|
a41ee41fba
|
Merge pull request 'main' (#66) from jaffa/game:main into Development
Reviewed-on: InfoProjekt/game#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: InfoProjekt/game#65
|
2024-03-07 06:51:08 +00:00 |
|
