From f538ff542fd4038155a4015db3d51d62022ab3f4 Mon Sep 17 00:00:00 2001 From: Michael Schmatz Date: Tue, 25 Feb 2014 09:12:37 -0800 Subject: [PATCH 1/2] Removed hiredis --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index ba88e3940..665ac0131 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,6 @@ "sendwithus": "2.0.x", "aws-sdk":"~2.0.0", "bayesian-battle":"0.0.x", - "hiredis":"", "redis": "" }, "devDependencies": { From 0380a3052226cc02454873402d0486218448adb4 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Tue, 25 Feb 2014 10:48:23 -0800 Subject: [PATCH 2/2] Fixes for not storing default code in other sessions. sass-brunch 1.8. Removed tutorial link for now. Round wizards. --- app/lib/LevelBus.coffee | 14 +++++--------- app/lib/surface/IndieSprite.coffee | 1 + app/templates/play/ladder.jade | 2 +- app/views/play/level_view.coffee | 2 +- package.json | 2 +- 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/app/lib/LevelBus.coffee b/app/lib/LevelBus.coffee index 520631559..a9c669bf1 100644 --- a/app/lib/LevelBus.coffee +++ b/app/lib/LevelBus.coffee @@ -87,6 +87,9 @@ module.exports = class LevelBus extends Bus # LevelSession object. Either break this off into a separate class # or have the LevelSession object listen for all these events itself. + setSpells: (spells) -> + @onSpellCreated spell: spell for spellKey, spell of spells + onSpellChanged: (e) -> return unless @onPoint() code = @session.get('code') @@ -102,6 +105,7 @@ module.exports = class LevelBus extends Bus onSpellCreated: (e) -> return unless @onPoint() spellTeam = e.spell.team + @teamSpellMap ?= {} @teamSpellMap[spellTeam] ?= [] unless e.spell.spellKey in @teamSpellMap[spellTeam] @@ -109,8 +113,7 @@ module.exports = class LevelBus extends Bus @changedSessionProperties.teamSpells = true @session.set({'teamSpells': @teamSpellMap}) @saveSession() - - + @onSpellChanged e # Save the new spell to the session, too. onScriptStateChanged: (e) -> return unless @onPoint() @@ -236,10 +239,3 @@ module.exports = class LevelBus extends Bus destroy: -> @session.off 'change:multiplayer', @onMultiplayerChanged, @ super() - - setTeamSpellMap: (spellMap) -> - @teamSpellMap = spellMap - console.log @teamSpellMap - @changedSessionProperties.teamSpells = true - @session.set({'teamSpells': @teamSpellMap}) - @saveSession() diff --git a/app/lib/surface/IndieSprite.coffee b/app/lib/surface/IndieSprite.coffee index 8e3f65dc3..ab7f2efda 100644 --- a/app/lib/surface/IndieSprite.coffee +++ b/app/lib/surface/IndieSprite.coffee @@ -22,6 +22,7 @@ module.exports = IndieSprite = class IndieSprite extends CocoSprite thang.width = thang.height = thang.depth = 4 thang.pos = pos ? @defaultPos() thang.pos.z = thang.depth / 2 + thang.shape = 'ellipsoid' thang.rotation = 0 thang.action = 'idle' thang.setAction = (action) -> thang.action = action diff --git a/app/templates/play/ladder.jade b/app/templates/play/ladder.jade index 14a46c52a..66e05ff1b 100644 --- a/app/templates/play/ladder.jade +++ b/app/templates/play/ladder.jade @@ -7,7 +7,7 @@ block content !{description} if !me.get('anonymous') - a(href="http://www.youtube.com/watch?v=IFvfZiJGDsw&list=HL1392928835&feature=mh_lolz").intro-button.btn.btn-primary.btn-lg Watch the Video + //a(href="http://www.youtube.com/watch?v=IFvfZiJGDsw&list=HL1392928835&feature=mh_lolz").intro-button.btn.btn-primary.btn-lg Watch the Video a(href="/play/level/ladder-tutorial").intro-button.btn.btn-primary.btn-lg Play the Tutorial diff --git a/app/views/play/level_view.coffee b/app/views/play/level_view.coffee index 453e4f7c7..008c119a4 100644 --- a/app/views/play/level_view.coffee +++ b/app/views/play/level_view.coffee @@ -393,7 +393,7 @@ module.exports = class PlayLevelView extends View register: -> @bus = LevelBus.get(@levelID, @session.id) @bus.setSession(@session) - @bus.setTeamSpellMap @tome.teamSpellMap + @bus.setSpells @tome.spells @bus.connect() if @session.get('multiplayer') onSessionWillSave: (e) -> diff --git a/package.json b/package.json index 20c2e90da..8a7dd9ec6 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,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.8.0", "css-brunch": "> 1.0 < 1.8", "jade-brunch": "> 1.0 < 1.8", "uglify-js-brunch": "~1.7.4",