Skip to content

Commit

Permalink
Merge branch 'Dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
RealityStop committed Mar 25, 2018
2 parents 8caa78c + fcd7471 commit ef095d7
Show file tree
Hide file tree
Showing 10 changed files with 152 additions and 36 deletions.
12 changes: 0 additions & 12 deletions src/Bolt.Addons.Community.Math/Bolt.Addons.Community.Math.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,15 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Bolt.Core.Editor">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Bolt.Core.Editor.dll</HintPath>
</Reference>
<Reference Include="Bolt.Core.Runtime">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Bolt.Core.Runtime.dll</HintPath>
</Reference>
<Reference Include="Bolt.Flow.Editor">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Bolt.Flow.Editor.dll</HintPath>
</Reference>
<Reference Include="Bolt.Flow.Runtime">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Bolt.Flow.Runtime.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Core.Editor">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Ludiq.Core.Editor.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Core.Runtime">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Ludiq.Core.Runtime.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Graphs.Editor">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Ludiq.Graphs.Editor.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Graphs.Runtime">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Ludiq.Graphs.Runtime.dll</HintPath>
</Reference>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{94CCEA90-17E3-43A0-AC0B-BB9B76ECB133}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Bolt.Addons.Community.Variables.Editor</RootNamespace>
<AssemblyName>Bolt.Addons.Community.Variables.Editor</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Unity Full v3.5</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_1.3.0|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Bolt.Core.Editor">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Bolt.Core.Editor.dll</HintPath>
</Reference>
<Reference Include="Bolt.Core.Runtime">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Bolt.Core.Runtime.dll</HintPath>
</Reference>
<Reference Include="Bolt.Flow.Editor">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Bolt.Flow.Editor.dll</HintPath>
</Reference>
<Reference Include="Bolt.Flow.Runtime">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Bolt.Flow.Runtime.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Core.Editor">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Ludiq.Core.Editor.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Core.Runtime">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Ludiq.Core.Runtime.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Graphs.Editor">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Ludiq.Graphs.Editor.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Graphs.Runtime">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Ludiq.Graphs.Runtime.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="UnityEditor, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Dependencies\UnityBinaries\UnityEditor.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>..\..\Dependencies\UnityBinaries\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>..\..\Dependencies\UnityBinaries\UnityEngine.CoreModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>..\..\Dependencies\UnityBinaries\UnityEngine.UI.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Options.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UnitOptions\DecrementUnitOption.cs" />
<Compile Include="UnitOptions\IncrementUnitOption.cs" />
<Compile Include="UnitOptions\PlusEqualUnitOption.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bolt.Addons.Community.Variables\Bolt.Addons.Community.Variables.csproj">
<Project>{2fd5f2b8-19b5-4778-b4cb-076a270ba7b7}</Project>
<Name>Bolt.Addons.Community.Variables</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\Bolt.targets" />
</Project>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

using Bolt.Addons.Community.Variables.UnitOptions;
using Bolt.Addons.Community.Variables.Editor.UnitOptions;
using Ludiq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace Bolt.Addons.Community.Math.Custom_Units.Math
namespace Bolt.Addons.Community.Variables.Editor
{
[InitializeAfterPlugins]
public static class Options
Expand Down Expand Up @@ -37,4 +37,4 @@ private static IEnumerable<IUnitOption> GetStaticOptions()
yield return new PlusEqualUnitOption(VariableKind.Saved);
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using UnityEngine;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Bolt.Addons.Community.Variables.Editor")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Bolt.Addons.Community.Variables.Editor")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyIsEditorAssembly()]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("94ccea90-17e3-43a0-ac0b-bb9b76ecb133")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Linq;
using System.Text;

