Lyzzy/game
1
0
Fork 0
forked from InfoProjekt/game
Code Pull requests Activity

Development #8

Merged
Lyzzy merged 19 commits from InfoProjekt/game:Development into main 2024-03-07 16:35:48 +01:00
Conversation 0 Commits 19 Files changed 42 +462 -454

19 commits

Author SHA1 Message Date
Spafi
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
Spafi
321dac7cca wrong location 
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-03-07 14:26:57 +00:00
Spafi
abfa24ced8 wrong location 
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-03-07 14:26:52 +00:00
Spafi
11c7a9037b wrong location 
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-03-07 14:26:45 +00:00
Spafi
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
Spafi
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
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
Jefferson Mousikas
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
Jefferson Mousikas
47c93f61dc Upload files to "art/sprite files" 2024-03-07 08:18:47 +00:00
Jefferson Mousikas
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
Spafi
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
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
Spafi
b3c7d87926 Merge pull request 'Added Label class' (#64) from Lyzzy/game:main into Development 
Reviewed-on: InfoProjekt/game#64
 2024-03-07 06:45:57 +00:00
Spafi
6fce7e0fd2 Merge pull request 'Development' (#57) from Development into main 
Reviewed-on: InfoProjekt/game#57
 2024-03-03 12:28:45 +00:00