Merge branch 'master' of https://github.com/codecombat/codecombat

app/lib/surface/CocoSprite.coffee

@@ -171,15 +171,15 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     # Gets the sprite to reflect what the current state of the thangs and surface are
     return if @stillLoading
     @updatePosition()
-    return unless frameChanged
-    @updateScale()
-    @updateAlpha()
-    @updateRotation()
-    @updateAction()
-    @updateStats()
+    if frameChanged
+      @updateScale()
+      @updateAlpha()
+      @updateRotation()
+      @updateAction()
+      @updateStats()
+      @updateGold()
     @updateMarks()
     @updateLabels()
-    @updateGold()
 
   cache: ->
     bounds = @imageObject.getBounds()
@@ -252,7 +252,7 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
     return unless @currentAction
     return if _.string.endsWith(@currentAction.name, 'back')
     return if _.string.endsWith(@currentAction.name, 'fore')
-    @imageObject.scaleX *= -1 if Math.abs(rotation) >= 90
+    imageObject.scaleX *= -1 if Math.abs(rotation) >= 90
 
   ##################################################
   updateAction: ->

app/treema-ext.coffee

@@ -107,7 +107,7 @@ class SoundFileTreema extends TreemaNode.nodeMap.string
     if @data
       valEl.append(playButton)
       valEl.append(stopButton)
-    valEl.append(dropdown) if files.length
+    valEl.append(dropdown) if files.length and @canEdit()
     if @data
       path = @data.split('/')
       name = path[path.length-1]

app/views/contribute/artisan_view.coffee

@@ -19,4 +19,6 @@ module.exports = class ArtisanView extends ContributeClassView
     {name: "Axandre Oge", avatar: "axandre"}
     {name: "Katharine Chan", avatar: "katharine"}
     {name: "Derek Wong", avatar: "derek"}
+    {name: "Alexandru Caciulescu", avatar: ""}
+    {name: "Prabh Simran Singh Baweja", avatar: ""}
   ]

app/views/play/level/tome/spell_view.coffee

@@ -91,6 +91,9 @@ module.exports = class SpellView extends View
     addCommand
       name: 'end-current-script'
       bindKey: {win: 'Shift-Space', mac: 'Shift-Space'}
+      passEvent: true  # https://github.com/ajaxorg/ace/blob/master/lib/ace/keyboard/keybinding.js#L114
+      # No easy way to selectively cancel shift+space, since we don't get access to the event.
+      # Maybe we could temporarily set ourselves to read-only if we somehow know that a script is active?
       exec: -> Backbone.Mediator.publish 'level:shift-space-pressed'
     addCommand
       name: 'end-all-scripts'

app/views/play_view.coffee

@@ -166,9 +166,9 @@ module.exports = class PlayView extends View
         difficulty: 1
         id: 'sword-loop'
         image: '/file/db/level/525dc5589a0765e496000006/drink_me_icon.png'
-        description: 'Kill the ogres and save the peasants and their cattle'
+        description: 'Kill the ogres and save the peasants and their cattle. - by Prabh Simran Singh Baweja'
       }
-        
+
       {
         name: 'Enemy Artillery'
         difficulty: 1

server_setup.coffee

@@ -84,7 +84,7 @@ exports.setupMiddleware = (app) ->
 ###Routing function implementations###
 
 setupFallbackRouteToIndex = (app) ->
-  app.get '*', (req, res) ->
+  app.all '*', (req, res) ->
     res.sendfile path.join(__dirname, 'public', 'index.html')
 
 setupFacebookCrossDomainCommunicationRoute = (app) ->