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

Merge pull request #1290 from jayant1992/master

Browse source 
Takes care of minor issues with terrain generator
This commit is contained in:
Nick Winter 2014-07-10 13:24:58 -07:00
commit b82e828272
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/templates/modal/terrain_randomise.jade
View file

@ -12,3 +12,4 @@ block modal-body-content
div.preset-name div.preset-name
span(data-i18n="ladder.grassy") Grassy span(data-i18n="ladder.grassy") Grassy
//- for model in models //- for model in models
block modal-footer

1
app/views/editor/level/thangs_tab_view.coffee
View file

@ -228,6 +228,7 @@ module.exports = class ThangsTabView extends View
for thang in e.thangs for thang in e.thangs
@selectAddThangType thang.id @selectAddThangType thang.id
@addThang @addThangType, thang.pos @addThang @addThangType, thang.pos
@selectAddThangType null
# TODO: figure out a good way to have all Surface clicks and Treema clicks just proxy in one direction, so we can maintain only one way of handling selection and deletion # TODO: figure out a good way to have all Surface clicks and Treema clicks just proxy in one direction, so we can maintain only one way of handling selection and deletion
onExtantThangSelected: (e) -> onExtantThangSelected: (e) ->

1
app/views/modal/terrain_randomise_modal.coffee
View file

@ -91,6 +91,7 @@ module.exports = class TerrainRandomiseModal extends ModalView
Backbone.Mediator.publish('randomise:terrain-generated', Backbone.Mediator.publish('randomise:terrain-generated',
'thangs': @thangs 'thangs': @thangs
) )
@hide()
randomiseThangs: (presetName, presetSize) -> randomiseThangs: (presetName, presetSize) ->
preset = presets[presetName] preset = presets[presetName]