Merge remote-tracking branch 'origin/master' into arching (6e4bb045) · Commits · Alam Ed Arias / UltimateZoneBuilder · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

UltimateZoneBuilder
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry

Snippets Groups Projects

6e4bb045

Commit 6e4bb045 authored 4 years ago by biwa

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into arching

parents d01cbb2c 9855436f

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

Source/Core/Config/MatchingTextureSet.cs 3 additions, 3 deletions

Source/Core/Config/MatchingTextureSet.cs
Source/Core/Types/FloatHandler.cs 8 additions, 8 deletions

Source/Core/Types/FloatHandler.cs
Source/Plugins/3DFloorMode/BuilderPlug.cs 1 addition, 0 deletions

Source/Plugins/3DFloorMode/BuilderPlug.cs
Source/Plugins/3DFloorMode/ThreeDFloor.cs 4 additions, 1 deletion

Source/Plugins/3DFloorMode/ThreeDFloor.cs
Source/Plugins/3DFloorMode/Windows/ThreeDFloorEditorWindow.cs 16 additions, 13 deletions

...ce/Plugins/3DFloorMode/Windows/ThreeDFloorEditorWindow.cs

with 32 additions and 25 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment