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

Merge branch 'master' into feature/thangload

Browse source 
Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee
This commit is contained in:
Scott Erickson 2014-05-02 08:20:03 -07:00
parent 92687b17de
commit 2952d7702c
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/lib/LevelLoader.coffee
View file

@ -105,7 +105,6 @@ module.exports = class LevelLoader extends CocoClass
objUniq = (array) -> _.uniq array, false, (arg) -> JSON.stringify(arg) objUniq = (array) -> _.uniq array, false, (arg) -> JSON.stringify(arg)
<<<<<<< HEAD
thangNames = new ThangNamesCollection(thangIDs) thangNames = new ThangNamesCollection(thangIDs)
@supermodel.loadCollection thangNames, 'thang_names' @supermodel.loadCollection thangNames, 'thang_names'
# for thangID in _.uniq thangIDs # for thangID in _.uniq thangIDs
@ -113,14 +112,6 @@ module.exports = class LevelLoader extends CocoClass
# url += "?project=true" if @headless and not @editorMode # url += "?project=true" if @headless and not @editorMode
# res = @maybeLoadURL url, ThangType, 'thang' # res = @maybeLoadURL url, ThangType, 'thang'
# @listenToOnce res.model, 'sync', @buildSpriteSheetsForThangType if res # @listenToOnce res.model, 'sync', @buildSpriteSheetsForThangType if res
=======
for thangID in _.uniq thangIDs
url = "/db/thang.type/#{thangID}/version"
url += "?project=true" if @headless and not @editorMode
res = @maybeLoadURL url, ThangType, 'thang'
@listenToOnce res.model, 'sync', @buildSpriteSheetsForThangType if res
>>>>>>> master
for obj in objUniq componentVersions for obj in objUniq componentVersions
url = "/db/level.component/#{obj.original}/version/#{obj.majorVersion}" url = "/db/level.component/#{obj.original}/version/#{obj.majorVersion}"
@maybeLoadURL url, LevelComponent, 'component' @maybeLoadURL url, LevelComponent, 'component'

5
app/views/play/level_view.coffee
View file

@ -93,9 +93,6 @@ module.exports = class PlayLevelView extends View
@load() @load()
application.tracker?.trackEvent 'Started Level Load', level: @levelID, label: @levelID application.tracker?.trackEvent 'Started Level Load', level: @levelID, label: @levelID
<<<<<<< HEAD
setLevel: (@level, @supermodel) ->
=======
onLevelLoadError: (e) -> onLevelLoadError: (e) ->
# TODO NOW: remove this in favor of the supermodel handling it # TODO NOW: remove this in favor of the supermodel handling it
application.router.navigate "/play?not_found=#{@levelID}", {trigger: true} application.router.navigate "/play?not_found=#{@levelID}", {trigger: true}
@ -104,8 +101,6 @@ module.exports = class PlayLevelView extends View
@supermodel.models = givenSupermodel.models @supermodel.models = givenSupermodel.models
@supermodel.collections = givenSupermodel.collections @supermodel.collections = givenSupermodel.collections
@supermodel.shouldSaveBackups = givenSupermodel.shouldSaveBackups @supermodel.shouldSaveBackups = givenSupermodel.shouldSaveBackups
>>>>>>> master
@god?.level = @level.serialize @supermodel @god?.level = @level.serialize @supermodel
if @world if @world
serializedLevel = @level.serialize(@supermodel) serializedLevel = @level.serialize(@supermodel)