codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 02:25:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2015-01-31 10:38:01 -08:00
commit 7c561e5b24
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/core/ParticleMan.coffee
View file

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

4
app/views/play/CampaignView.coffee
View file

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