Skip to content

Commit

Permalink
Merge pull request #10 from Feu-Secret/tokenmagic-dev
Browse files Browse the repository at this point in the history
update v0.1.3c
  • Loading branch information
Feu-Secret authored Jul 16, 2020
2 parents 93c202e + 2b103f7 commit f279334
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 9 deletions.
Binary file modified .vs/Tokenmagic/v16/.suo
Binary file not shown.
Binary file modified .vs/slnx.sqlite
Binary file not shown.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Token Magic FX - Update v0.1.3b-alpha
# Token Magic FX - Update v0.1.3c-alpha

## FX

Expand All @@ -16,7 +16,8 @@ The new filters have been added to the TokenMagic macro compendium.
*Fixed issues :*
- The padding property value is now multiplied by the zoom factor.
- Some internal improvements and refactoring.
- Animations freezing with target-enhancements module
- Freezing when a scene is updated
- Crash when a scene with animated tokens or tiles is deleted (with active players/GM in the scene)

# Token Magic FX - Update v0.1.2-alpha

Expand Down
Binary file modified Tokenmagic.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion tokenmagic/module.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "tokenmagic",
"title": "Tokenmagic",
"description": "<p>Add graphic filters and animations on your tokens and tiles.</p>",
"version": "0.1.3b",
"version": "0.1.3c",
"compatibleCoreVersion": "0.6.5",
"minimumCoreVersion": "0.6.0",
"author": "SecretFire",
Expand Down
12 changes: 6 additions & 6 deletions tokenmagic/module/tokenmagic.js
Original file line number Diff line number Diff line change
Expand Up @@ -553,13 +553,13 @@ Hooks.on("canvasReady", (canvas) => {
Anime.activateAnimation();
});

Hooks.on("updateScene", (scene, data, options) => {
log("Hook -> updateScene");
Hooks.on("deleteScene", (scene, data, options) => {
log("Hook -> deleteScene");

// to resolve an incompatibility with target-enhancements module
if (data.hasOwnProperty("flags") && data.flags.hasOwnProperty("target-enhancements")) { return; }

Anime.resetAnimation();
if (!(scene == null) && scene.id === game.user.viewedScene) {
Anime.desactivateAnimation();
Anime.resetAnimation();
}
});

Hooks.on("deleteToken", (parent, doc, options, userId) => {
Expand Down
6 changes: 6 additions & 0 deletions tokenmagic/updates/UPDATE-0.1.3c.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Token Magic FX - Update v0.1.3c-alpha

*Fixed issues :*
- Freezing when a scene is updated
- Crash when a scene with animated tokens or tiles is deleted (with active players/GM in the scene)

0 comments on commit f279334

Please sign in to comment.