Skip to content

Commit 0f582d7

Browse files
SimonDarksideJSimonDarksideJ
committed
Merge branch '3.8.4' of https://github.com/MonoGame/MonoGame.Samples into 3.8.5
2 parents a22e120 + bde0675 commit 0f582d7

File tree

18 files changed

+127
-25
lines changed

18 files changed

+127
-25
lines changed

‎Tutorials/learn-monogame-2d/LearnMonoGame2D.AllChapters.sln‎

Lines changed: 104 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.31903.59
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.0.11201.2 d18.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
77
EndProject
@@ -139,6 +139,24 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DungeonSlime", "src\24-Shad
139139
EndProject
140140
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGameLibrary", "src\24-Shaders\MonoGameLibrary\MonoGameLibrary.csproj", "{D0F35587-0897-4BE5-9524-F86B64D43C6C}"
141141
EndProject
142+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "25-Packaging-Game", "25-Packaging-Game", "{CA74294D-C6FC-49D4-B6F0-9A988F4EA0CB}"
143+
EndProject
144+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DungeonSlime", "src\25-Packaging-Game\DungeonSlime\DungeonSlime.csproj", "{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0}"
145+
EndProject
146+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGameLibrary", "src\25-Packaging-Game\MonoGameLibrary\MonoGameLibrary.csproj", "{FB4A7447-2C34-30F9-10D2-204EA034602C}"
147+
EndProject
148+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "26-Publish-To-Itch", "26-Publish-To-Itch", "{0917380D-3C9A-4C29-A8AA-055810D174A8}"
149+
EndProject
150+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DungeonSlime", "src\26-Publish-To-Itch\DungeonSlime\DungeonSlime.csproj", "{7736CD20-FB52-A805-F990-2BDEC082FAB3}"
151+
EndProject
152+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGameLibrary", "src\26-Publish-To-Itch\MonoGameLibrary\MonoGameLibrary.csproj", "{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20}"
153+
EndProject
154+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "27-Conclusion", "27-Conclusion", "{5C3058C1-EA14-4BA9-AF19-8E1475FA2923}"
155+
EndProject
156+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DungeonSlime", "src\27-Conclusion\DungeonSlime\DungeonSlime.csproj", "{B80B25C4-1B46-5903-5442-177CB2309C71}"
157+
EndProject
158+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGameLibrary", "src\27-Conclusion\MonoGameLibrary\MonoGameLibrary.csproj", "{91741488-48B9-22E4-688D-C944BA2B6A7F}"
159+
EndProject
142160
Global
143161
GlobalSection(SolutionConfigurationPlatforms) = preSolution
144162
Debug|Any CPU = Debug|Any CPU
@@ -677,6 +695,78 @@ Global
677695
{D0F35587-0897-4BE5-9524-F86B64D43C6C}.Release|x64.Build.0 = Release|Any CPU
678696
{D0F35587-0897-4BE5-9524-F86B64D43C6C}.Release|x86.ActiveCfg = Release|Any CPU
679697
{D0F35587-0897-4BE5-9524-F86B64D43C6C}.Release|x86.Build.0 = Release|Any CPU
698+
{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
699+
{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
700+
{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0}.Debug|x64.ActiveCfg = Debug|Any CPU
701+
{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0}.Debug|x64.Build.0 = Debug|Any CPU
702+
{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0}.Debug|x86.ActiveCfg = Debug|Any CPU
703+
{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0}.Debug|x86.Build.0 = Debug|Any CPU
704+
{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
705+
{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0}.Release|Any CPU.Build.0 = Release|Any CPU
706+
{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0}.Release|x64.ActiveCfg = Release|Any CPU
707+
{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0}.Release|x64.Build.0 = Release|Any CPU
708+
{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0}.Release|x86.ActiveCfg = Release|Any CPU
709+
{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0}.Release|x86.Build.0 = Release|Any CPU
710+
{FB4A7447-2C34-30F9-10D2-204EA034602C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
711+
{FB4A7447-2C34-30F9-10D2-204EA034602C}.Debug|Any CPU.Build.0 = Debug|Any CPU
712+
{FB4A7447-2C34-30F9-10D2-204EA034602C}.Debug|x64.ActiveCfg = Debug|Any CPU
713+
{FB4A7447-2C34-30F9-10D2-204EA034602C}.Debug|x64.Build.0 = Debug|Any CPU
714+
{FB4A7447-2C34-30F9-10D2-204EA034602C}.Debug|x86.ActiveCfg = Debug|Any CPU
715+
{FB4A7447-2C34-30F9-10D2-204EA034602C}.Debug|x86.Build.0 = Debug|Any CPU
716+
{FB4A7447-2C34-30F9-10D2-204EA034602C}.Release|Any CPU.ActiveCfg = Release|Any CPU
717+
{FB4A7447-2C34-30F9-10D2-204EA034602C}.Release|Any CPU.Build.0 = Release|Any CPU
718+
{FB4A7447-2C34-30F9-10D2-204EA034602C}.Release|x64.ActiveCfg = Release|Any CPU
719+
{FB4A7447-2C34-30F9-10D2-204EA034602C}.Release|x64.Build.0 = Release|Any CPU
720+
{FB4A7447-2C34-30F9-10D2-204EA034602C}.Release|x86.ActiveCfg = Release|Any CPU
721+
{FB4A7447-2C34-30F9-10D2-204EA034602C}.Release|x86.Build.0 = Release|Any CPU
722+
{7736CD20-FB52-A805-F990-2BDEC082FAB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
723+
{7736CD20-FB52-A805-F990-2BDEC082FAB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
724+
{7736CD20-FB52-A805-F990-2BDEC082FAB3}.Debug|x64.ActiveCfg = Debug|Any CPU
725+
{7736CD20-FB52-A805-F990-2BDEC082FAB3}.Debug|x64.Build.0 = Debug|Any CPU
726+
{7736CD20-FB52-A805-F990-2BDEC082FAB3}.Debug|x86.ActiveCfg = Debug|Any CPU
727+
{7736CD20-FB52-A805-F990-2BDEC082FAB3}.Debug|x86.Build.0 = Debug|Any CPU
728+
{7736CD20-FB52-A805-F990-2BDEC082FAB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
729+
{7736CD20-FB52-A805-F990-2BDEC082FAB3}.Release|Any CPU.Build.0 = Release|Any CPU
730+
{7736CD20-FB52-A805-F990-2BDEC082FAB3}.Release|x64.ActiveCfg = Release|Any CPU
731+
{7736CD20-FB52-A805-F990-2BDEC082FAB3}.Release|x64.Build.0 = Release|Any CPU
732+
{7736CD20-FB52-A805-F990-2BDEC082FAB3}.Release|x86.ActiveCfg = Release|Any CPU
733+
{7736CD20-FB52-A805-F990-2BDEC082FAB3}.Release|x86.Build.0 = Release|Any CPU
734+
{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
735+
{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20}.Debug|Any CPU.Build.0 = Debug|Any CPU
736+
{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20}.Debug|x64.ActiveCfg = Debug|Any CPU
737+
{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20}.Debug|x64.Build.0 = Debug|Any CPU
738+
{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20}.Debug|x86.ActiveCfg = Debug|Any CPU
739+
{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20}.Debug|x86.Build.0 = Debug|Any CPU
740+
{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20}.Release|Any CPU.ActiveCfg = Release|Any CPU
741+
{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20}.Release|Any CPU.Build.0 = Release|Any CPU
742+
{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20}.Release|x64.ActiveCfg = Release|Any CPU
743+
{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20}.Release|x64.Build.0 = Release|Any CPU
744+
{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20}.Release|x86.ActiveCfg = Release|Any CPU
745+
{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20}.Release|x86.Build.0 = Release|Any CPU
746+
{B80B25C4-1B46-5903-5442-177CB2309C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
747+
{B80B25C4-1B46-5903-5442-177CB2309C71}.Debug|Any CPU.Build.0 = Debug|Any CPU
748+
{B80B25C4-1B46-5903-5442-177CB2309C71}.Debug|x64.ActiveCfg = Debug|Any CPU
749+
{B80B25C4-1B46-5903-5442-177CB2309C71}.Debug|x64.Build.0 = Debug|Any CPU
750+
{B80B25C4-1B46-5903-5442-177CB2309C71}.Debug|x86.ActiveCfg = Debug|Any CPU
751+
{B80B25C4-1B46-5903-5442-177CB2309C71}.Debug|x86.Build.0 = Debug|Any CPU
752+
{B80B25C4-1B46-5903-5442-177CB2309C71}.Release|Any CPU.ActiveCfg = Release|Any CPU
753+
{B80B25C4-1B46-5903-5442-177CB2309C71}.Release|Any CPU.Build.0 = Release|Any CPU
754+
{B80B25C4-1B46-5903-5442-177CB2309C71}.Release|x64.ActiveCfg = Release|Any CPU
755+
{B80B25C4-1B46-5903-5442-177CB2309C71}.Release|x64.Build.0 = Release|Any CPU
756+
{B80B25C4-1B46-5903-5442-177CB2309C71}.Release|x86.ActiveCfg = Release|Any CPU
757+
{B80B25C4-1B46-5903-5442-177CB2309C71}.Release|x86.Build.0 = Release|Any CPU
758+
{91741488-48B9-22E4-688D-C944BA2B6A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
759+
{91741488-48B9-22E4-688D-C944BA2B6A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
760+
{91741488-48B9-22E4-688D-C944BA2B6A7F}.Debug|x64.ActiveCfg = Debug|Any CPU
761+
{91741488-48B9-22E4-688D-C944BA2B6A7F}.Debug|x64.Build.0 = Debug|Any CPU
762+
{91741488-48B9-22E4-688D-C944BA2B6A7F}.Debug|x86.ActiveCfg = Debug|Any CPU
763+
{91741488-48B9-22E4-688D-C944BA2B6A7F}.Debug|x86.Build.0 = Debug|Any CPU
764+
{91741488-48B9-22E4-688D-C944BA2B6A7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
765+
{91741488-48B9-22E4-688D-C944BA2B6A7F}.Release|Any CPU.Build.0 = Release|Any CPU
766+
{91741488-48B9-22E4-688D-C944BA2B6A7F}.Release|x64.ActiveCfg = Release|Any CPU
767+
{91741488-48B9-22E4-688D-C944BA2B6A7F}.Release|x64.Build.0 = Release|Any CPU
768+
{91741488-48B9-22E4-688D-C944BA2B6A7F}.Release|x86.ActiveCfg = Release|Any CPU
769+
{91741488-48B9-22E4-688D-C944BA2B6A7F}.Release|x86.Build.0 = Release|Any CPU
680770
EndGlobalSection
681771
GlobalSection(SolutionProperties) = preSolution
682772
HideSolutionNode = FALSE
@@ -749,5 +839,17 @@ Global
749839
{EFAC0ED1-1E7C-A0ED-736F-56BC05975F05} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
750840
{DD410CAE-140B-4B03-B086-537E38F3B11D} = {EFAC0ED1-1E7C-A0ED-736F-56BC05975F05}
751841
{D0F35587-0897-4BE5-9524-F86B64D43C6C} = {EFAC0ED1-1E7C-A0ED-736F-56BC05975F05}
842+
{CA74294D-C6FC-49D4-B6F0-9A988F4EA0CB} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
843+
{8DBF5E3F-1F3C-2FAD-F51D-826F999C13A0} = {CA74294D-C6FC-49D4-B6F0-9A988F4EA0CB}
844+
{FB4A7447-2C34-30F9-10D2-204EA034602C} = {CA74294D-C6FC-49D4-B6F0-9A988F4EA0CB}
845+
{0917380D-3C9A-4C29-A8AA-055810D174A8} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
846+
{7736CD20-FB52-A805-F990-2BDEC082FAB3} = {0917380D-3C9A-4C29-A8AA-055810D174A8}
847+
{73D6DC4B-CAE9-F05B-E67A-8BE56252BA20} = {0917380D-3C9A-4C29-A8AA-055810D174A8}
848+
{5C3058C1-EA14-4BA9-AF19-8E1475FA2923} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
849+
{B80B25C4-1B46-5903-5442-177CB2309C71} = {5C3058C1-EA14-4BA9-AF19-8E1475FA2923}
850+
{91741488-48B9-22E4-688D-C944BA2B6A7F} = {5C3058C1-EA14-4BA9-AF19-8E1475FA2923}
851+
EndGlobalSection
852+
GlobalSection(ExtensibilityGlobals) = postSolution
853+
SolutionGuid = {15C3C873-BACE-4E1D-B20F-F28748BAD2E4}
752854
EndGlobalSection
753855
EndGlobal

‎Tutorials/learn-monogame-2d/src/25-Packaging-Game/DungeonSlime/DungeonSlime.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
</EmbeddedResource>
2424
</ItemGroup>
2525
<ItemGroup>
26-
<PackageReference Include="Gum.MonoGame" Version="2025.5.1.1" />
27-
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-develop.1" />
28-
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-develop.1" />
26+
<PackageReference Include="Gum.MonoGame" Version="2025.8.3.3" />
27+
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.4" />
28+
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.4" />
2929
</ItemGroup>
3030
<ItemGroup>
3131
<ProjectReference Include="..\MonoGameLibrary\MonoGameLibrary.csproj" />

‎Tutorials/learn-monogame-2d/src/25-Packaging-Game/DungeonSlime/Game1.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Microsoft.Xna.Framework.Media;
33
using MonoGameLibrary;
44
using MonoGameGum;
5-
using MonoGameGum.Forms.Controls;
5+
using Gum.Forms.Controls;
66

77
namespace DungeonSlime;
88

‎Tutorials/learn-monogame-2d/src/25-Packaging-Game/DungeonSlime/Scenes/TitleScene.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.Xna.Framework.Graphics;
66
using Microsoft.Xna.Framework.Input;
77
using MonoGameGum;
8-
using MonoGameGum.Forms.Controls;
8+
using Gum.Forms.Controls;
99
using MonoGameGum.GueDeriving;
1010
using MonoGameLibrary;
1111
using MonoGameLibrary.Graphics;

‎Tutorials/learn-monogame-2d/src/25-Packaging-Game/DungeonSlime/UI/GameSceneUI.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.Xna.Framework.Audio;
66
using Microsoft.Xna.Framework.Content;
77
using MonoGameGum;
8-
using MonoGameGum.Forms.Controls;
8+
using Gum.Forms.Controls;
99
using MonoGameGum.GueDeriving;
1010
using MonoGameLibrary;
1111
using MonoGameLibrary.Graphics;

‎Tutorials/learn-monogame-2d/src/25-Packaging-Game/DungeonSlime/UI/OptionsSlider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Gum.DataTypes.Variables;
44
using Gum.Managers;
55
using Microsoft.Xna.Framework;
6-
using MonoGameGum.Forms.Controls;
6+
using Gum.Forms.Controls;
77
using MonoGameGum.GueDeriving;
88
using MonoGameLibrary.Graphics;
99

‎Tutorials/learn-monogame-2d/src/26-Publish-To-Itch/DungeonSlime/DungeonSlime.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
</EmbeddedResource>
2424
</ItemGroup>
2525
<ItemGroup>
26-
<PackageReference Include="Gum.MonoGame" Version="2025.5.1.1" />
27-
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.5-develop.1" />
28-
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.5-develop.1" />
26+
<PackageReference Include="Gum.MonoGame" Version="2025.8.3.3" />
27+
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.4" />
28+
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.4" />
2929
</ItemGroup>
3030
<ItemGroup>
3131
<ProjectReference Include="..\MonoGameLibrary\MonoGameLibrary.csproj" />

‎Tutorials/learn-monogame-2d/src/26-Publish-To-Itch/DungeonSlime/Game1.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Microsoft.Xna.Framework.Media;
33
using MonoGameLibrary;
44
using MonoGameGum;
5-
using MonoGameGum.Forms.Controls;
5+
using Gum.Forms.Controls;
66

77
namespace DungeonSlime;
88

‎Tutorials/learn-monogame-2d/src/26-Publish-To-Itch/DungeonSlime/Scenes/TitleScene.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.Xna.Framework.Graphics;
66
using Microsoft.Xna.Framework.Input;
77
using MonoGameGum;
8-
using MonoGameGum.Forms.Controls;
8+
using Gum.Forms.Controls;
99
using MonoGameGum.GueDeriving;
1010
using MonoGameLibrary;
1111
using MonoGameLibrary.Graphics;

‎Tutorials/learn-monogame-2d/src/26-Publish-To-Itch/DungeonSlime/UI/AnimatedButton.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Gum.Graphics.Animation;
55
using Gum.Managers;
66
using Microsoft.Xna.Framework.Input;
7-
using MonoGameGum.Forms.Controls;
7+
using Gum.Forms.Controls;
88
using MonoGameGum.GueDeriving;
99
using MonoGameLibrary.Graphics;
1010

0 commit comments

Comments
 (0)