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' into production

Browse source
This commit is contained in:
Nick Winter 2014-12-29 20:06:40 -08:00
commit bc08d98e4a
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/Level.coffee
View file

@ -123,6 +123,9 @@ module.exports = class Level extends CocoModel
else if placeholderConfig.extraHUDProperties else if placeholderConfig.extraHUDProperties
levelThangComponent.config ?= {} levelThangComponent.config ?= {}
levelThangComponent.config.extraHUDProperties = _.union(levelThangComponent.config.extraHUDProperties ? [], placeholderConfig.extraHUDProperties) levelThangComponent.config.extraHUDProperties = _.union(levelThangComponent.config.extraHUDProperties ? [], placeholderConfig.extraHUDProperties)
else if placeholderConfig.voiceRange # Pull in voiceRange
levelThangComponent.config ?= {}
levelThangComponent.config.voiceRange = placeholderConfig.voiceRange
if isHero if isHero
if equips = _.find levelThang.components, {original: LevelComponent.EquipsID} if equips = _.find levelThang.components, {original: LevelComponent.EquipsID}

2
app/views/editor/campaign/CampaignEditorView.coffee
View file

@ -201,7 +201,7 @@ module.exports = class CampaignEditorView extends RootView
onCampaignLevelClicked: (levelOriginal) -> onCampaignLevelClicked: (levelOriginal) ->
return unless levelTreema = @treema.childrenTreemas?.levels?.childrenTreemas?[levelOriginal] return unless levelTreema = @treema.childrenTreemas?.levels?.childrenTreemas?[levelOriginal]
if key.ctrl if key.ctrl or key.command
url = "/editor/level/#{levelTreema.data.slug}" url = "/editor/level/#{levelTreema.data.slug}"
window.open url, '_blank' window.open url, '_blank'
levelTreema.select() levelTreema.select()