Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
This commit is contained in:
@@ -44,7 +44,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LinuxTest", "Barotrauma\Bar
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoonSharp.Interpreter", "Libraries\moonsharp\MoonSharp.Interpreter\MoonSharp.Interpreter.csproj", "{382DFA63-78FC-41AC-BA85-630960A56E5C}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeployAll", "Deploy\DeployAll\DeployAll.csproj", "{60B82E13-2CDD-4C74-8373-FD7264D6C80B}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployAll", "Deploy\DeployAll\DeployAll.csproj", "{60B82E13-2CDD-4C74-8373-FD7264D6C80B}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BarotraumaLibs", "BarotraumaLibs", "{E63B6919-54B8-40BA-8FFF-FCCB9642358A}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BarotraumaCore", "Libraries\BarotraumaLibs\BarotraumaCore\BarotraumaCore.csproj", "{A1686660-B920-407C-BBB9-C9C49543FBDD}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EosInterface", "Libraries\BarotraumaLibs\EosInterface\EosInterface.csproj", "{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EosInterface.Implementation.Linux", "Libraries\BarotraumaLibs\EosInterfacePrivate\EosInterface.Implementation.Linux.csproj", "{4C00CD9A-4241-43E4-BB62-9356324FE81C}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MoonSharp.VsCodeDebugger", "Libraries\moonsharp\MoonSharp.VsCodeDebugger\MoonSharp.VsCodeDebugger.csproj", "{877AD4B3-9E28-4857-8832-AEBB2B2F7B5C}"
|
||||
EndProject
|
||||
@@ -226,18 +234,42 @@ Global
|
||||
{60B82E13-2CDD-4C74-8373-FD7264D6C80B}.Unstable|Any CPU.Build.0 = Debug|Any CPU
|
||||
{60B82E13-2CDD-4C74-8373-FD7264D6C80B}.Unstable|x64.ActiveCfg = Debug|Any CPU
|
||||
{60B82E13-2CDD-4C74-8373-FD7264D6C80B}.Unstable|x64.Build.0 = Debug|Any CPU
|
||||
{877AD4B3-9E28-4857-8832-AEBB2B2F7B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{877AD4B3-9E28-4857-8832-AEBB2B2F7B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{877AD4B3-9E28-4857-8832-AEBB2B2F7B5C}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{877AD4B3-9E28-4857-8832-AEBB2B2F7B5C}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{877AD4B3-9E28-4857-8832-AEBB2B2F7B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{877AD4B3-9E28-4857-8832-AEBB2B2F7B5C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{877AD4B3-9E28-4857-8832-AEBB2B2F7B5C}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{877AD4B3-9E28-4857-8832-AEBB2B2F7B5C}.Release|x64.Build.0 = Release|Any CPU
|
||||
{877AD4B3-9E28-4857-8832-AEBB2B2F7B5C}.Unstable|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{877AD4B3-9E28-4857-8832-AEBB2B2F7B5C}.Unstable|Any CPU.Build.0 = Debug|Any CPU
|
||||
{877AD4B3-9E28-4857-8832-AEBB2B2F7B5C}.Unstable|x64.ActiveCfg = Debug|Any CPU
|
||||
{877AD4B3-9E28-4857-8832-AEBB2B2F7B5C}.Unstable|x64.Build.0 = Debug|Any CPU
|
||||
{A1686660-B920-407C-BBB9-C9C49543FBDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A1686660-B920-407C-BBB9-C9C49543FBDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A1686660-B920-407C-BBB9-C9C49543FBDD}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{A1686660-B920-407C-BBB9-C9C49543FBDD}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{A1686660-B920-407C-BBB9-C9C49543FBDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{A1686660-B920-407C-BBB9-C9C49543FBDD}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{A1686660-B920-407C-BBB9-C9C49543FBDD}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{A1686660-B920-407C-BBB9-C9C49543FBDD}.Release|x64.Build.0 = Release|Any CPU
|
||||
{A1686660-B920-407C-BBB9-C9C49543FBDD}.Unstable|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A1686660-B920-407C-BBB9-C9C49543FBDD}.Unstable|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A1686660-B920-407C-BBB9-C9C49543FBDD}.Unstable|x64.ActiveCfg = Debug|Any CPU
|
||||
{A1686660-B920-407C-BBB9-C9C49543FBDD}.Unstable|x64.Build.0 = Debug|Any CPU
|
||||
{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA}.Release|x64.Build.0 = Release|Any CPU
|
||||
{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA}.Unstable|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA}.Unstable|Any CPU.Build.0 = Debug|Any CPU
|
||||
{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA}.Unstable|x64.ActiveCfg = Debug|Any CPU
|
||||
{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA}.Unstable|x64.Build.0 = Debug|Any CPU
|
||||
{4C00CD9A-4241-43E4-BB62-9356324FE81C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4C00CD9A-4241-43E4-BB62-9356324FE81C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4C00CD9A-4241-43E4-BB62-9356324FE81C}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{4C00CD9A-4241-43E4-BB62-9356324FE81C}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{4C00CD9A-4241-43E4-BB62-9356324FE81C}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{4C00CD9A-4241-43E4-BB62-9356324FE81C}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{4C00CD9A-4241-43E4-BB62-9356324FE81C}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{4C00CD9A-4241-43E4-BB62-9356324FE81C}.Release|x64.Build.0 = Release|Any CPU
|
||||
{4C00CD9A-4241-43E4-BB62-9356324FE81C}.Unstable|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{4C00CD9A-4241-43E4-BB62-9356324FE81C}.Unstable|Any CPU.Build.0 = Debug|Any CPU
|
||||
{4C00CD9A-4241-43E4-BB62-9356324FE81C}.Unstable|x64.ActiveCfg = Debug|Any CPU
|
||||
{4C00CD9A-4241-43E4-BB62-9356324FE81C}.Unstable|x64.Build.0 = Debug|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -257,6 +289,10 @@ Global
|
||||
{33E95A21-E071-4432-819F-AA64CF3EF3F1} = {DE36F45F-F09E-4719-B953-00D148F7722A}
|
||||
{F1B80D94-8BD6-48CE-8D17-BB2A5C98BCA3} = {68B18BE6-9EE0-49DA-AE3A-4C7326F768F9}
|
||||
{60B82E13-2CDD-4C74-8373-FD7264D6C80B} = {F35DF9BF-0BED-4FEF-A51C-DD83C531882F}
|
||||
{E63B6919-54B8-40BA-8FFF-FCCB9642358A} = {DE36F45F-F09E-4719-B953-00D148F7722A}
|
||||
{A1686660-B920-407C-BBB9-C9C49543FBDD} = {E63B6919-54B8-40BA-8FFF-FCCB9642358A}
|
||||
{AA83FAA6-12EF-4EC8-A10C-CF92C78706CA} = {E63B6919-54B8-40BA-8FFF-FCCB9642358A}
|
||||
{4C00CD9A-4241-43E4-BB62-9356324FE81C} = {E63B6919-54B8-40BA-8FFF-FCCB9642358A}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {17032EAB-554B-4B44-A4F6-EFB177ACAB7A}
|
||||
|
||||
Reference in New Issue
Block a user