Commit 2781e420 authored by Leon Arnott's avatar Leon Arnott
Browse files

Fixed a bug where the effects of (enchant:) were temporarily suppressed...

Fixed a bug where the effects of (enchant:) were temporarily suppressed whenever a (dialog:), (prompt:) or `(confirm:)` was run at roughly the same time.

This isn't the fix I wanted to make (instead I'd rather it only call updateEnchantments() when it explicitly needs to), but it'll have to do for now.

Also fixed a bug where the Styles panel of The Harlowe Toolbar didn't preview animations correctly.

Closes #203.
parent 001f82f55f08
......@@ -6,6 +6,7 @@ Documentation is at http://twine2.neocities.org/. See below for compilation inst
#### Bugfixes
* Fixed a bug where the effects of `(enchant:)` were temporarily suppressed whenever a `(dialog:)`, `(prompt:)` or `(confirm:)` was run at roughly the same time.
* Fixed a bug where, when a transition finished, if the browser experienced lag due to a large number of other elements being present, the transitioning element's `visibility` could become `hidden` briefly before Harlowe removed the transition CSS from it.
* Fixed a bug where Instant macros (`(set:)`, `(put:)`, `(move:)` and `(unpack:)`) would pollute the browser console with errors when Debug Mode was off.
* Fixed a bug where Debug Mode's Enchantments panels' headers were being drawn incorrectly in Chrome.
......
......@@ -154,11 +154,13 @@ define(['jquery', 'utils', 'utils/operationutils', 'engine', 'state', 'passages'
section,
});
if (name === "enchant") {
section.addEnchantment(enchantment);
/*
section.updateEnchantments() will be run automatically after
this has been executed, meaning we don't have to do it here.
When this is run in a normal section renderInto() flow, section.updateEnchantments() will
be run automatically after this has been executed. However, if this was run as a result of an unblocked flow
(via (dialog:) etc.) then it still needs to be run manually here.
*/
section.addEnchantment(enchantment);
section.updateEnchantments();
}
else {
enchantment.enchantScope();
......
......@@ -1134,11 +1134,11 @@
"upside-down": "display:inline-block;transform:scaleY(-1)",
blink: "animation:fade-in-out 1s steps(1,end) infinite alternate",
"fade-in-out": "animation:fade-in-out 2s ease-in-out infinite alternate",
rumble: "display:inline-block;animation:rumble linear 0.1s 0s infinite",
shudder: "display:inline-block;animation:shudder linear 0.1s 0s infinite",
sway: "display:inline-block;animation:sway 5s linear 0s infinite",
buoy: "display:inline-block;animation:buoy 5s linear 0s infinite",
fidget: "display:inline-block;animation:fidget 60s linear 0s infinite",
rumble: "display:inline-block;animation:harlowe-3-rumble linear 0.1s 0s infinite",
shudder: "display:inline-block;animation:harlowe-3-shudder linear 0.1s 0s infinite",
sway: "display:inline-block;animation:harlowe-3-sway 5s linear 0s infinite",
buoy: "display:inline-block;animation:harlowe-3-buoy 5s linear 0s infinite",
fidget: "display:inline-block;animation:harlowe-3-fidget 60s linear 0s infinite",
};
function model(m, elem) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment