Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-12-28 13:53:59 -08:00
commit 15e7f0074d

View file

@ -301,7 +301,6 @@ module.exports = class HeroVictoryModal extends ModalView
getNextLevelCampaign: -> getNextLevelCampaign: ->
{'kithgard-gates': 'forest', 'siege-of-stonehold': 'desert'}[@level.get('slug')] or @level.get 'campaign' # Much easier to just keep this updated than to dynamically figure it out. {'kithgard-gates': 'forest', 'siege-of-stonehold': 'desert'}[@level.get('slug')] or @level.get 'campaign' # Much easier to just keep this updated than to dynamically figure it out.
link += '/' + nextCampaign unless nextCampaign is 'dungeon'
getNextLevelLink: -> getNextLevelLink: ->
link = '/play' link = '/play'