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

Fix to ultra rare condition #3

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
33 changes: 33 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/Assets/AssetStoreTools*
/.vs/

# Autogenerated VS/MD solution and project files
ExportedObj/
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.mdb


# Unity3D generated meta files
*.pidb.meta

# Unity3D Generated File On Crash Reports
sysinfo.txt

*.csproj
/Assets/Generated.meta
Assets/Generated
Gen

25 changes: 12 additions & 13 deletions Assembly-CSharp-Editor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<RootNamespace></RootNamespace>
<ProjectGuid>{B0B159E3-61AE-D92A-BF09-400B19A7F7A1}</ProjectGuid>
<ProjectGuid>{303D1F19-F9C2-1FC0-CC1E-CFA907ED5D32}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>Assembly-CSharp-Editor</AssemblyName>
Expand Down Expand Up @@ -53,6 +53,8 @@
<ItemGroup>
<Compile Include="Assets\Editor\Scripts\AssetBundler.cs" />
<Compile Include="Assets\Editor\Scripts\EdgeworkConfigurationEditor.cs" />
<Compile Include="Assets\Editor\Scripts\KMModuleEditor.cs" />
<Compile Include="Assets\Editor\Scripts\Missions\DMGMissionLoader.cs" />
<Compile Include="Assets\Editor\Scripts\Missions\KMMissionEditor.cs" />
<Compile Include="Assets\Editor\Scripts\Missions\KMMissionTableOfContentsEditor.cs" />
<Compile Include="Assets\Editor\Scripts\Missions\TableOfContentsSectionList.cs" />
Expand Down Expand Up @@ -340,37 +342,34 @@
<Reference Include="UnityEditor.WindowsStandalone.Extensions">
<HintPath>C:/Program Files/Unity/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.OSXStandalone.Extensions">
<HintPath>C:/Program Files/Unity/Editor/Data/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll</HintPath>
</Reference>
<Reference Include="KMFramework">
<HintPath>D:/Documents/Unity Projects/BurgerAlarmModule/Assets/Plugins/Managed/KMFramework.dll</HintPath>
<HintPath>C:/Users/Quinn/Desktop/KTaNE Mods/Modules/EpicToast/Burger Alarm/Assets/Plugins/Managed/KMFramework.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>D:/Documents/Unity Projects/BurgerAlarmModule/Assets/Plugins/Managed/Newtonsoft.Json.dll</HintPath>
<HintPath>C:/Users/Quinn/Desktop/KTaNE Mods/Modules/EpicToast/Burger Alarm/Assets/Plugins/Managed/Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Advertisements">
<HintPath>C:/Users/Brendan/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/Editor/UnityEditor.Advertisements.dll</HintPath>
<HintPath>C:/Users/Quinn/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/Editor/UnityEditor.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>C:/Users/Brendan/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Analytics.dll</HintPath>
<HintPath>C:/Users/Quinn/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Analytics">
<HintPath>C:/Users/Brendan/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/Editor/UnityEditor.Analytics.dll</HintPath>
<HintPath>C:/Users/Quinn/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/Editor/UnityEditor.Analytics.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Purchasing">
<HintPath>C:/Users/Brendan/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Purchasing.dll</HintPath>
<HintPath>C:/Users/Quinn/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Purchasing.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Purchasing">
<HintPath>C:/Users/Brendan/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/Editor/UnityEditor.Purchasing.dll</HintPath>
<HintPath>C:/Users/Quinn/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/Editor/UnityEditor.Purchasing.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.StandardEvents">
<HintPath>C:/Users/Brendan/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.StandardEvents.dll</HintPath>
<HintPath>C:/Users/Quinn/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.StandardEvents.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="Assembly-CSharp.csproj">
<Project>{A961C9F0-18DD-2B45-5A09-FAA9FE279EE6}</Project> <Name>Assembly-CSharp</Name> </ProjectReference>
<Project>{34F294BA-E0C1-48D9-46DB-7654BC093D43}</Project> <Name>Assembly-CSharp</Name> </ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
60 changes: 28 additions & 32 deletions Assembly-CSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<RootNamespace></RootNamespace>
<ProjectGuid>{A961C9F0-18DD-2B45-5A09-FAA9FE279EE6}</ProjectGuid>
<ProjectGuid>{34F294BA-E0C1-48D9-46DB-7654BC093D43}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>Assembly-CSharp</AssemblyName>
Expand Down Expand Up @@ -52,21 +52,17 @@
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\burgerAlarmScript.cs" />
<Compile Include="Assets\Examples\1.1 Module\ExampleModule.cs" />
<Compile Include="Assets\Examples\1.10 NeedyModule\ExampleNeedyModule.cs" />
<Compile Include="Assets\Examples\1.12 Holdable\BombCreatorExample.cs" />
<Compile Include="Assets\Examples\1.13 GameEffectsPlayer\GameEffectPlayer.cs" />
<Compile Include="Assets\Examples\1.2 Module2\ExampleModule2.cs" />
<Compile Include="Assets\Examples\1.3 GameplayRoom\ExampleGameplayRoom.cs" />
<Compile Include="Assets\Examples\1.5 WebService\ExampleWebService.cs" />
<Compile Include="Assets\Examples\1.8 Button Masher Module\ButtonMasherModule.cs" />
<Compile Include="Assets\Examples\1.9 Widget\ExampleWidget.cs" />
<Compile Include="Assets\Examples\Assets\Scripts\KMBombInfoExtensions.cs" />
<Compile Include="Assets\Examples\Assets\Scripts\KMColorblindMode.cs" />
<Compile Include="Assets\Examples\Assets\Scripts\KMRuleSeedable.cs" />
<Compile Include="Assets\Examples\Assets\Scripts\PrivateWhenPlayingAttribute.cs" />
<Compile Include="Assets\Examples\Assets\Scripts\ReadOnlyWhenPlayingAttribute.cs" />
<Compile Include="Assets\GeneralExtensions.cs" />
<Compile Include="Assets\KMScripts\Easing.cs" />
<Compile Include="Assets\KMScripts\GameFixes.cs" />
<Compile Include="Assets\KMScripts\GeneralExtensions.cs" />
<Compile Include="Assets\KMScripts\KMBombInfoExtensions.cs" />
<Compile Include="Assets\KMScripts\KMBossModule.cs" />
<Compile Include="Assets\KMScripts\KMColorblindMode.cs" />
<Compile Include="Assets\KMScripts\KMNeedyModuleExtensions.cs" />
<Compile Include="Assets\KMScripts\KMRuleSeedable.cs" />
<Compile Include="Assets\KMScripts\PrivateWhenPlayingAttribute.cs" />
<Compile Include="Assets\KMScripts\ReadOnlyWhenPlayingAttribute.cs" />
<Compile Include="Assets\KMScripts\ReflectionHelper.cs" />
<Compile Include="Assets\TestHarness\EdgeworkConfiguration.cs" />
<Compile Include="Assets\TestHarness\NeedyTimer.cs" />
<Compile Include="Assets\TestHarness\SevenSegDisplay.cs" />
Expand All @@ -86,19 +82,19 @@
<Compile Include="Assets\TestHarness\Widgets\SerialNumber.cs" />
<Compile Include="Assets\TestHarness\Widgets\TwoFactorWidget.cs" />
<Compile Include="Assets\TestHarness\Widgets\Widget.cs" />
<None Include="Assets\Examples\Assets\Shaders\KT_3D_Text-Diffuse.shader" />
<None Include="Assets\Examples\Assets\Shaders\BlendTwoTexturesUnlit.shader" />
<None Include="Assets\Examples\Assets\Shaders\BlendTwoTexturesLitAndUnlitVertexColor.shader" />
<None Include="Assets\Examples\Assets\Shaders\KT_Mobile-Diffuse.shader" />
<None Include="Assets\Examples\Assets\Shaders\KT_3D_Text.shader" />
<None Include="Assets\TestHarness\Outline.shader" />
<None Include="Assets\Examples\Assets\Shaders\MobileTransparentDiffuseUnderlay.shader" />
<None Include="Assets\Shaders\KT_3D_Text-Diffuse.shader" />
<None Include="Assets\Shaders\BlendTwoTexturesUnlit.shader" />
<None Include="Assets\Shaders\BlendTwoTexturesLitAndUnlitVertexColor.shader" />
<None Include="Assets\Shaders\KT_Mobile-Diffuse.shader" />
<None Include="Assets\Shaders\KT_3D_Text.shader" />
<None Include="Assets\TestHarness\Shaders\Outline.shader" />
<None Include="Assets\Shaders\MobileTransparentDiffuseUnderlay.shader" />
<None Include="Assets\TestHarness\_THIS_FOLDER_IS_EXCLUDED_FROM_BUNDLES.txt" />
<None Include="Assets\TestHarness\Widgets\Shaders\3DText.shader" />
<None Include="Assets\Examples\Assets\Shaders\UnlitTransparentVertexColorUnderlay.shader" />
<None Include="Assets\Examples\Assets\Shaders\KT_Mobile-Diffuse-tint.shader" />
<None Include="Assets\Examples\Assets\Shaders\UnlitTexturedLightmap.shader" />
<None Include="Assets\Examples\Assets\Shaders\BlendTwoTexturesLitAndUnlit.shader" />
<None Include="Assets\Shaders\UnlitTransparentVertexColorUnderlay.shader" />
<None Include="Assets\Shaders\KT_Mobile-Diffuse-tint.shader" />
<None Include="Assets\Shaders\UnlitTexturedLightmap.shader" />
<None Include="Assets\Shaders\BlendTwoTexturesLitAndUnlit.shader" />
<Reference Include="UnityEngine.CoreModule">
<HintPath>C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -265,19 +261,19 @@
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll</HintPath>
</Reference>
<Reference Include="KMFramework">
<HintPath>D:/Documents/Unity Projects/BurgerAlarmModule/Assets/Plugins/Managed/KMFramework.dll</HintPath>
<HintPath>C:/Users/Quinn/Desktop/KTaNE Mods/Modules/EpicToast/Burger Alarm/Assets/Plugins/Managed/KMFramework.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>D:/Documents/Unity Projects/BurgerAlarmModule/Assets/Plugins/Managed/Newtonsoft.Json.dll</HintPath>
<HintPath>C:/Users/Quinn/Desktop/KTaNE Mods/Modules/EpicToast/Burger Alarm/Assets/Plugins/Managed/Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>C:/Users/Brendan/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Analytics.dll</HintPath>
<HintPath>C:/Users/Quinn/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Purchasing">
<HintPath>C:/Users/Brendan/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Purchasing.dll</HintPath>
<HintPath>C:/Users/Quinn/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Purchasing.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.StandardEvents">
<HintPath>C:/Users/Brendan/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.StandardEvents.dll</HintPath>
<HintPath>C:/Users/Quinn/AppData/Local/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.StandardEvents.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
Loading