codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-01 15:50:11 -04: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-10-03 09:11:12 -07:00
commit 64acbe4580
6 changed files with 11 additions and 10 deletions

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

@ -53,7 +53,7 @@ module.exports = class MusicPlayer extends CocoClass
@currentMusic = createjs.Sound.play(src, 'none', 0, 0, -1, 0.3) if src
return unless @currentMusic
@currentMusic.volume = 0.0
if me.get('music')
if me.get('music', true)
createjs.Tween.get(@currentMusic).to({volume: MUSIC_VOLUME}, CROSSFADE_LENGTH)
onMusicSettingChanged: ->
@ -62,7 +62,7 @@ module.exports = class MusicPlayer extends CocoClass
updateMusicVolume: ->
return unless @currentMusic
createjs.Tween.removeTweens(@currentMusic)
@currentMusic.volume = if me.get('music') then MUSIC_VOLUME else 0.0
@currentMusic.volume = if me.get('music', true) then MUSIC_VOLUME else 0.0
onRealTimePlaybackStarted: (e) ->
@previousMusic = @currentMusic

2
app/views/game-menu/OptionsView.coffee
View file

@ -42,7 +42,7 @@ module.exports = class OptionsView extends CocoView
@aceConfig = _.cloneDeep me.get('aceConfig') ? {}
@aceConfig = _.defaults @aceConfig, @defaultConfig
c.aceConfig = @aceConfig
c.music = me.get('music')
c.music = me.get('music', true)
c.autorunDelay = me.get('autocastDelay') ? 5000
c

8
app/views/play/WorldMapView.coffee
View file

@ -611,8 +611,8 @@ hero = [
id: 'the-second-kithmaze'
original: '5418cf256bae62f707c7e1c3'
description: 'Many have tried, few have found their way through this maze.'
x: 67
y: 41
x: 55.54
y: 26.96
}
{
name: 'New Sight'
@ -621,8 +621,8 @@ hero = [
id: 'new-sight'
original: '5418d40f4c16460000ab9ac2'
description: 'A true name can only be seen with the correct lenses.'
x: 55.54
y: 26.96
x: 67
y: 41
}
{
name: 'Lowly Kithmen'

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

@ -389,7 +389,7 @@ module.exports = class LevelPlaybackView extends CocoView
onToggleMusic: (e) ->
e?.preventDefault()
me.set('music', not me.get('music'))
me.set('music', not me.get('music', true))
me.patch()
$(document.activeElement).blur()

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

@ -604,7 +604,7 @@ module.exports = class PlayLevelView extends RootView
if finishedLoading
@lastWorldFramesLoaded = 0
if @waitingForSubmissionComplete
@onSubmissionComplete()
_.defer @onSubmissionComplete # Give it a frame to make sure we have the latest goals
@waitingForSubmissionComplete = false
else
@lastWorldFramesLoaded = @world.frames.length

3
package.json
View file

@ -75,7 +75,7 @@
"javascript-brunch": "> 1.0 < 1.8",
"coffee-script-brunch": "https://github.com/brunch/coffee-script-brunch/tarball/master",
"coffeelint-brunch": "> 1.0 < 1.8",
"sass-brunch": "1.7.0",
"sass-brunch": "1.7.2",
"css-brunch": "> 1.0 < 1.8",
"jade-brunch": "> 1.0 < 1.8",
"uglify-js-brunch": "~1.7.4",
@ -86,6 +86,7 @@
"marked": "0.2.x",
"telepath-brunch": "https://github.com/nwinter/telepath-brunch/tarball/master",
"bower": "~1.3.8",
"bless-brunch": "https://github.com/ThomasConner/bless-brunch/tarball/master",
"karma-script-launcher": "~0.1.0",
"karma-chrome-launcher": "~0.1.2",
"karma-firefox-launcher": "~0.1.3",