Skip to content

Commit

Permalink
Merge pull request watplugin#348 from Atlinx/master
Browse files Browse the repository at this point in the history
Add support for non-EventHandler based UntilEvent
  • Loading branch information
AlexDarigan authored Aug 13, 2022
2 parents c82496a + cb1b54c commit 455aaba
Show file tree
Hide file tree
Showing 12 changed files with 992 additions and 694 deletions.
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,11 @@ export_presets.cfg
data_*/

# Rider
.idea/
.idea/

# Visual Studio
.vs/

# Stub project
bin/
obj/
33 changes: 33 additions & 0 deletions StubProj/StubProj.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?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>{B27D149D-06FF-49F6-AF29-5802B9F4612C}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>StubProj</RootNamespace>
<AssemblyName>StubProj</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<ProjectTypeGuids>{8F3E2DF0-C35C-4265-82FC-BEA011F4A7ED};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\*.csproj">
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
34 changes: 28 additions & 6 deletions WAT5.sln
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WAT5", "WAT5.csproj", "{B55F6E5A-5EB7-49EC-AD95-87173756E436}"

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.32630.194
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WAT5", "WAT5.csproj", "{B55F6E5A-5EB7-49EC-AD95-87173756E436}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StubProj", "StubProj\StubProj.csproj", "{B27D149D-06FF-49F6-AF29-5802B9F4612C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
ExportDebug|Any CPU = ExportDebug|Any CPU
ExportRelease|Any CPU = ExportRelease|Any CPU
Debug|Any CPU = Debug|Any CPU
ExportDebug|Any CPU = ExportDebug|Any CPU
ExportRelease|Any CPU = ExportRelease|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B55F6E5A-5EB7-49EC-AD95-87173756E436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand All @@ -15,5 +21,21 @@ Global
{B55F6E5A-5EB7-49EC-AD95-87173756E436}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU
{B55F6E5A-5EB7-49EC-AD95-87173756E436}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU
{B55F6E5A-5EB7-49EC-AD95-87173756E436}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU
{B55F6E5A-5EB7-49EC-AD95-87173756E436}.Release|Any CPU.ActiveCfg = ExportRelease|Any CPU
{B55F6E5A-5EB7-49EC-AD95-87173756E436}.Release|Any CPU.Build.0 = ExportRelease|Any CPU
{B27D149D-06FF-49F6-AF29-5802B9F4612C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B27D149D-06FF-49F6-AF29-5802B9F4612C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B27D149D-06FF-49F6-AF29-5802B9F4612C}.ExportDebug|Any CPU.ActiveCfg = Debug|Any CPU
{B27D149D-06FF-49F6-AF29-5802B9F4612C}.ExportDebug|Any CPU.Build.0 = Debug|Any CPU
{B27D149D-06FF-49F6-AF29-5802B9F4612C}.ExportRelease|Any CPU.ActiveCfg = Release|Any CPU
{B27D149D-06FF-49F6-AF29-5802B9F4612C}.ExportRelease|Any CPU.Build.0 = Release|Any CPU
{B27D149D-06FF-49F6-AF29-5802B9F4612C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B27D149D-06FF-49F6-AF29-5802B9F4612C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {74D438C1-B368-4FC4-8414-6AD674386052}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion addons/WAT/double/script_director.gd
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func add_call(method: String, args: Array = []) -> void:
methods[method].add_call(args)

func set_methods() -> void:
var params: String = "abcdefghij"
var params: String = "abcdefghijklmnopqrstuvwxyz"
for m in method_list():
var arguments: String = ""
# m.args.size() causes crashes in release exports
Expand Down
5 changes: 1 addition & 4 deletions addons/WAT/gui.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ anchor_bottom = 1.0
size_flags_horizontal = 3
size_flags_vertical = 3
script = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}

[node name="Core" type="VBoxContainer" parent="."]
margin_left = 7.0
Expand Down Expand Up @@ -162,7 +159,7 @@ rect_min_size = Vector2( 160, 0 )
size_flags_horizontal = 0
size_flags_vertical = 0
min_value = 1.0
max_value = 7.0
max_value = 15.0
value = 1.0
align = 1
prefix = "Run on"
Expand Down
Loading

0 comments on commit 455aaba

Please sign in to comment.