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

Fixed a multiplayer link and debug mark alpha.

Browse source
This commit is contained in:
Nick Winter 2014-03-07 21:02:10 -08:00
parent 2f378106ca
commit 085fb82cc9
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -389,7 +389,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
@addMark('bounds').toggle true if @thang?.drawsBounds @addMark('bounds').toggle true if @thang?.drawsBounds
@addMark('shadow').toggle true unless @thangType.get('shadow') is 0 @addMark('shadow').toggle true unless @thangType.get('shadow') is 0
mark.update() for name, mark of @marks mark.update() for name, mark of @marks
#@thang.effectNames = ['berserk', 'confuse', 'control', 'curse', 'fear', 'poison', 'paralyze', 'regen', 'sleep', 'slow', 'speed'] #@thang.effectNames = ['berserk', 'confuse', 'control', 'curse', 'fear', 'poison', 'paralyze', 'regen', 'sleep', 'slow', 'haste']
@updateEffectMarks() if @thang?.effectNames?.length or @previousEffectNames?.length @updateEffectMarks() if @thang?.effectNames?.length or @previousEffectNames?.length
updateEffectMarks: -> updateEffectMarks: ->

4
app/lib/surface/Mark.coffee
View file

@ -151,14 +151,14 @@ module.exports = class Mark extends CocoClass
@thangType.fetch() @thangType.fetch()
markThangTypes[name] = @thangType markThangTypes[name] = @thangType
window.mtt = markThangTypes window.mtt = markThangTypes
onLoadedThangType: -> onLoadedThangType: ->
@build() @build()
@toggle(@toggleTo) if @toggleTo? @toggle(@toggleTo) if @toggleTo?
update: (pos=null) -> update: (pos=null) ->
return false unless @on and @mark return false unless @on and @mark
@mark.alpha = if @hidden then 0 else 1 @mark.visible = not @hidden
@updatePosition pos @updatePosition pos
@updateRotation() @updateRotation()
@updateScale() @updateScale()

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

@ -302,7 +302,7 @@ module.exports = Surface = class Surface extends CocoClass
world: @world world: @world
) )
if @lastFrame < @world.totalFrames and @currentFrame >= @world.totalFrames if @lastFrame < @world.totalFrames and @currentFrame >= @world.totalFrames - 1
@spriteBoss.stop() @spriteBoss.stop()
@playbackOverScreen.show() @playbackOverScreen.show()
@ended = true @ended = true

2
app/templates/play/level/modal/multiplayer.jade
View file

@ -30,7 +30,7 @@
if me.get('anonymous') if me.get('anonymous')
p Sign in or create an account and get your solution on the leaderboard! p Sign in or create an account and get your solution on the leaderboard!
else else
a#go-to-leaderboard-button.btn.btn-primary(href="/play/ladder/#{levelSlug}/team/#{team}") Go to the leaderboard! a#go-to-leaderboard-button.btn.btn-primary(href="/play/ladder/#{levelSlug}#my-matches") Go to the leaderboard!
p You can submit your game to be ranked from the leaderboard page. p You can submit your game to be ranked from the leaderboard page.
.modal-footer .modal-footer

2
server/articles/article_schema.coffee
View file

@ -10,4 +10,4 @@ c.extendBasicProperties(ArticleSchema, 'article')
c.extendSearchableProperties(ArticleSchema) c.extendSearchableProperties(ArticleSchema)
c.extendVersionedProperties(ArticleSchema, 'article') c.extendVersionedProperties(ArticleSchema, 'article')
module.exports = ArticleSchema module.exports = ArticleSchema