Development #7

Merged

Spafi merged 15 commits from InfoProjekt/game:Development into main 2024-03-10 22:29:20 +01:00

Conversation 0 Commits 15 Files changed 6 +84 -36

Spafi commented 2024-03-10 22:29:15 +01:00

Owner

Copy link

No description provided.

Spafi added 15 commits 2024-03-10 22:29:15 +01:00

Merge pull request 'changed stuff' (#76) from Spafi/game:main into Development ... 3232096d66

Reviewed-on: InfoProjekt/game#76

Merge pull request 'Development' (#10) from InfoProjekt/game:Development into main ... 01c3aeae4a

Reviewed-on: Lyzzy/game#10

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

Merge pull request 'Development' (#11) from InfoProjekt/game:Development into main ... 2a2d7b2765

Reviewed-on: Lyzzy/game#11

starting to add some storyline, added Rat 4d40e44e2d

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

storyline 726c5ee2a2

fix fix 248fc2a112

story yea yea e540693def

wuhu 4e976c3895

Stoorryy 93bbb0eb84

picture 04547161a3

- fc3773150a

added last part of tutorial f86f2e5dce

Merge pull request 'storyline' (#79) from Lyzzy/game:main into Development ... 73508253c4

Reviewed-on: InfoProjekt/game#79

Spafi merged commit 67ba9a62a1 into main 2024-03-10 22:29:20 +01:00

Spafi referenced this pull request from a commit 2024-03-10 22:29:20 +01:00

Merge pull request 'Development' (#7) 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: Spafi/game#7

No description provided.