WIP: feat/setup-scene #3

Draft

Superkooka wants to merge 6 commits from feat/setup-scene into main

pull from: feat/setup-scene

merge into: Jasper-Developement-Team:main

Jasper-Developement-Team:main

Jasper-Developement-Team:feat/init-solution

Conversation 0 Commits 6 Files changed 28 +586 -1

Superkooka commented 2026-07-16 14:32:19 +00:00

Owner

Copy link

No description provided.

Superkooka added 4 commits 2026-07-16 14:32:19 +00:00

feat(monogame): project setup 71550afa3d

feat(setup-scene): draw background from Gamescene 1d97f3e70f

feat(setup-scene): simulation clock + "soft-ecs" implementation bdd69590c8

feat(setup-scene): doc for clock 99689daf57

Superkooka force-pushed feat/setup-scene from 99689daf57 to 430f4b55ad 2026-07-16 14:33:46 +00:00 Compare

Superkooka added 1 commit 2026-07-16 14:40:52 +00:00

feat(setup-scene): SystemScheduler 7e64252941

Superkooka added 1 commit 2026-07-16 14:59:31 +00:00

fix(setup-scene): fix gameWorld namespace 7739f44ae3

This pull request has changes conflicting with the target branch.

• Jasper.Framework/Jasper.Framework.csproj
• Jasper.Game/Jasper.cs
• docs/src/SUMMARY.md

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'WIP: feat/setup-scene' (#3) from feat/setup-scene into main

Merge commit body Reviewed-on: https://forge.superkooka.com/Jasper-Developement-Team/jasper/pulls/3

Merge pull request 'WIP: feat/setup-scene' (#3) from feat/setup-scene into main Reviewed-on: https://forge.superkooka.com/Jasper-Developement-Team/jasper/pulls/3 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin feat/setup-scene:feat/setup-scene

git switch feat/setup-scene

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff feat/setup-scene

git switch feat/setup-scene

git rebase main

git switch main

git merge --ff-only feat/setup-scene

git switch feat/setup-scene

git rebase main

git switch main

git merge --no-ff feat/setup-scene

git switch main

git merge --squash feat/setup-scene

git switch main

git merge --ff-only feat/setup-scene

git switch main

git merge feat/setup-scene

git push origin main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

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

Jasper-Developement-Team/jasper!3

No description provided.