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

Develop #89

Merged
merged 4 commits into from
Sep 28, 2023
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/release-notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,7 @@
- `AsepriteCel` properties were made public (thanks @SephDB)
- `AnimatedSprite` now supports setting frame both on initial play and during playback.

## 5.1.1
- Resolved issue where using Linked Cels can cause an out of bounds exception.


2 changes: 1 addition & 1 deletion .nuget/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
A Cross Platform C# Library That Adds Support For Aseprite Files in MonoGame Projects.

[![build-and-test](https://github.com/AristurtleDev/monogame-aseprite/actions/workflows/buildandtest.yml/badge.svg)](https://github.com/AristurtleDev/monogame-aseprite/actions/workflows/buildandtest.yml)
[![Nuget 5.1.0](https://img.shields.io/nuget/v/MonoGame.Aseprite?color=blue&style=flat-square)](https://www.nuget.org/packages/MonoGame.Aseprite/5.1.0)
[![Nuget 5.1.1](https://img.shields.io/nuget/v/MonoGame.Aseprite?color=blue&style=flat-square)](https://www.nuget.org/packages/MonoGame.Aseprite/5.1.1)
[![License: MIT](https://img.shields.io/badge/📃%20license-MIT-blue?style=flat)](LICENSE)
[![Twitter](https://img.shields.io/badge/%20-Share%20On%20Twitter-555?style=flat&logo=twitter)](https://twitter.com/intent/tweet?text=MonoGame.Aseprite%20by%20%40aristurtledev%0A%0AA%20cross-platform%20C%23%20library%20that%20adds%20support%20for%20Aseprite%20files%20in%20MonoGame%20projects.%20https%3A%2F%2Fgithub.com%2FAristurtleDev%2Fmonogame-aseprite%0A%0A%23monogame%20%23aseprite%20%23dotnet%20%23csharp%20%23oss%0A)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
A Cross Platform C# Library That Adds Support For Aseprite Files in MonoGame Projects.

[![build-and-test](https://github.com/AristurtleDev/monogame-aseprite/actions/workflows/buildandtest.yml/badge.svg)](https://github.com/AristurtleDev/monogame-aseprite/actions/workflows/buildandtest.yml)
[![Nuget 5.1.0](https://img.shields.io/nuget/v/MonoGame.Aseprite?color=blue&style=flat-square)](https://www.nuget.org/packages/MonoGame.Aseprite/5.1.0)
[![Nuget 5.1.1](https://img.shields.io/nuget/v/MonoGame.Aseprite?color=blue&style=flat-square)](https://www.nuget.org/packages/MonoGame.Aseprite/5.1.1)
[![License: MIT](https://img.shields.io/badge/📃%20license-MIT-blue?style=flat)](LICENSE)
[![Twitter](https://img.shields.io/badge/%20-Share%20On%20Twitter-555?style=flat&logo=twitter)](https://twitter.com/intent/tweet?text=MonoGame.Aseprite%20by%20%40aristurtledev%0A%0AA%20cross-platform%20C%23%20library%20that%20adds%20support%20for%20Aseprite%20files%20in%20MonoGame%20projects.%20https%3A%2F%2Fgithub.com%2FAristurtleDev%2Fmonogame-aseprite%0A%0A%23monogame%20%23aseprite%20%23dotnet%20%23csharp%20%23oss%0A)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<GenerateDocumentationFile>False</GenerateDocumentationFile>
<Version>5.1.0</Version>
<Version>5.1.1</Version>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -21,9 +21,9 @@
<!-- dotnet pack Nuget Config stuff -->
<PropertyGroup>
<PackageId>MonoGame.Aseprite.Content.Pipeline</PackageId>
<Version>5.1.0</Version>
<AssemblyVersion>5.1.0</AssemblyVersion>
<FileVersion>5.1.0</FileVersion>
<Version>5.1.1</Version>
<AssemblyVersion>5.1.1</AssemblyVersion>
<FileVersion>5.1.1</FileVersion>
<Authors>Christopher Whitley</Authors>
<Company>Aristurtle</Company>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand All @@ -38,10 +38,9 @@
MonoGame;Aseprite;import;processes;read;write;sprite;animation;tileset;tilemap;spritesheet;pipeline;mgcb
</PackageTags>
<PackageReleaseNotes>
Version 5.1.0
Version 5.1.1
The following changes were implemented:
- `AsepriteCel` properties were made public (thanks @SephDB)
- `AnimatedSprite` now supports setting frame both on initial play and during playback.
- Resolved issue where using Linked Cels can cause an out of bounds exception.
</PackageReleaseNotes>
<Description>
MonoGame.Aseprite.Content.Pipeline is a cross-platform C# library that adds an extension to the MonoGame
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@ internal void AddRawImageCel(short x, short y, ushort width, ushort height, usho
internal void AddLinkedCel(ushort frameIndex)
{
AsepriteFrame frame = _frames[frameIndex];
AsepriteCel linkedCel = frame.Cels[_nextFrameCels.Count];
// If the first cel is a linked cel, then we haven't added cels yet
// so the " - 1" will result in -1. So we only do so when the count is
// greater than 0
AsepriteCel linkedCel = frame.Cels[_nextFrameCels.Count > 0 ? _nextFrameCels.Count - 1 : 0];
_nextFrameCels.Add(linkedCel);
}

Expand Down
7 changes: 3 additions & 4 deletions source/MonoGame.Aseprite/MonoGame.Aseprite.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<GenerateDocumentationFile>False</GenerateDocumentationFile>
<Version>5.1.0</Version>
<Version>5.1.1</Version>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -29,10 +29,9 @@
</PackageTags>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageReleaseNotes>
Version 5.1.0
Version 5.1.1
The following changes were implemented:
- `AsepriteCel` properties were made public (thanks @SephDB)
- `AnimatedSprite` now supports setting frame both on initial play and during playback.
- Resolved issue where using Linked Cels can cause an out of bounds exception.
</PackageReleaseNotes>
<Description>
MonoGame.Aseprite is a cross-platofrm C# library that adds support to MonoGame projects for
Expand Down