From 853a80dd23afb17d0e99bcd6329f9a59bbfd652e Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Wed, 12 Mar 2014 12:43:51 -0700 Subject: [PATCH 1/2] Fixed loading marks so they are positioned correctly when they load and the world is paused. --- app/lib/surface/CocoSprite.coffee | 2 +- app/views/editor/thang/edit.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/lib/surface/CocoSprite.coffee b/app/lib/surface/CocoSprite.coffee index 54b94adc6..131839b27 100644 --- a/app/lib/surface/CocoSprite.coffee +++ b/app/lib/surface/CocoSprite.coffee @@ -172,7 +172,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass return if @stillLoading @updatePosition() if frameChanged - @updateScale() + @updateScale() # must happen before rotation @updateAlpha() @updateRotation() @updateAction() diff --git a/app/views/editor/thang/edit.coffee b/app/views/editor/thang/edit.coffee index 03babdfd4..23fa7f38d 100644 --- a/app/views/editor/thang/edit.coffee +++ b/app/views/editor/thang/edit.coffee @@ -270,7 +270,7 @@ module.exports = class ThangTypeEditView extends View @$el.find('.rotation-label').text " #{value}° " if @currentSprite @currentSprite.rotation = value - @currentSprite.update() + @currentSprite.update(true) updateScale: => value = (@scaleSlider.slider('value') + 1) / 10 From ed60f5932fb1e323e0d7d9b53776e1e442aed7ae Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Wed, 12 Mar 2014 12:44:06 -0700 Subject: [PATCH 2/2] Fixed showing the guide at the beginning of the level. --- app/views/play/level_view.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/play/level_view.coffee b/app/views/play/level_view.coffee index a7faa74cb..5f37798a3 100644 --- a/app/views/play/level_view.coffee +++ b/app/views/play/level_view.coffee @@ -128,7 +128,7 @@ module.exports = class PlayLevelView extends View onLevelLoaderProgressChanged: -> return if @seenDocs - return unless showFrequency = @levelLoader.level.get('showGuide') + return unless showFrequency = @levelLoader.level.get('showsGuide') session = @levelLoader.session diff = new Date().getTime() - new Date(session.get('created')).getTime() return if showFrequency is 'first-time' and diff > (5 * 60 * 1000)