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

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-08-28 09:52:10 -07:00
commit c71b10ad71
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/schemas/subscriptions/play.coffee
View file

@ -37,6 +37,7 @@ module.exports =
'level:set-time': c.object {}, 'level:set-time': c.object {},
time: {type: 'number', minimum: 0} time: {type: 'number', minimum: 0}
ratio: {type: 'number', minimum: 0, maximum: 1} ratio: {type: 'number', minimum: 0, maximum: 1}
ratioOffset: {type: 'number'}
frameOffset: {type: 'integer'} frameOffset: {type: 'integer'}
scrubDuration: {type: 'integer', minimum: 0} scrubDuration: {type: 'integer', minimum: 0}

2
app/views/play/level/tome/TomeView.coffee
View file

@ -222,7 +222,7 @@ module.exports = class TomeView extends CocoView
spell spell
reloadAllCode: -> reloadAllCode: ->
spell.view.reloadCode false for spellKey, spell of @spells when spell.team is me.team or (spell.team in ['common', 'neutral', null]) spell.view.reloadCode false for spellKey, spell of @spells when spell.view and (spell.team is me.team or (spell.team in ['common', 'neutral', null]))
Backbone.Mediator.publish 'tome:cast-spells', spells: @spells, preload: false, realTime: false Backbone.Mediator.publish 'tome:cast-spells', spells: @spells, preload: false, realTime: false
updateLanguageForAllSpells: (e) -> updateLanguageForAllSpells: (e) ->