codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-28 06:54:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for no Camera for creating Marks in the Thang Editor.

Browse source
This commit is contained in:
Nick Winter 2014-03-16 21:48:28 -07:00
parent af57e88a1a
commit b51f51f636
1 changed files with 6 additions and 5 deletions

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

@ -258,8 +258,8 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
if (@thang.scaleFactor or 1) isnt @targetScaleFactor if (@thang.scaleFactor or 1) isnt @targetScaleFactor
createjs.Tween.removeTweens(@) createjs.Tween.removeTweens(@)
createjs.Tween.get(@).to({scaleFactor:@thang.scaleFactor or 1}, 2000, createjs.Ease.elasticOut) createjs.Tween.get(@).to({scaleFactor:@thang.scaleFactor or 1}, 2000, createjs.Ease.elasticOut)
@targetScaleFactor = @thang.scaleFactor @targetScaleFactor = @thang.scaleFactor
updateAlpha: -> updateAlpha: ->
@imageObject.alpha = if @hiding then 0 else 1 @imageObject.alpha = if @hiding then 0 else 1
return unless @thang?.alpha? return unless @thang?.alpha?
@ -418,6 +418,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
pos pos
createMarks: -> createMarks: ->
return unless @options.camera
if @thang if @thang
allProps = [] allProps = []
allProps = allProps.concat (@thang.hudProperties ? []) allProps = allProps.concat (@thang.hudProperties ? [])
@ -437,9 +438,9 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
@marks.repair?.toggle @thang?.errorsOut @marks.repair?.toggle @thang?.errorsOut
if @selected if @selected
@marks.voiceradius?.toggle true @marks.voiceradius?.toggle true
@marks.visualradius?.toggle true @marks.visualradius?.toggle true
@marks.attackradius?.toggle true @marks.attackradius?.toggle true
else else
@marks.voiceradius?.toggle false @marks.voiceradius?.toggle false
@marks.visualradius?.toggle false @marks.visualradius?.toggle false