Skip to content

Commit

Permalink
Merge branch 'fix/sprite-resize' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
chrismaltby committed Nov 13, 2024
2 parents c7dd45a + 5a25f54 commit 34656b4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fix variable uses list which wasn't including variable "0"'s uses in text fields
- Fix issue where "Set Animation Frame" event wouldn't allow frame values greater than 25
- Fix issue causing "Dialogue Multiple Choice" event to cut off menu items early
- Fix issue where changing the dimensions of a sprite png image could cause the sprite editor's tile palette to display incorrectly

## [4.1.3] - 2024-09-16

Expand Down
2 changes: 2 additions & 0 deletions src/lib/project/loadProjectData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ const loadProject = async (projectPath: string): Promise<LoadProjectResult> => {
id: resource?.id ?? asset.id,
symbol: resource?.symbol ?? asset.symbol,
filename: asset.filename,
width: asset.width,
height: asset.height,
name: resource?.name ?? asset.name,
canvasWidth: resource?.canvasWidth || 32,
canvasHeight: resource?.canvasHeight || 32,
Expand Down
4 changes: 2 additions & 2 deletions src/lib/project/loadSpriteData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ const loadSpriteData =
plugin,
name,
symbol: toValidSymbol(`sprite_${name}`),
width: size.width,
height: size.height,
states: [
{
id: uuidv4(),
Expand Down Expand Up @@ -68,6 +66,8 @@ const loadSpriteData =
_resourceType: "sprite",
...resource,
filename: file,
width: size.width,
height: size.height,
inode,
checksum,
};
Expand Down

0 comments on commit 34656b4

Please sign in to comment.