kinggoldcatter/cool-test-project
1
0
Fork 2
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

Added a basic canvas UI and Scrap Amount Text and Game Manager Object to Scene #2

Open
Marciuschextus wants to merge 1 commit from Marciuschextus/cool-test-project:marciuschextus-patch-1 into master
pull from: Marciuschextus/cool-test-project:marciuschextus-patch-1
merge into: kinggoldcatter:master
Conversation 0 Commits 1 Files changed 1 +409
Marciuschextus commented 2025-09-21 20:07:23 +00:00
First-time contributor
Copy link

Canvas has simple text display for Scrap Amount that should be displayed based on Game Manager script information
Game Manager object will have script to manage most gameplay information.

Canvas has simple text display for Scrap Amount that should be displayed based on Game Manager script information Game Manager object will have script to manage most gameplay information.
Canvas has simple text display for Scrap Amount that should be displayed based on Game Manager script information 
Game Manager object will have script to manage most gameplay information.
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u marciuschextus-patch-1:Marciuschextus-marciuschextus-patch-1
git switch Marciuschextus-marciuschextus-patch-1

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 master
git merge --no-ff Marciuschextus-marciuschextus-patch-1
git switch Marciuschextus-marciuschextus-patch-1
git rebase master
git switch master
git merge --ff-only Marciuschextus-marciuschextus-patch-1
git switch Marciuschextus-marciuschextus-patch-1
git rebase master
git switch master
git merge --no-ff Marciuschextus-marciuschextus-patch-1
git switch master
git merge --squash Marciuschextus-marciuschextus-patch-1
git switch master
git merge --ff-only Marciuschextus-marciuschextus-patch-1
git switch master
git merge Marciuschextus-marciuschextus-patch-1
git push origin master
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
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
kinggoldcatter/cool-test-project!2
No description provided.