Skip to content
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

Merge master changes #2

Merged
merged 47 commits into from
Jun 11, 2018
Merged

Conversation

nukeandbeans
Copy link
Owner

No description provided.

Henry00IS and others added 30 commits May 12, 2018 23:28
… Capsule

# Conflicts:
#	Scripts/Brushes/PrimitiveBrush.cs
#	Scripts/UI/SabreCSGResources.cs
Feature addition in reference to #82
+ Added a group to CSGModelInspector "Common Fixes"
+ Added a toggle + enum to change ReflectionProbeUsage for the entire CSGModel
…y rebuild, so I decided to remove it and just have this enum as the default way to manage it.

Generic code cleanup of CSGBuildSettings and MeshGroupManager (sorry, I know that makes it hard to read, it was an accident!).
Reflection Probes Usage build settings
…raditional game object where only a parent could be disabled yet the children are enabled.
Disabled CSG Models will no longer enable their MeshGroup during play. Fixes #131.
+ Add HollowBoxBrush
+ Add HollowBoxBrushInspector

Simple compound brush for generating a hollow cube/box with wall thickness.
Fix for CS0252 "Possible unintended reference comparison; to get a value comparison, cast the left hand side to type 'type' " in Toolbar.cs on .NET backend 4.5 Equivalent on unity 2017 and above.
The 2D Shape Editor can now extrude segments.
Fix for warning CS0252 on 4.x .net backend (unity 2018) in Toolbar.cs
Introducing new primitive type: Capsule!
…ise, allowing for more floating point errors and causing less false positives).
Faster and more accurate material searches for VMF and T3D.
nukeandbeans and others added 17 commits June 5, 2018 23:57
2DSE: Fixed inverted extrude direction on flipped projects.
Subtractive brush stability update against corruptions
- Removed unused usings.
- Removed redundant code
- Removed scale setting feature. Possible addition to compound brush later.
* Fixed brush not being manually scalable.
* Made checking brush size easier. Now can simply use IsBrushXYZTooSmall to check the size of the brush.
Fixed HollowBoxBrush compilation errors.
Optimize Geometry has been demoted and is now off by default.
Fixed HollowBoxBrush inspector compilation errors.
@nukeandbeans nukeandbeans merged commit b292bfb into nukeandbeans:master Jun 11, 2018
nukeandbeans pushed a commit that referenced this pull request Dec 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants