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 from master #1

Merged
merged 127 commits into from
May 20, 2018
Merged

Conversation

jmickle66666666
Copy link
Owner

No description provided.

Henry00IS and others added 30 commits March 7, 2018 16:28
Removed warnings about "There are inconsistent line endings".
Took care of "Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)'"
UVs and Normals are generated automatically. This eases the creation of procedural geometry, for custom brush types.
Removed the old changelog.txt because it's causing confusion.
Created public properties for primitive- and compound brushes. Fixes #41.
… brush. Now by default the group will be selected (similarly to a compound brush) and you get the common bounds tools.
…rush order inspector.

"Select Brushes" now sets the "Always Select Group" flag to false so that it actually works.
…perations. If not, the options will be hidden from the editor.

GroupBrush now sets the aforementioned flag and doesn't pass on its own CSG settings to children so they stay unaffected.
…se they break everything.

CTRL+SHIFT will return from the method. Not holding anything returns from the method... it makes no sense.
2DSE fixed sliding off of the toolbar moving selected objects.
The built CSG model no longer breaks permanently. Fixes #57.
Extrude Compound Brush Faces. Fixes #55.
Vertex editor will now translate pivoted to a single vertex. Fixes #44.
Henry00IS added 28 commits May 9, 2018 17:23
Severe performance improvement for brush preview rendering. Fixes #111.
2DSE: Extrude anything into a single concave NoCSG brush.
Now using a more appropriate namespace.
Added progress bar while importing.
Created an Unreal Gold Text (*.t3d) parser and importer for SabreCSG.
… SourceEngineVMF

# Conflicts:
#	Scripts/Editor/Inspectors/CSGModelInspector.cs
#	Scripts/Importers.meta
…g code to prevent the exponential slowdown. The methods are marked as internal and should be removed once there's a proper fix.
Created a Valve Map Format (*.vmf) parser and importer for SabreCSG.
…n some surfaces for no known reason at this moment.
Valve map format importer improvements.
@jmickle66666666 jmickle66666666 merged commit 5cbca41 into jmickle66666666:master May 20, 2018
jmickle66666666 pushed a commit that referenced this pull request Jul 12, 2018
* Introducing new primitive type: Capsule! And code cleanup.

* Add ReflectionProbeUsage settings

Feature addition in reference to sabresaurus#82
+ Added a group to CSGModelInspector "Common Fixes"
+ Added a toggle + enum to change ReflectionProbeUsage for the entire CSGModel

* The checkbox will reset the reflection probes to Blend Probes at every 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!).

* Disabled CSG Models will no longer enable their MeshGroup during play. Fixes sabresaurus#131.

* Now only looks at the CSG Model enabled checkbox so it works like a traditional game object where only a parent could be disabled yet the children are enabled.

* Add Hollow Box Brush

+ Add HollowBoxBrush
+ Add HollowBoxBrushInspector

Simple compound brush for generating a hollow cube/box with wall thickness.

* Fix CS0252

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.

* 2D Shape Editor can now extrude segments.

* use #if NET_4_6 to detect if the project is on the .net 4.x backend

* Now using (compoundBrushType is Type) check as discussed.

* Created a new icon for the Capsule. Added BeautifulBrushName.

* MathHelper.cs PlaneEqualsLooserWithFlip is now even looser (less precise, allowing for more floating point errors and causing less false positives).

* Increased the floats slightly which took care of a lot of artifacts I was still able to create.

* Additional fine-tuning to deal with extremely complex subtractive brushes.

* Faster and more accurate material searches for VMF and T3D. Fixed all runtime CSG game build compile errors.

* Add BrushSize feature.

* Removed unused namespaces.

* Allow individual dimention size setting for XYZ axis

* 2DSE: Fixed inverted extrude direction on flipped projects.

* Code Cleanup + bugfix

- 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.

* Updated SabreCSG version to 1.7.0.

* Fixed HollowBoxBrush compilation errors.

* Updated SabreCSG version to 1.7.1.

* Optimize Geometry has been demoted and is now off by default.

* Fixed HollowBoxBrush inspector compilation errors.

* Updated SabreCSG version to 1.7.2.

* Initial work on Volumes. Can now turn Primitive Brushes into Volumes. Can associate a volume type in the inspector.

* Finished the implementation of Volumes.

* Forgot to delete a couple test volumes from the branch.

* Decided against custom wireframe colors for volume brushes as that makes them identifiable as volumes. Instead the custom material should be more than enough to customize it.

* Volumes had the wrong rotation.

* Auto Rebuild is now extremely fast at building volumes. Volumes are invisible game objects parented to brushes (can be shown through the SabreCSG preferences for development purposes).

* The inspector-hidden volumes are now shown during play.
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.

3 participants