codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-02-17 17:02:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-10-25 16:26:10 -07:00
commit 80adc28947
4 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/level/pointer.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 16 KiB

3
app/styles/play/world-map-view.sass
View file

@ -291,3 +291,6 @@ $gameControlMargin: 30px
body:not(.ipad) #world-map-view body:not(.ipad) #world-map-view
.level-info-container .level-info-container
pointer-events: none pointer-events: none
.old-levels
display: none

4
app/views/play/level/tome/SpellPaletteView.coffee
View file

@ -225,7 +225,9 @@ module.exports = class SpellPaletteView extends CocoView
@entryGroups = _.groupBy @entries, (entry) -> itemsByProp[entry.doc.name]?.get('name') ? 'Hero' @entryGroups = _.groupBy @entries, (entry) -> itemsByProp[entry.doc.name]?.get('name') ? 'Hero'
iOSEntryGroups = {} iOSEntryGroups = {}
for group, entries of @entryGroups for group, entries of @entryGroups
iOSEntryGroups[group] = (entry.doc for entry in entries) iOSEntryGroups[group] =
item: {name: group, imageURL: itemThangTypes[group]?.getPortraitURL()}
props: (entry.doc for entry in entries)
Backbone.Mediator.publish 'tome:palette-updated', thangID: @thang.id, entryGroups: JSON.stringify(iOSEntryGroups) Backbone.Mediator.publish 'tome:palette-updated', thangID: @thang.id, entryGroups: JSON.stringify(iOSEntryGroups)
addEntry: (doc, shortenize, tabbify, isSnippet=false, item=null, showImage=false) -> addEntry: (doc, shortenize, tabbify, isSnippet=false, item=null, showImage=false) ->

1
app/views/play/level/tome/SpellView.coffee
View file

@ -375,6 +375,7 @@ module.exports = class SpellView extends CocoView
reloadCode: (cast=true) -> reloadCode: (cast=true) ->
@updateACEText @spell.originalSource @updateACEText @spell.originalSource
@recompile cast @recompile cast
Backbone.Mediator.publish 'tome:spell-loaded', spell: @spell
recompileIfNeeded: => recompileIfNeeded: =>
@recompile() if @recompileNeeded @recompile() if @recompileNeeded