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

Lyzzy commented 2024-03-07 16:35:42 +01:00

Owner

Copy link

No description provided.

Lyzzy added 19 commits 2024-03-07 16:35:43 +01:00

Merge pull request 'Development' (#57) from Development into main ... 6fce7e0fd2

Reviewed-on: InfoProjekt/game#57

Merge pull request 'Added Label class' (#64) from Lyzzy/game:main into Development ... b3c7d87926

Reviewed-on: InfoProjekt/game#64

Merge https://git.spafi.eu/InfoProjekt/game 746982641a

changed image size ... 6034a8382f

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game 1b6ccb17b0

Merge pull request 'doubled image size' (#65) from Spafi/game:main into Development ... f21d980352

Reviewed-on: InfoProjekt/game#65

Merge pull request 'Development' (#1) from InfoProjekt/game:Development into main ... 1fd852e31e

Reviewed-on: jaffa/game#1

Upload files to "art/sprite files" 47c93f61dc

Merge pull request 'main' (#66) from jaffa/game:main into Development ... a41ee41fba

Reviewed-on: InfoProjekt/game#66

new river sprite file added ... c3c44bbc71

new idea lol

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

Merge pull request 'new river sprite file added' (#67) from Spafi/game:main into Development ... 1d03d60ac2

Reviewed-on: InfoProjekt/game#67

relocated image files ... 5010609378

changed room generation

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

Merge branch 'main' of https://git.spafi.eu/Lyzzy/game ... b7fb7e1f1e

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

image files changed ... a68bba70bb

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>

wrong location ... 9c36e8d570

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

wrong location ... 11c7a9037b

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

wrong location ... abfa24ced8

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

wrong location ... 321dac7cca

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

Merge pull request 'main' (#72) from Spafi/game:main into Development ... 9396218a11

Reviewed-on: InfoProjekt/game#72

Lyzzy merged commit 569b3394a0 into main 2024-03-07 16:35:48 +01:00

Lyzzy referenced this pull request from a commit 2024-03-07 16:35:49 +01:00

Merge pull request 'Development' (#8) from InfoProjekt/game:Development into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Lyzzy/game#8

No description provided.