tyler.durden
/
P3D-Legacy
mirror of https://github.com/P3D-Legacy/P3D-Legacy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated to MonoGame 3.6 

using standard MG compilation methods for now
This commit is contained in:
Aragas 2017-07-31 19:57:42 +03:00
parent 5c66805ace
commit 4f2361536f
7 changed files with 9965 additions and 20140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
2.5DHero.sln
View File

@ -1,34 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26724.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "2.5DHero", "2.5DHero\2.5DHero\2.5DHero.vbproj", "{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
DebugJian|Any CPU = DebugJian|Any CPU
Debug|Any CPU = Debug|Any CPU
DebugNoContent|Any CPU = DebugNoContent|Any CPU
DebugStandard|Any CPU = DebugStandard|Any CPU
ReleaseJian|Any CPU = ReleaseJian|Any CPU
Release|Any CPU = Release|Any CPU
ReleaseNoContent|Any CPU = ReleaseNoContent|Any CPU
ReleaseStandard|Any CPU = ReleaseStandard|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|Any CPU.ActiveCfg = DebugJian|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|Any CPU.Build.0 = DebugJian|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|Any CPU.ActiveCfg = DebugNoContent|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|Any CPU.Build.0 = DebugNoContent|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugStandard|Any CPU.ActiveCfg = DebugStandard|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugStandard|Any CPU.Build.0 = DebugStandard|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|Any CPU.ActiveCfg = ReleaseJian|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|Any CPU.Build.0 = ReleaseJian|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|Any CPU.ActiveCfg = Debug|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|Any CPU.Build.0 = Debug|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.Release|Any CPU.Build.0 = Release|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|Any CPU.ActiveCfg = ReleaseNoContent|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|Any CPU.Build.0 = ReleaseNoContent|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseStandard|Any CPU.ActiveCfg = ReleaseStandard|Any CPU
{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseStandard|Any CPU.Build.0 = ReleaseStandard|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8FE3951F-DE18-41FF-A035-32DF597A91F2}
EndGlobalSection
EndGlobal

