Development #11

Merged

Lyzzy merged 3 commits from InfoProjekt/game:Development into main 2024-03-10 12:51:09 +01:00

Conversation 0 Commits 3 Files changed 1 +2 -2

Lyzzy commented 2024-03-10 12:50:48 +01:00

Owner

Copy link

No description provided.

Lyzzy added 3 commits 2024-03-10 12:50:48 +01:00

changed NPC talking key to f ... 67a0937c4b

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

Merge branch 'main' of https://git.spafi.eu/Spafi/game ... 4ccc2dde11

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

Merge pull request 'changed NPC talk key to f and resolved merge conflicts' (#77) from Spafi/game:main into Development ... 4a47efe94d

Reviewed-on: InfoProjekt/game#77

Lyzzy merged commit 2a2d7b2765 into main 2024-03-10 12:51:09 +01:00

Lyzzy referenced this pull request from a commit 2024-03-10 12:51:09 +01:00

Merge pull request 'Development' (#11) 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#11

No description provided.