codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-01 03:16:56 -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-03-16 17:37:54 -07:00
commit eee15b4b0c
4 changed files with 47 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/workers/worker_world.js
View file

@ -279,12 +279,13 @@ self.retrieveValueFromFrame = function retrieveValueFromFrame(args) {
self.enableFlowOnThangSpell = function (thangID, spellID, userCodeMap) {
try {
var options = userCodeMap[thangID][spellID].originalOptions;
if (options.includeFlow === true && options.noSerializationInFlow === true)
if (options.includeFlow === true && options.noSerializationInFlow === true && options.noVariablesInFlow === false)
return;
else
{
options.includeFlow = true;
options.noSerializationInFlow = true;
options.noVariablesInFlow = false;
var temporaryAether = Aether.deserialize(userCodeMap[thangID][spellID]);
temporaryAether.transpile(temporaryAether.raw);
userCodeMap[thangID][spellID] = temporaryAether.serialize();

2
app/lib/aether_utils.coffee
View file

@ -9,6 +9,8 @@ module.exports.createAetherOptions = (options) ->
functionName: options.functionName
protectAPI: not options.skipProtectAPI
includeFlow: Boolean options.includeFlow
noVariablesInFlow: true
skipDuplicateUserInfoInFlow: true # Optimization that won't work if we are stepping with frames
yieldConditionally: options.functionName is 'plan'
simpleLoops: true
globals: ['Vector', '_']

4
app/models/ThangType.coffee
View file

@ -234,7 +234,11 @@ module.exports = class ThangType extends CocoModel
getPortraitStage: (spriteOptionsOrKey, size=100) ->
canvas = $("<canvas width='#{size}' height='#{size}'></canvas>")
try
stage = new createjs.Stage(canvas[0])
catch err
console.error "Error trying to create #{@get('name')} avatar stage:", err, "with window as", window
return null
return stage unless @isFullyLoaded()
key = spriteOptionsOrKey
key = if _.isString(key) then key else @spriteSheetKey(@fillOptions(key))

25
app/styles/play/modal/play-items-modal.sass
View file

@ -13,7 +13,6 @@
overflow: hidden
text-overflow: ellipsis
//- Clear modal defaults
.modal-dialog
padding: 0
@ -31,7 +30,6 @@
display: none
//- Header
h1
position: absolute
left: 200px
@ -41,9 +39,7 @@
text-shadow: black 4px 4px 0, black -4px -4px 0, black 4px -4px 0, black -4px 4px 0, black 4px 0px 0, black 0px -4px 0, black -4px 0px 0, black 0px 4px 0
margin: 0
//- Gems count
#gems-count-container
position: absolute
left: 425px
@ -59,9 +55,7 @@
font-size: 25px
color: rgb(1,64,91)
//- Close modal button
#close-modal
position: absolute
left: 602px
@ -78,9 +72,7 @@
&:hover
color: yellow
//- Nav bar
.nav
position: absolute
top: 125px
@ -102,7 +94,6 @@
font-weight: bold
padding: 10px 7px
li.active
background: url(/images/pages/play/modal/menu-tab-selected.png)
width: 197px
@ -110,9 +101,7 @@
a
color: white
//- Hero Type Select
#hero-type-select
position: absolute
top: 102px
@ -133,9 +122,7 @@
border: 2px solid rgb(64,53,41)
color: white
//- Item List
.tab-content
position: absolute
top: 116px
@ -162,9 +149,7 @@
.nano-content
padding: 26px 51px 26px 26px
//- Item box
.item
cursor: pointer
width: 187px
@ -260,9 +245,7 @@
&.selected
background: url(/images/pages/play/modal/item-box-background-selected.png)
//- Item details. Non-specific item-details-view styling is in item-details-view.sass.
#item-details-view
#item-title
@ -275,11 +258,9 @@
#selected-item-unlock-button
left: 856px
#play-items-modal, #inventory-modal
//- Item list scrollbar
.nano-pane
width: 16px
background: black
@ -292,9 +273,7 @@
margin-left: -3px
margin-right: -3px
//- Item icons w/shadows (both in list and details areas)
.item-img, .item-shadow, .item-silhouette
position: absolute
margin-left: auto
@ -328,9 +307,7 @@
font-weight: bold
z-index: 2
//- Unlock buttons (both in list and details areas)
.unlock-button
position: absolute
border: 3px solid rgb(7,65,83)
@ -353,7 +330,6 @@
margin-top: 20px
//- Use the two-column layout and background image if we are on a narrow screen.
@media only screen and (max-width: 1300px)
#play-items-modal
overflow-x: hidden
@ -401,4 +377,3 @@ body[lang='pt-PT'], body[lang^='pt-BR']
body[lang='ru']
#play-items-modal .unlock-button
font-size: 10px