94
2.5DHero/2.5DHero/2.5DHero.vbproj
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -27,13 +28,13 @@
<Prefer32Bit>false</Prefer32Bit>
<ApplicationManifest>My Project\app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'DebugNoContent' Or '$(Configuration)' == 'DebugStandard' Or '$(Configuration)' == 'DebugJian' Or '$(Configuration)' == 'DebugJianNew'">
<PropertyGroup Condition="'$(Configuration)' == 'Debug' Or '$(Configuration)' == 'DebugNoContent'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\DesktopGL\Debug\</OutputPath>
<DefineConstants>DEBUG,TRACE,WINDOWS</DefineConstants>
<DebugType>full</DebugType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'ReleaseNoContent' Or '$(Configuration)' == 'ReleaseStandard' Or '$(Configuration)' == 'ReleaseJian' Or '$(Configuration)' == 'ReleaseJianNew'">
<PropertyGroup Condition="'$(Configuration)' == 'Release' Or '$(Configuration)' == 'ReleaseNoContent'">
<OutputPath>bin\DesktopGL\Release\</OutputPath>
<DefineConstants>TRACE,WINDOWS</DefineConstants>
<Optimize>true</Optimize>
@ -41,21 +42,6 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<ItemGroup>
<Content Include="Pokemon3D.ico" />
<Content Include="Pokemon\Items\_itemList.txt" />
<None Include="packages.config" />
<Reference Include="MonoGame.Framework, Version=3.5.1.1679, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NVorbis, Version=0.8.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<HintPath>..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
<Reference Include="System.Management" />
@ -73,11 +59,74 @@
<Import Include="Microsoft.Xna.Framework.Content" />
<Import Include="Microsoft.Xna.Framework.Media" />
<Import Include="Microsoft.Xna.Framework.Audio" />
</ItemGroup>
<ItemGroup>
<Reference Include="MonoGame.Framework">
<HintPath>$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\MonoGame.Framework.dll</HintPath>
</Reference>
<Content Include="Pokemon3D.ico" />
<Content Include="Pokemon\Items\_itemList.txt" />
<Content Include="credits.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="My Project\app.manifest" />
<None Include="app.config" />
<MonoGameContentReference Include="$(SolutionDir)\2.5DHero\2.5DHeroContent\Content\Content.mgcb" />
<None Include="$(SolutionDir)\2.5DHero\2.5DHeroContent\meta">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(SolutionDir)\2.5DHero\2.5DHeroContent\maps\**\*.*">
<Link>maps\%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(SolutionDir)\2.5DHero\2.5DHeroContent\Scripts\**\*.*">
<Link>Scripts\%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\x86\SDL2.dll">
<Link>x86\SDL2.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\x64\SDL2.dll">
<Link>x64\SDL2.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\x86\soft_oal.dll">
<Link>x86\soft_oal.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\x64\soft_oal.dll">
<Link>x64\soft_oal.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\x86\libSDL2-2.0.so.0">
<Link>x86\libSDL2-2.0.so.0</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\x64\libSDL2-2.0.so.0">
<Link>x64\libSDL2-2.0.so.0</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\x86\libopenal.so.1">
<Link>x86\libopenal.so.1</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\x64\libopenal.so.1">
<Link>x64\libopenal.so.1</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\libSDL2-2.0.0.dylib">
<Link>libSDL2-2.0.0.dylib</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\libopenal.1.dylib">
<Link>libopenal.1.dylib</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MonoGameInstallDirectory)\MonoGame\v3.0\Assemblies\DesktopGL\MonoGame.Framework.dll.config">
<Link>MonoGame.Framework.dll.config</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Compile Include="Battle\BattleAnimations\BAMove.vb" />
@ -1721,16 +1770,7 @@
<Compile Include="World\SkyDome.vb" />
<Compile Include="World\Terrain.vb" />
<Compile Include="World\World.vb" />
<MonoGameContentReference Include="..\2.5DHeroContent\Content.mgcb" />
</ItemGroup>
<!-- Specify the search path explicitly so the ResolveAssemblyReferences task picks the right ones -->
<Target Name="BeforeResolveReferences">
<CreateProperty Value="$(MSBuildProgramFiles32)\MonoGame\v3.0\Assemblies\Windows,$(AssemblySearchPaths)">
<Output TaskParameter="Value" PropertyName="AssemblySearchPaths" />
</CreateProperty>
</Target>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
<Import Condition=" '$(Configuration)' == 'DebugStandard' Or '$(Configuration)' == 'ReleaseStandard' " Project="MonoGame.Content.Builder_Standard.targets" />
<Import Condition=" '$(Configuration)' == 'DebugJian' Or '$(Configuration)' == 'ReleaseJian' " Project="MonoGame.Content.Builder_Jian.targets" />
<Import Condition=" '$(Configuration)' == 'DebugJianNew' Or '$(Configuration)' == 'ReleaseJianNew' " Project="MonoGame.Content.Builder_Jian_New.targets" />
<Import Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Content.Builder.targets" />
</Project>

4
2.5DHero/2.5DHero/Core/GameController.vb
View File

@ -10,12 +10,12 @@ Public Class GameController
''' <summary>
''' The current version of the game.
''' </summary>
Public Const GAMEVERSION As String = "0.54.2"
Public Const GAMEVERSION As String = "0.54.3"
''' <summary>
''' The number of released iterations of the game.
''' </summary>
Public Const RELEASEVERSION As String = "93"
Public Const RELEASEVERSION As String = "94"
''' <summary>
''' The development stage the game is in.

9
2.5DHero/2.5DHero/MonoGame.Framework.dll.config Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<dllmap dll="SDL2.dll" os="osx" target="libSDL2-2.0.0.dylib"/>
<dllmap dll="soft_oal.dll" os="osx" target="libopenal.1.dylib" />
<dllmap dll="SDL2.dll" os="linux" cpu="x86" target="./x86/libSDL2-2.0.so.0"/>
<dllmap dll="soft_oal.dll" os="linux" cpu="x86" target="./x86/libopenal.so.1" />
<dllmap dll="SDL2.dll" os="linux" cpu="x86-64" target="./x64/libSDL2-2.0.so.0"/>
<dllmap dll="soft_oal.dll" os="linux" cpu="x86-64" target="./x64/libopenal.so.1" />
</configuration>

4
2.5DHero/2.5DHero/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MonoGame.Framework.DesktopGL" version="3.5.1.1679" targetFramework="net45" />
</packages>

29965
2.5DHero/2.5DHeroContent/Content.mgcb → 2.5DHero/2.5DHeroContent/Content/Content.mgcb
View File

File diff suppressed because it is too large Load Diff

BIN
2.5DHero/2.5DHeroContent/MGCB_Tool.exe
View File

Binary file not shown.