🦔👾 -> Adding 2d tile map [SCD-5]#7
Open
Gizmotronn wants to merge 8 commits intoSignal-K:planets-build-2dfrom
Open
🦔👾 -> Adding 2d tile map [SCD-5]#7Gizmotronn wants to merge 8 commits intoSignal-K:planets-build-2dfrom
Gizmotronn wants to merge 8 commits intoSignal-K:planets-build-2dfrom
Conversation
…at remain in [planets] branch
Gizmotronn
commented
Aug 10, 2022
Member
Author
Gizmotronn
left a comment
Gizmotronn
left a comment
There was a problem hiding this comment.
Working on fixing some conflict errors (merge)
Doing this locally
Everything else is approved
Member
|
New commit, player can move around now |
Becoming a hassle every time I'm asked to commit to switch to a different branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Nathan's created some 2d scenes, including polybrush data, tile maps & the quest/player UI scene that will be adopted for the citizen science journal/task list (basically a fork of the zooniverse classification menu/ui).
#4
Will merge the tile map scenes/configuration with the 3d scenes in
simple(branch)