codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 01:55:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolved conflicts.

Browse source
This commit is contained in:
Scott Erickson 2014-09-25 10:52:36 -07:00
parent 06b106f42b
commit 8fe2ed4438
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/lib/surface/Surface.coffee
View file

@ -553,13 +553,10 @@ module.exports = Surface = class Surface extends CocoClass
@onResize() @onResize()
_.delay @onResize, resizeDelay + 100 # Do it again just to be double sure that we don't stay zoomed in due to timing problems. _.delay @onResize, resizeDelay + 100 # Do it again just to be double sure that we don't stay zoomed in due to timing problems.
@spriteBoss.selfWizardSprite?.toggle true @spriteBoss.selfWizardSprite?.toggle true
<<<<<<< HEAD
@normalCanvas.add(@webGLCanvas).removeClass 'flag-color-selected' @normalCanvas.add(@webGLCanvas).removeClass 'flag-color-selected'
=======
@canvas.removeClass 'flag-color-selected' @canvas.removeClass 'flag-color-selected'
if @previousCameraZoom if @previousCameraZoom
@camera.zoomTo @camera.newTarget or @camera.target, @previousCameraZoom, 3000 @camera.zoomTo @camera.newTarget or @camera.target, @previousCameraZoom, 3000
>>>>>>> master
onFlagColorSelected: (e) -> onFlagColorSelected: (e) ->
@normalCanvas.add(@webGLCanvas).toggleClass 'flag-color-selected', Boolean(e.color) @normalCanvas.add(@webGLCanvas).toggleClass 'flag-color-selected', Boolean(e.color)

7
app/views/play/level/PlayLevelView.coffee
View file

@ -319,14 +319,9 @@ module.exports = class PlayLevelView extends RootView
storage.save 'recently-played-matches', allRecentlyPlayedMatches storage.save 'recently-played-matches', allRecentlyPlayedMatches
initSurface: -> initSurface: ->
<<<<<<< HEAD
webGLSurface = $('canvas#webgl-surface', @$el) webGLSurface = $('canvas#webgl-surface', @$el)
normalSurface = $('canvas#normal-surface', @$el) normalSurface = $('canvas#normal-surface', @$el)
@surface = new Surface(@world, normalSurface, webGLSurface, thangTypes: @supermodel.getModels(ThangType), playJingle: not @isEditorPreview) @surface = new Surface(@world, normalSurface, webGLSurface, thangTypes: @supermodel.getModels(ThangType), playJingle: not @isEditorPreview, wizards: @level.get('type', true) isnt 'hero')
=======
surfaceCanvas = $('canvas#surface', @$el)
@surface = new Surface(@world, surfaceCanvas, thangTypes: @supermodel.getModels(ThangType), playJingle: not @isEditorPreview, wizards: @level.get('type', true) isnt 'hero')
>>>>>>> master
worldBounds = @world.getBounds() worldBounds = @world.getBounds()
bounds = [{x: worldBounds.left, y: worldBounds.top}, {x: worldBounds.right, y: worldBounds.bottom}] bounds = [{x: worldBounds.left, y: worldBounds.top}, {x: worldBounds.right, y: worldBounds.bottom}]
@surface.camera.setBounds(bounds) @surface.camera.setBounds(bounds)