Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
jasminegamedev committed Feb 18, 2024
2 parents eb4ff9c + 69de612 commit a1f0520
Show file tree
Hide file tree
Showing 92 changed files with 19,403 additions and 17,313 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ Content/Maps/autosave
Content/FMOD/celeste64/.cache
Content/FMOD/celeste64/.user
Content/FMOD/celeste64/.unsaved
Properties/PublishProfiles/FolderProfile.pubxml

# ignore mods, except for the built in included ones
Mods
-Mods/DefaultSkins
-Mods/TestLevel
Celeste64Launcher/Properties/PublishProfiles/FolderProfile.pubxml.user
192 changes: 105 additions & 87 deletions Celeste64.csproj
Original file line number Diff line number Diff line change
@@ -1,87 +1,105 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Version>1.0.1</Version>
<PublishSingleFile>true</PublishSingleFile>
<PublishTrimmed>false</PublishTrimmed>
<Platforms>x64</Platforms>
<ApplicationIcon>fuji.ico</ApplicationIcon>
<PackageIcon>fuji.png</PackageIcon>
<PackageReadmeFile>ReadMe.md</PackageReadmeFile>
<SelfContained>false</SelfContained>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FosterFramework" Version="0.1.17-alpha" />
<PackageReference Include="SharpGLTF.Runtime" Version="1.0.0-alpha0031" />
<PackageReference Include="Sledge.Formats.Map" Version="1.1.5" />
</ItemGroup>

<PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([MSBuild]::IsOSPlatform('Linux'))) or $(RuntimeIdentifier.StartsWith('linux'))">
<IsLinux>true</IsLinux>
</PropertyGroup>

<PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([MSBuild]::IsOSPlatform('Windows'))) or $(RuntimeIdentifier.StartsWith('win'))">
<IsWindows>true</IsWindows>
</PropertyGroup>

<PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([MSBuild]::IsOSPlatform('OSX'))) or $(RuntimeIdentifier.StartsWith('osx'))">
<IsMacOS>true</IsMacOS>
</PropertyGroup>

<PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) == 'Arm64') or $(RuntimeIdentifier.EndsWith('arm64'))">
<IsArm64>true</IsArm64>
</PropertyGroup>

<ItemGroup Condition="$(IsLinux) == 'true' and $(IsArm64) == 'true'">
<Content Include="Source/Audio/FMOD/libs/libarm64/**" CopyToOutputDirectory="PreserveNewest" Link="%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup Condition="$(IsLinux) == 'true' and $(IsArm64) != 'true'">
<Content Include="Source/Audio/FMOD/libs/lib64/**" CopyToOutputDirectory="PreserveNewest" Link="%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup Condition="$(IsWindows) == 'true'">
<Content Include="Source/Audio/FMOD/libs/x64/**" CopyToOutputDirectory="PreserveNewest" Link="%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup Condition="$(IsMacOS) == 'true'">
<Content Include="Source/Audio/FMOD/libs/osx/**" CopyToOutputDirectory="PreserveNewest" Link="%(Filename)%(Extension)" />
</ItemGroup>


<ItemGroup>
<Content Remove="Celeste64-Fuji\**" />
<Content Remove="Celeste64Launcher\**" />
<Content Remove="Mods\**" />
</ItemGroup>

<ItemGroup>
<Compile Remove="Celeste64-Fuji\**" />
<Compile Remove="Celeste64Launcher\**" />
<Compile Remove="Mods\**" />
<EmbeddedResource Remove="Celeste64-Fuji\**" />
<EmbeddedResource Remove="Celeste64Launcher\**" />
<EmbeddedResource Remove="Mods\**" />
<None Remove="Celeste64-Fuji\**" />
<None Remove="Celeste64Launcher\**" />
<None Remove="Mods\**" />
</ItemGroup>

<ItemGroup>
<None Update="fuji.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Update="ReadMe.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

</Project>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Version>1.1.1</Version>
<PublishSingleFile>true</PublishSingleFile>
<PublishTrimmed>false</PublishTrimmed>
<Platforms>x64</Platforms>
<ApplicationIcon>fuji.ico</ApplicationIcon>
<PackageIcon>fuji.png</PackageIcon>
<PackageReadmeFile>ReadMe.md</PackageReadmeFile>
<SelfContained>false</SelfContained>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FosterFramework" Version="0.1.18-alpha" />
<PackageReference Include="SharpGLTF.Runtime" Version="1.0.0-alpha0031" />
<PackageReference Include="Sledge.Formats.Map" Version="1.1.5" />

<PackageReference Include="MonoMod.RuntimeDetour" Version="25.1.0-prerelease.2" />
<PackageReference Include="ImGui.NET" Version="1.90.1.1" />
</ItemGroup>

<PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([MSBuild]::IsOSPlatform('Linux'))) or $(RuntimeIdentifier.StartsWith('linux'))">
<IsLinux>true</IsLinux>
</PropertyGroup>

<PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([MSBuild]::IsOSPlatform('Windows'))) or $(RuntimeIdentifier.StartsWith('win'))">
<IsWindows>true</IsWindows>
</PropertyGroup>

<PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([MSBuild]::IsOSPlatform('OSX'))) or $(RuntimeIdentifier.StartsWith('osx'))">
<IsMacOS>true</IsMacOS>
</PropertyGroup>

<PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) == 'x64') or $(RuntimeIdentifier.EndsWith('x64'))">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) == 'Arm64') or $(RuntimeIdentifier.EndsWith('arm64'))">
<IsArm64>true</IsArm64>
<PlatformTarget>ARM64</PlatformTarget>
</PropertyGroup>

<PropertyGroup Condition="($(RuntimeIdentifier) == '' and $([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture) == 'Arm') or $(RuntimeIdentifier.EndsWith('arm'))">
<IsArm>true</IsArm>
<PlatformTarget>ARM</PlatformTarget>
</PropertyGroup>

<ItemGroup Condition="$(IsLinux) == 'true' and $(IsArm64) == 'true'">
<Content Include="Source/Audio/FMOD/libs/libarm64/**" CopyToOutputDirectory="PreserveNewest" Link="%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup Condition="$(IsLinux) == 'true' and $(IsArm) == 'true'">
<Content Include="Source/Audio/FMOD/libs/libarm/**" CopyToOutputDirectory="PreserveNewest" Link="%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup Condition="$(IsLinux) == 'true' and $(IsArm64) != 'true' and $(IsArm) != 'true'">
<Content Include="Source/Audio/FMOD/libs/lib64/**" CopyToOutputDirectory="PreserveNewest" Link="%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup Condition="$(IsWindows) == 'true'">
<Content Include="Source/Audio/FMOD/libs/x64/**" CopyToOutputDirectory="PreserveNewest" Link="%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup Condition="$(IsMacOS) == 'true'">
<Content Include="Source/Audio/FMOD/libs/osx/**" CopyToOutputDirectory="PreserveNewest" Link="%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup>
<Content Remove="build\**" />
<Content Remove="Celeste64-Fuji\**" />
<Content Remove="Celeste64Launcher\**" />
<Content Remove="Mods\**" />
</ItemGroup>

<ItemGroup>
<Compile Remove="build\**" />
<Compile Remove="Celeste64-Fuji\**" />
<Compile Remove="Celeste64Launcher\**" />
<Compile Remove="Mods\**" />
<EmbeddedResource Remove="build\**" />
<EmbeddedResource Remove="Celeste64-Fuji\**" />
<EmbeddedResource Remove="Celeste64Launcher\**" />
<EmbeddedResource Remove="Mods\**" />
<None Remove="build\**" />
<None Remove="Celeste64-Fuji\**" />
<None Remove="Celeste64Launcher\**" />
<None Remove="Mods\**" />
</ItemGroup>

<ItemGroup>
<None Update="fuji.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Update="ReadMe.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions Celeste64Launcher/Celeste64Launcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Version>0.3.1</Version>
<Version>0.4.0</Version>
<PublishTrimmed>false</PublishTrimmed>
<Platforms>x64</Platforms>
<ApplicationIcon>..\fuji.ico</ApplicationIcon>
<PackageIcon>..\fuji.png</PackageIcon>
<PackageReadmeFile>..\ReadMe.md</PackageReadmeFile>
<StartupObject>Program</StartupObject>
<SelfContained>true</SelfContained>
<PublishSingleFile>true</PublishSingleFile>
<SelfContained>false</SelfContained>
<PublishSingleFile>true</PublishSingleFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FosterFramework" Version="0.1.17-alpha" />
<PackageReference Include="FosterFramework" Version="0.1.18-alpha" />
<PackageReference Include="SharpGLTF.Runtime" Version="1.0.0-alpha0031" />
<PackageReference Include="Sledge.Formats.Map" Version="1.1.5" />

Expand Down Expand Up @@ -60,10 +60,10 @@
<ItemGroup>
<ProjectReference Include="..\Celeste64.csproj">
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</ProjectReference>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</ProjectReference>
</ItemGroup>


<ItemGroup>
<None Update="..\fuji.png">
<Pack>True</Pack>
Expand Down
13 changes: 0 additions & 13 deletions Celeste64Launcher/Properties/PublishProfiles/FolderProfile.pubxml

This file was deleted.

This file was deleted.

23 changes: 23 additions & 0 deletions Celeste64Launcher/Properties/PublishProfiles/LinuxProfile.pubxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>build</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<_TargetId>Folder</_TargetId>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
<SelfContained>false</SelfContained>
<PublishSingleFile>true</PublishSingleFile>
</PropertyGroup>
<ItemGroup>
<Content Update="Celeste64.dll">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
</ItemGroup>
</Project>
23 changes: 23 additions & 0 deletions Celeste64Launcher/Properties/PublishProfiles/MacOSProfile.pubxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>build</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<_TargetId>Folder</_TargetId>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
<SelfContained>false</SelfContained>
<PublishSingleFile>true</PublishSingleFile>
</PropertyGroup>
<ItemGroup>
<Content Update="Celeste64.dll">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
</ItemGroup>
</Project>
24 changes: 24 additions & 0 deletions Celeste64Launcher/Properties/PublishProfiles/WindowsProfile.pubxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>build</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<_TargetId>Folder</_TargetId>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>false</SelfContained>
<PublishReadyToRun>false</PublishReadyToRun>
<PublishSingleFile>true</PublishSingleFile>
</PropertyGroup>
<ItemGroup>
<Content Update="Celeste64.dll">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
</Content>
</ItemGroup>
</Project>
Loading

0 comments on commit a1f0520

Please sign in to comment.