codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 16:17:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
Nick Winter 2014-03-12 12:45:46 -07:00
commit 1ca9b2d3e5
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/surface/CocoSprite.coffee
View file

@ -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()

2
app/views/editor/thang/edit.coffee
View file

@ -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

2
app/views/play/level_view.coffee
View file

@ -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)