Skip to content

Commit

Permalink
Merge branch '2.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
RealityStop committed Jan 25, 2019
2 parents f04b409 + 24210ee commit 52a4e44
Show file tree
Hide file tree
Showing 32 changed files with 1,237 additions and 367 deletions.
34 changes: 19 additions & 15 deletions src/Bolt.Addons.Community.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2027
Expand All @@ -7,11 +6,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Downloader", "Downloader",
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Legacy", "Legacy", "{0F6B5AB0-D090-41AF-9266-29998CC557E7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bolt.Addons.Community.Events.Editor", "Events\Editor\Bolt.Addons.Community.Events.Editor.csproj", "{A48FB4F2-A962-4628-8F1E-35191B078F43}"
ProjectSection(ProjectDependencies) = postProject
{33411767-CA47-4D3B-A82C-D77AB4C5FA97} = {33411767-CA47-4D3B-A82C-D77AB4C5FA97}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Fundamentals", "Fundamentals", "{F1756C9F-2895-479E-811A-6E7AA3086E57}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bolt.Addons.Community.Logic", "Legacy\Bolt.Addons.Community.Logic.csproj", "{63E0BE87-2979-4275-A37E-B7F8CBD365F9}"
Expand Down Expand Up @@ -41,6 +35,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bolt.Addons.Community.Utili
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bolt.Addons.Community.Utility.Editor", "Utility\Bolt.Addons.Community.Utility.Editor.csproj", "{FCADD801-FF9E-46E5-A573-E06FA0C8661B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bolt.Addons.Community.Events.Editor", "Events\Bolt.Addons.Community.Events.Editor.csproj", "{358C5D0B-573F-4DE3-A00A-1429C9D5ED00}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -49,10 +45,6 @@ Global
Release4.6|Any CPU = Release4.6|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A48FB4F2-A962-4628-8F1E-35191B078F43}.Debug|Any CPU.ActiveCfg = Release|Any CPU
{A48FB4F2-A962-4628-8F1E-35191B078F43}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A48FB4F2-A962-4628-8F1E-35191B078F43}.Release3.5|Any CPU.ActiveCfg = Release|Any CPU
{A48FB4F2-A962-4628-8F1E-35191B078F43}.Release4.6|Any CPU.ActiveCfg = Release|Any CPU
{63E0BE87-2979-4275-A37E-B7F8CBD365F9}.Debug|Any CPU.ActiveCfg = Release4.6|Any CPU
{63E0BE87-2979-4275-A37E-B7F8CBD365F9}.Debug|Any CPU.Build.0 = Release4.6|Any CPU
{63E0BE87-2979-4275-A37E-B7F8CBD365F9}.Release|Any CPU.ActiveCfg = Release4.6|Any CPU
Expand Down Expand Up @@ -101,10 +93,14 @@ Global
{3CE813EF-2925-41C5-B8BA-D8F2BE90058B}.Release3.5|Any CPU.Build.0 = Release3.5|Any CPU
{3CE813EF-2925-41C5-B8BA-D8F2BE90058B}.Release4.6|Any CPU.ActiveCfg = Release4.6|Any CPU
{3CE813EF-2925-41C5-B8BA-D8F2BE90058B}.Release4.6|Any CPU.Build.0 = Release4.6|Any CPU
{33411767-CA47-4D3B-A82C-D77AB4C5FA97}.Debug|Any CPU.ActiveCfg = Release|Any CPU
{33411767-CA47-4D3B-A82C-D77AB4C5FA97}.Release|Any CPU.ActiveCfg = Release|Any CPU
{33411767-CA47-4D3B-A82C-D77AB4C5FA97}.Release3.5|Any CPU.ActiveCfg = Release|Any CPU
{33411767-CA47-4D3B-A82C-D77AB4C5FA97}.Release4.6|Any CPU.ActiveCfg = Release|Any CPU
{33411767-CA47-4D3B-A82C-D77AB4C5FA97}.Debug|Any CPU.ActiveCfg = Release3.5|Any CPU
{33411767-CA47-4D3B-A82C-D77AB4C5FA97}.Debug|Any CPU.Build.0 = Release3.5|Any CPU
{33411767-CA47-4D3B-A82C-D77AB4C5FA97}.Release|Any CPU.ActiveCfg = Release3.5|Any CPU
{33411767-CA47-4D3B-A82C-D77AB4C5FA97}.Release|Any CPU.Build.0 = Release3.5|Any CPU
{33411767-CA47-4D3B-A82C-D77AB4C5FA97}.Release3.5|Any CPU.ActiveCfg = Release3.5|Any CPU
{33411767-CA47-4D3B-A82C-D77AB4C5FA97}.Release3.5|Any CPU.Build.0 = Release3.5|Any CPU
{33411767-CA47-4D3B-A82C-D77AB4C5FA97}.Release4.6|Any CPU.ActiveCfg = Release4.6|Any CPU
{33411767-CA47-4D3B-A82C-D77AB4C5FA97}.Release4.6|Any CPU.Build.0 = Release4.6|Any CPU
{A2FDB1FB-E259-45C0-B46A-4E416110BBB3}.Debug|Any CPU.ActiveCfg = Release3.5|Any CPU
{A2FDB1FB-E259-45C0-B46A-4E416110BBB3}.Debug|Any CPU.Build.0 = Release3.5|Any CPU
{A2FDB1FB-E259-45C0-B46A-4E416110BBB3}.Release|Any CPU.ActiveCfg = Release3.5|Any CPU
Expand All @@ -121,12 +117,19 @@ Global
{FCADD801-FF9E-46E5-A573-E06FA0C8661B}.Release3.5|Any CPU.Build.0 = Release3.5|Any CPU
{FCADD801-FF9E-46E5-A573-E06FA0C8661B}.Release4.6|Any CPU.ActiveCfg = Release4.6|Any CPU
{FCADD801-FF9E-46E5-A573-E06FA0C8661B}.Release4.6|Any CPU.Build.0 = Release4.6|Any CPU
{358C5D0B-573F-4DE3-A00A-1429C9D5ED00}.Debug|Any CPU.ActiveCfg = Release3.5|Any CPU
{358C5D0B-573F-4DE3-A00A-1429C9D5ED00}.Debug|Any CPU.Build.0 = Release3.5|Any CPU
{358C5D0B-573F-4DE3-A00A-1429C9D5ED00}.Release|Any CPU.ActiveCfg = Release3.5|Any CPU
{358C5D0B-573F-4DE3-A00A-1429C9D5ED00}.Release|Any CPU.Build.0 = Release3.5|Any CPU
{358C5D0B-573F-4DE3-A00A-1429C9D5ED00}.Release3.5|Any CPU.ActiveCfg = Release3.5|Any CPU
{358C5D0B-573F-4DE3-A00A-1429C9D5ED00}.Release3.5|Any CPU.Build.0 = Release3.5|Any CPU
{358C5D0B-573F-4DE3-A00A-1429C9D5ED00}.Release4.6|Any CPU.ActiveCfg = Release4.6|Any CPU
{358C5D0B-573F-4DE3-A00A-1429C9D5ED00}.Release4.6|Any CPU.Build.0 = Release4.6|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{A48FB4F2-A962-4628-8F1E-35191B078F43} = {7D856461-F36E-4843-AA41-C908A2FA7E2C}
{63E0BE87-2979-4275-A37E-B7F8CBD365F9} = {0F6B5AB0-D090-41AF-9266-29998CC557E7}
{A92A0A22-56D4-4B8A-9623-913B6846A106} = {0F6B5AB0-D090-41AF-9266-29998CC557E7}
{5E5C0512-81BC-4C47-878C-89F723D1A589} = {0F6B5AB0-D090-41AF-9266-29998CC557E7}
Expand All @@ -136,6 +139,7 @@ Global
{33411767-CA47-4D3B-A82C-D77AB4C5FA97} = {7D856461-F36E-4843-AA41-C908A2FA7E2C}
{A2FDB1FB-E259-45C0-B46A-4E416110BBB3} = {4C7742BC-F6EB-463D-BB44-2783BEC16520}
{FCADD801-FF9E-46E5-A573-E06FA0C8661B} = {4C7742BC-F6EB-463D-BB44-2783BEC16520}
{358C5D0B-573F-4DE3-A00A-1429C9D5ED00} = {7D856461-F36E-4843-AA41-C908A2FA7E2C}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {FBD3EB6F-0BDA-4218-8D0C-0756C8AFE605}
Expand Down
2 changes: 1 addition & 1 deletion src/Bolt.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BoltVersion>1.4.0</BoltVersion>
<BoltVersion>1.4.1</BoltVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release4.6'">
<TargetFrameworkVersionNumber>4.6</TargetFrameworkVersionNumber>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,67 +4,66 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{A48FB4F2-A962-4628-8F1E-35191B078F43}</ProjectGuid>
<ProjectGuid>{358C5D0B-573F-4DE3-A00A-1429C9D5ED00}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Bolt.Addons.Community.Events.Editor</RootNamespace>
<AssemblyName>Bolt.Addons.Community.Events.Editor</AssemblyName>
<RootNamespace>Bolt.Addons.Community.DefinedEvents.Editor</RootNamespace>
<AssemblyName>Bolt.Addons.Community.DefinedEvents.Editor</AssemblyName>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<Import Project="$(SolutionDir)\Bolt.targets" />
<ItemGroup>
<Reference Include="Bolt.Core.Editor">
<HintPath>$(SolutionDir)\..\Dependencies\\BoltBinaries\$(BoltVersion)\.NET$(TargetFrameworkVersionNumber)\Bolt.Core.Editor.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Bolt.Core.Runtime">
<HintPath>$(SolutionDir)\..\Dependencies\\BoltBinaries\$(BoltVersion)\.NET$(TargetFrameworkVersionNumber)\Bolt.Core.Runtime.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Bolt.Flow.Runtime">
<HintPath>$(SolutionDir)\..\Dependencies\\BoltBinaries\$(BoltVersion)\.NET$(TargetFrameworkVersionNumber)\Bolt.Flow.Runtime.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Core.Runtime">
<HintPath>$(SolutionDir)\..\Dependencies\\BoltBinaries\$(BoltVersion)\.NET$(TargetFrameworkVersionNumber)\Ludiq.Core.Runtime.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Graphs.Runtime">
<HintPath>$(SolutionDir)\..\Dependencies\\BoltBinaries\$(BoltVersion)\.NET$(TargetFrameworkVersionNumber)\Ludiq.Graphs.Runtime.dll</HintPath>
</Reference>
<Reference Include="Bolt.Core.Editor">
<HintPath>$(SolutionDir)\..\Dependencies\\BoltBinaries\$(BoltVersion)\.NET$(TargetFrameworkVersionNumber)\Bolt.Core.Editor.dll</HintPath>
</Reference>
<Reference Include="Bolt.Flow.Editor">
<HintPath>$(SolutionDir)\..\Dependencies\\BoltBinaries\$(BoltVersion)\.NET$(TargetFrameworkVersionNumber)\Bolt.Flow.Editor.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Bolt.Flow.Runtime">
<HintPath>$(SolutionDir)\..\Dependencies\\BoltBinaries\$(BoltVersion)\.NET$(TargetFrameworkVersionNumber)\Bolt.Flow.Runtime.dll</HintPath>
<Private>False</Private>
<Reference Include="Bolt.State.Editor">
<HintPath>$(SolutionDir)\..\Dependencies\\BoltBinaries\$(BoltVersion)\.NET$(TargetFrameworkVersionNumber)\Bolt.State.Editor.dll</HintPath>
</Reference>
<Reference Include="Ludiq.Core.Editor">
<HintPath>$(SolutionDir)\..\Dependencies\\BoltBinaries\$(BoltVersion)\.NET$(TargetFrameworkVersionNumber)\Ludiq.Core.Editor.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Ludiq.Core.Runtime">
<HintPath>$(SolutionDir)\..\Dependencies\\BoltBinaries\$(BoltVersion)\.NET$(TargetFrameworkVersionNumber)\Ludiq.Core.Runtime.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Ludiq.Graphs.Editor">
<HintPath>$(SolutionDir)\..\Dependencies\\BoltBinaries\$(BoltVersion)\.NET$(TargetFrameworkVersionNumber)\Ludiq.Graphs.Editor.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Ludiq.Graphs.Runtime">
<HintPath>$(SolutionDir)\..\Dependencies\\BoltBinaries\$(BoltVersion)\.NET$(TargetFrameworkVersionNumber)\Ludiq.Graphs.Runtime.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="UnityEditor">
<HintPath>$(SolutionDir)\..\Dependencies\\UnityBinaries\UnityEditor.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Core" />
<Reference Include="UnityEngine">
<HintPath>$(SolutionDir)\..\Dependencies\\UnityBinaries\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>$(SolutionDir)\..\Dependencies\\UnityBinaries\UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>$(SolutionDir)\..\Dependencies\\UnityBinaries\UnityEditor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Inspectors\DefinedEventInspector.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TriggerReturnEventDescriptor.cs" />
<Compile Include="TriggerReturnEventWidget.cs" />
<Compile Include="Widgets\DefinedEventWidget.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Bolt.Addons.Community.Events.csproj">
<ProjectReference Include="Bolt.Addons.Community.Events.csproj">
<Project>{33411767-ca47-4d3b-a82c-d77ab4c5fa97}</Project>
<Name>Bolt.Addons.Community.Events</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\Bolt.PostBuild.targets" />
</Project>
23 changes: 18 additions & 5 deletions src/Events/Bolt.Addons.Community.Events.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ProjectGuid>{33411767-CA47-4D3B-A82C-D77AB4C5FA97}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Bolt.Addons.Community.Events</RootNamespace>
<AssemblyName>Bolt.Addons.Community.Events</AssemblyName>
<RootNamespace>Bolt.Addons.Community.DefinedEvents</RootNamespace>
<AssemblyName>Bolt.Addons.Community.DefinedEvents</AssemblyName>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<Import Project="$(SolutionDir)\Bolt.targets" />
Expand Down Expand Up @@ -40,10 +40,23 @@
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="IDefinedEvent.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Return.cs" />
<Compile Include="ReturnEvent.cs" />
<Compile Include="TriggerReturnEvent.cs" />
<Compile Include="Support\DefinedEventSupport.cs" />
<Compile Include="Support\Internal\IDefinedEventTriggerUnit.cs" />
<Compile Include="Support\ReflectedInfo.cs" />
<Compile Include="Support\Internal\IDefinedEventUnit.cs" />
<Compile Include="Units\TriggerGlobalDefinedEvent.cs" />
<Compile Include="Units\TriggerDefinedEvent.cs" />
<Compile Include="Units\GlobalDefinedEvent.cs" />
<Compile Include="Support\DefinedEventArgs.cs" />
<Compile Include="Units\DefinedEvent.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Fundamentals\Bolt.Addons.Community.Fundamentals.csproj">
<Project>{c7fa2fb0-acd3-4957-a653-979afadc3145}</Project>
<Name>Bolt.Addons.Community.Fundamentals</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\Bolt.PostBuild.targets" />
Expand Down
36 changes: 0 additions & 36 deletions src/Events/Editor/Properties/AssemblyInfo.cs

This file was deleted.

15 changes: 0 additions & 15 deletions src/Events/Editor/TriggerReturnEventDescriptor.cs

This file was deleted.

26 changes: 0 additions & 26 deletions src/Events/Editor/TriggerReturnEventWidget.cs

This file was deleted.

12 changes: 12 additions & 0 deletions src/Events/IDefinedEvent.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Bolt.Addons.Community.DefinedEvents
{
public interface IDefinedEvent
{
}
}
40 changes: 40 additions & 0 deletions src/Events/Inspectors/DefinedEventInspector.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using Bolt.Addons.Community.DefinedEvents.Units;
using Ludiq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using UnityEngine;


namespace Ludiq
{
//[Inspector(typeof(TargettedDefinedEvent))]
//public class DefinedEventInspector : ReflectedInspector
//{
// public DefinedEventInspector(Metadata metadata) : base(metadata)
// {
// Debug.Log($"hi");
// }

// protected override bool Include(MemberInfo m)
// {

// if (m.Name == "eventType")
// {
// return true;
// //return (bool)metadata["IsNotRestricted"].value;
// }


// if (m.Name == "restrictedEventType")
// {
// return true;
// //return (bool)metadata["IsRestricted"].value;
// }

// return base.Include(m);
// }
//}
}
36 changes: 0 additions & 36 deletions src/Events/Return.cs

This file was deleted.

Loading

0 comments on commit 52a4e44

Please sign in to comment.