Merge from sabresaurus #2
Merged
Conversation
This file contains 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
… Capsule # Conflicts: # Scripts/Brushes/PrimitiveBrush.cs # Scripts/UI/SabreCSGResources.cs
…urns a new Plane() to prevent severe 'nullable must have a value' errors. The face editor doesn't care and doesn't see it probably because the plane is invalid.
VmfImporter: World scale and UVs have been fixed.
VMF importer scale now matches the Unity metric system and SabreCSG grid.
Added a donation section.
Added the batch Texture to Material processor context menu.
…ITY_EDITOR_WIN and assume Windows is always DirectX.
* Fixed divide by zero error when the pallete windows are smaller than the drop zone size.
Fix divide by zero error with palette windows
…cale just scales linearly.
Unreal Gold Scaling Fixes
Screen.safeArea missing when using Unity 2017.2.0f3. Fixes #126.
Material Update Number 2
2DSE: Replaced "Load Project" with "Restore Project"
…dditional parameters related to them.
…lative to the volume brush or apply forces in world space.
… " Brush " with " Volume " instead of appending " (Volume)". This will let users give volumes a unique name so they can find it during play without us affecting their names (as they will likely not use the word Brush with spaces for these).
Introducing: Volume Brushes
Moved the Volume materials out of the Resources directory.
Providing download links and instructions will make it easier for Unity beginners to get started with SabreCSG. We also made the wiki a lot more obvious than some inline text now that it has grown.
…lumes selected resets all volume types to the first in the list. Thanks @kerfuffles!
Fixed volume types resetting in Unity 2018 when selecting regular brushes.
2DSE: Cross-Platform Rendering and Mac Retina display fixes.
* Fixed CS0169 in SabreCSGPreferences (Event cachedEvent was unused) * Fixed CS0618 in Tool and CSGModel * Fixed CS0252 in BrushBaseInspector (introduced with volume multi-edit fix)
…revent a potential exception casting "null" to "System.Type". Moved a comment around in CSGModel.cs.
2018.2 Update Patch
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.