Merge branch 'master' into production

app/core/ParticleMan.coffee

@@ -112,7 +112,8 @@ vec = (x, y, z) ->
 defaults =
   group:
     texture: 'star'
-    maxAge: 4
+    maxAge: 1.9
+    radius: 0.75
     hasPerspective: 1
     colorize: 1
     transparent: 1
@@ -121,20 +122,21 @@ defaults =
     depthTest: true
     blending: THREE.NormalBlending
   emitter:
-    type: "cube"
-    particleCount: 60
+    type: "disk"
+    particleCount: 100
+    radius: 1
     position: vec 0, 0, 0
     positionSpread: vec 1, 0, 1
-    acceleration: vec 0, -1, 0
+    acceleration: vec 0, 2, 0
     accelerationSpread: vec 0, 0, 0
     velocity: vec 0, 4, 0
     velocitySpread: vec 2, 2, 2
     sizeStart: 6
-    sizeStartSpread: 0
+    sizeStartSpread: 1
     sizeMiddle: 4
-    sizeMiddleSpread: 0
+    sizeMiddleSpread: 1
     sizeEnd: 2
-    sizeEndSpread: 0
+    sizeEndSpread: 1
     angleStart: 0
     angleStartSpread: 0
     angleMiddle: 0

app/views/play/CampaignView.coffee

@@ -206,7 +206,7 @@ module.exports = class CampaignView extends RootView
           for nextLevelOriginal in level.nextLevels ? []
             if nextLevel = _.find(@campaign.renderedLevels, original: nextLevelOriginal)
               @createLine level.position, nextLevel.position
-      @showLeaderboard @options.justBeatLevel?.get('slug') if @options.showLeaderboard or true
+      @showLeaderboard @options.justBeatLevel?.get('slug') if @options.showLeaderboard# or true
     @applyCampaignStyles()
     @testParticles()
 
@@ -220,7 +220,7 @@ module.exports = class CampaignView extends RootView
     @openModalView authModal
 
   showLeaderboard: (levelSlug) ->
-    levelSlug ?= 'siege-of-stonehold'  # Testing
+    #levelSlug ?= 'siege-of-stonehold'  # Testing
     leaderboardModal = new LeaderboardModal supermodel: @supermodel, levelSlug: levelSlug
     @openModalView leaderboardModal