codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-29 07:24:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'production'

Browse source
This commit is contained in:
Scott Erickson 2014-02-20 11:47:02 -08:00
commit 5cefb8fc30
4 changed files with 9 additions and 4 deletions
app
lib/surface
SpriteBoss.coffee
styles/play/level
playback.sass
templates/play/level
playback.jade
views/play/level
hud_view.coffee

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

@ -104,7 +104,7 @@ module.exports = class SpriteBoss extends CocoClass
unless thangType = @thangTypeFor indieSprite.thangType unless thangType = @thangTypeFor indieSprite.thangType
console.warn "Need to convert #{indieSprite.id}'s ThangType #{indieSprite.thangType} to a ThangType reference. Until then, #{indieSprite.id} won't show up." console.warn "Need to convert #{indieSprite.id}'s ThangType #{indieSprite.thangType} to a ThangType reference. Until then, #{indieSprite.id} won't show up."
return return
sprite = new IndieSprite thangType, @createSpriteOptions {thangID: indieSprite.id, pos: indieSprite.pos, sprites: @sprites} sprite = new IndieSprite thangType, @createSpriteOptions {thangID: indieSprite.id, pos: indieSprite.pos, sprites: @sprites, colorConfig: indieSprite.colorConfig}
@addSprite sprite, sprite.thang.id @addSprite sprite, sprite.thang.id
createWizardSprite: (options) -> createWizardSprite: (options) ->

4
app/styles/play/level/playback.sass
View file

@ -26,6 +26,10 @@
#music-button #music-button
@include opacity(0.25) @include opacity(0.25)
font-size: 20px font-size: 20px
span
position: relative
left: -3px
top: -2px
&:hover &:hover
@include opacity(0.50) @include opacity(0.50)
&.music-on &.music-on

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

@ -8,7 +8,7 @@ button.btn.btn-xs.btn-inverse#volume-button(title="Adjust volume")
i.icon-volume-down.icon-white.big i.icon-volume-down.icon-white.big
i.icon-volume-up.icon-white.big i.icon-volume-up.icon-white.big
button.btn.btn-xs.btn-inverse#music-button(title="Toggle Music") button.btn.btn-xs.btn-inverse#music-button(title="Toggle Music")
| ♫ span ♫
.scrubber .scrubber
.progress.secret .progress.secret

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

@ -93,7 +93,7 @@ module.exports = class HUDView extends View
return if speakerSprite is @speakerSprite return if speakerSprite is @speakerSprite
@speakerSprite = speakerSprite @speakerSprite = speakerSprite
@speaker = @speakerSprite.thang.id @speaker = @speakerSprite.thang.id
@createAvatar @speakerSprite.thangType, @speakerSprite.thang @createAvatar @speakerSprite.thangType, @speakerSprite.thang, @speakerSprite.options.colorConfig
@$el.removeClass 'no-selection' @$el.removeClass 'no-selection'
@switchToDialogueElements() @switchToDialogueElements()
@ -107,9 +107,10 @@ module.exports = class HUDView extends View
@bubble = null @bubble = null
@update() @update()
createAvatar: (thangType, thang) -> createAvatar: (thangType, thang, colorConfig) ->
options = thang.getSpriteOptions() or {} options = thang.getSpriteOptions() or {}
options.async = false options.async = false
options.colorConfig = colorConfig
stage = thangType.getPortraitStage options stage = thangType.getPortraitStage options
wrapper = @$el.find '.thang-canvas-wrapper' wrapper = @$el.find '.thang-canvas-wrapper'
newCanvas = $(stage.canvas).addClass('thang-canvas') newCanvas = $(stage.canvas).addClass('thang-canvas')