namespace Bolt.Addons.Community.Variables.UnitOptions
namespace Bolt.Addons.Community.Variables.Editor.UnitOptions
{
[FuzzyOption(typeof(DecrementUnit))]
public class DecrementUnitOption : UnifiedVariableUnitOption<DecrementUnit>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Linq;
using System.Text;

namespace Bolt.Addons.Community.Variables.UnitOptions
namespace Bolt.Addons.Community.Variables.Editor.UnitOptions
{
[FuzzyOption(typeof(IncrementUnit))]
public class IncrementUnitOption : UnifiedVariableUnitOption<IncrementUnit>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Linq;
using System.Text;

namespace Bolt.Addons.Community.Variables.UnitOptions
namespace Bolt.Addons.Community.Variables.Editor.UnitOptions
{
[FuzzyOption(typeof(IncrementUnit))]
public class PlusEqualUnitOption : UnifiedVariableUnitOption<PlusEquals>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,15 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Bolt.Core.Editor">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Bolt.Core.Editor.dll</HintPath>
</Reference>
<Reference Include="Bolt.Core.Runtime">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Bolt.Core.Runtime.dll</HintPath>
</Reference>
<Reference Include="Bolt.Flow.Editor">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Bolt.Flow.Editor.dll</HintPath>
</Reference>
<Reference Include="Bolt.Flow.Runtime">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Bolt.Flow.Runtime.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Core.Editor">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Ludiq.Core.Editor.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Core.Runtime">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Ludiq.Core.Runtime.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Graphs.Editor">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Ludiq.Graphs.Editor.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Graphs.Runtime">
<HintPath>..\..\Dependencies\BoltBinaries\$(BoltVersion)\Ludiq.Graphs.Runtime.dll</HintPath>
</Reference>
Expand All @@ -86,12 +74,8 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="UnitOptions\PlusEqualUnitOption.cs" />
<Compile Include="Units\DecrementUnit.cs" />
<Compile Include="UnitOptions\DecrementUnitOption.cs" />
<Compile Include="Units\IncrementUnit.cs" />
<Compile Include="UnitOptions\IncrementUnitOption.cs" />
<Compile Include="Options.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Units\PlusEquals.cs" />
<Compile Include="Units\VariableAdder.cs" />
Expand Down
3 changes: 1 addition & 2 deletions src/Bolt.Addons.Community.Variables/Units/DecrementUnit.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Bolt.Addons.Community.Math.Custom_Units;
using Ludiq;
using Ludiq;
using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
10 changes: 10 additions & 0 deletions src/Bolt.Addons.Community.sln
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lasm.Core.Collections", "La
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bolt.Addons.Community.Variables", "Bolt.Addons.Community.Variables\Bolt.Addons.Community.Variables.csproj", "{2FD5F2B8-19B5-4778-B4CB-076A270BA7B7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bolt.Addons.Community.Variables.Editor", "Bolt.Addons.Community.Variables.Editor\Bolt.Addons.Community.Variables.Editor.csproj", "{94CCEA90-17E3-43A0-AC0B-BB9B76ECB133}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -148,6 +150,14 @@ Global
{2FD5F2B8-19B5-4778-B4CB-076A270BA7B7}.Release_1.3.0|Any CPU.Build.0 = Release_1.3.0|Any CPU
{2FD5F2B8-19B5-4778-B4CB-076A270BA7B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FD5F2B8-19B5-4778-B4CB-076A270BA7B7}.Release|Any CPU.Build.0 = Release|Any CPU
{94CCEA90-17E3-43A0-AC0B-BB9B76ECB133}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{94CCEA90-17E3-43A0-AC0B-BB9B76ECB133}.Debug|Any CPU.Build.0 = Debug|Any CPU
{94CCEA90-17E3-43A0-AC0B-BB9B76ECB133}.Release_1.2.3|Any CPU.ActiveCfg = Release|Any CPU
{94CCEA90-17E3-43A0-AC0B-BB9B76ECB133}.Release_1.2.3|Any CPU.Build.0 = Release|Any CPU
{94CCEA90-17E3-43A0-AC0B-BB9B76ECB133}.Release_1.3.0|Any CPU.ActiveCfg = Release_1.3.0|Any CPU
{94CCEA90-17E3-43A0-AC0B-BB9B76ECB133}.Release_1.3.0|Any CPU.Build.0 = Release_1.3.0|Any CPU
{94CCEA90-17E3-43A0-AC0B-BB9B76ECB133}.Release|Any CPU.ActiveCfg = Release|Any CPU
{94CCEA90-17E3-43A0-AC0B-BB9B76ECB133}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit ef095d7

Please sign in to comment.