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:
Scott Erickson 2014-02-26 18:49:43 -08:00
commit 4e8c0b65e2
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/lib/LevelBus.coffee
View file

@ -113,7 +113,6 @@ module.exports = class LevelBus extends Bus
@changedSessionProperties.teamSpells = true @changedSessionProperties.teamSpells = true
@session.set({'teamSpells': @teamSpellMap}) @session.set({'teamSpells': @teamSpellMap})
@saveSession() @saveSession()
console.log spellTeam, me.team, e.spell.spellKey
if spellTeam is me.team if spellTeam is me.team
@onSpellChanged e # Save the new spell to the session, too. @onSpellChanged e # Save the new spell to the session, too.

2
app/templates/play/level/control_bar.jade
View file

@ -6,7 +6,7 @@ h4.home
h4.title #{worldName} h4.title #{worldName}
button.btn.btn-xs.btn-inverse.banner#docs-button(title="Show level instructions", data-i18n="play_level.guide") Guide button.btn.btn-xs.btn-success.banner#docs-button(title="Show level instructions", data-i18n="play_level.guide") Guide
if ladderGame if ladderGame
button.btn.btn-xs.btn-inverse.banner#multiplayer-button(title="Leaderboard", data-i18n="play_level.leaderboard") Leaderboard button.btn.btn-xs.btn-inverse.banner#multiplayer-button(title="Leaderboard", data-i18n="play_level.leaderboard") Leaderboard

2
app/views/play/level/hud_view.coffee
View file

@ -270,7 +270,7 @@ module.exports = class HUDView extends View
if prop is "rotation" if prop is "rotation"
return (val * 180 / Math.PI).toFixed(0) + "˚" return (val * 180 / Math.PI).toFixed(0) + "˚"
if typeof val is 'number' if typeof val is 'number'
if Math.round(val) == val then return val.toFixed(0) # int if Math.round(val) == val or prop is 'gold' then return val.toFixed(0) # int
if -10 < val < 10 then return val.toFixed(2) if -10 < val < 10 then return val.toFixed(2)
if -100 < val < 100 then return val.toFixed(1) if -100 < val < 100 then return val.toFixed(1)
return val.toFixed(0) return val.toFixed(0)