forked from BoundingBoxSoftware/Materialize
-
-
Notifications
You must be signed in to change notification settings - Fork 10
Merge missing changes by finepointcgi and I (continued his fork) #29
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ParkingLotGames
wants to merge
73
commits into
maikramer:master
Choose a base branch
from
ParkingLotGames:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
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
You woudl select Jpeg or targa and it would select png or exr
Fixed all compiler warnings (some warnings suppressed and need addressing (replace WWW().texture with UnityWebRequest()) Added Blurred (Most inefficient blur ever) Skybox shader to remove the background sphere that was interferring with RT GI Scrapped React based UI due to bugs and lack of documentation on ReactUnity Project Started working on new UnityDynamicPanels based UI (https://github.com/yasirkula/UnityDynamicPanels) added headers in hierarchy and tessellated quad packages Moved Post-processing and misplaced scripts to Scripts > Postprocessing to be replaced later on Moved misplaced textures to Textures Removed Collab package that was erroring (was not affecting anything, just couldn't load)
CommandListExecutor has unreachable code, need to rollback changes made to MainGui version that has documentation or transfer documentation to current version, then enable switch statement in CommandListExecutor
… assembly for new code
need to test build and check if the async changes allow saving files noproblem
Can you try to solve the conflicts?Thanks |
will do, might take a while but I'll update you |
I have no time to continue this, then now @ParkingLotGames is a member of this repository. |
I will add @finepointcgi also, then we can make it together. |
I think the conflicts wont be easy to fix, but, would be good if you do. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.