devone-museum-level-blockout #11
noahg
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "devone-museum-level-blockout"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Vitkunja Task: https://tasks.bugjam.dev/tasks/144
Somehow this branch includes copies of commits that are already incorporated into the
devbranch. Please rebase the branch for this PRdevone-museum-level-blockouton theorigin/devbranch so that it only includes your commits. Git should automatically drop the copied commits for you without any extra effort on your part. Then force pushdevone-museum-level-blockoutto update this PR.In the commit with subject
feat(level): Added player, floor and envirornment for lightingthere are unrelated, and unnecessary changes to three files.The changes to
levels/museum_1/museum_1.tscnare all simply floating point rounding changes and are not meaningful.The new file
levels/museum_1/terrain/terrain3d-02_10.resadds terrain data to themuseum_1scene that is far away from the actual play area of the level. See the circled area in the screenshot at the bottom of this comment.The changes to
entities/characters/player/player.tscnmoves the player'sOverheadPhantomCamera3Dnode's position down by -2.0m.None of the above file changes are related to the subject of this commit, so the changes to these file should be removed from this commit. Please delete the changes to these files by doing an interactive rebase.
If you would like assistance with doing that I can help walk you through the process.
Screenshot showing extra terrain data in
museum_1scene:@ -65,3 +65,3 @@unique_name_in_owner = trueeditor_description = "NOTE: position.y for this node MUST match the \"Look at Offset\" of its child phantom camera"transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 0)The commit with subject
feat(level): Blocked out outside walls and diamond podiumincludes a change toentities/characters/player/player.tscnthat is not related to the commit subject.Please do an interactive rebase and remove this change from that commit.
The commit with the subject
feat(level): Added Jump puzzle 1seems to be making unrelated, unnecessary changes toentities/props/diamond/diamond.tscnthat do not seem have to do with the subject of the commit.It appears that some attributes of the diamond node are being changed to suit the specific needs of the
museum-blockout-onescene, so it seems like these changes ought to be made to the instance of the node inside the scene, not to the node itself.@noahg wrote in #11 (comment):
Rebase complete-ish.
Somehow an extraneous merge commit 908cc97232651223d86679647a39696f9cb48367 was created with subject
Merge branch 'devone-museum-level-blockout' of https://git.bugjam.dev/BUGJam/pounce-game into devone-museum-level-blockout.Any merge commit that says it is merging a branch into itself is unlikely to have been done intentionally or correctly.
The contents of this merge commit are also not related to this branch or PR.
Please drop this merge commit and force push the branch to update the PR.
@noahg wrote in #11 (comment):
Yes, I would love some help, next time you are available, walking through an interactive rebase to remove my changes that are not related to this Task/PR. @noahg
908cc97232toa7d783c576a7d783c576toaad5fa346daad5fa346dto35c05e9760Looks good!