Skip to content

Commit

Permalink
Merge pull request #26606 from code-dot-org/staging
Browse files Browse the repository at this point in the history
DTT (Staging > Test) [robo-dtt]
  • Loading branch information
deploy-code-org committed Jan 15, 2019
2 parents 644f241 + 820b610 commit 6c0151b
Show file tree
Hide file tree
Showing 14 changed files with 1,072 additions and 12 deletions.
2 changes: 1 addition & 1 deletion dashboard/app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
= render file: Rails.root.join('..', 'shared', 'haml', 'answerdash.haml') if view_options[:answerdash]
= javascript_include_tag 'application'
= javascript_include_tag "js/#{js_locale}/common_locale"
= javascript_include_tag '//cdn.optimizely.com/js/400912536.js' if Rails.env.production?
= javascript_include_tag '//cdn.optimizely.com/js/12977480133.js' # if Rails.env.production?
%script{src: minifiable_asset_path('js/code-studio-common.js')}
= csrf_meta_tags
= yield :head
Expand Down
3 changes: 3 additions & 0 deletions dashboard/config/scripts/gamelab.script
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ level 'Gamelab StartScreen State'
level 'Gamelab StartScreen Check State'
level 'Gamelab StartScreen Check States'
level 'Gamelab StartScreen Change State'
level 'Gamelab StartScreen End Game'
level 'Gamelab StartScreen Restart Game'
level 'Gamelab StartScreen Hide Sprites'

stage 'Start and End Screens2'
level 'Gamelab StartScreen Intro'
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
<Gamelab>
<config><![CDATA[{
"game_id": 50,
"created_at": "2019-01-14T20:39:52.000Z",
"level_num": "custom",
"user_id": 324,
"properties": {
"skin": "gamelab",
"code_functions": {
"draw": null,
"drawSprites": null,
"playSound": null,
"stopSound": null,
"keyDown": null,
"keyWentDown": null,
"keyWentUp": null,
"mouseDidMove": null,
"mouseDown": null,
"mouseIsOver": null,
"mouseWentDown": null,
"mouseWentUp": null,
"mousePressedOver": null,
"showMobileControls": null,
"World.mouseX": null,
"World.mouseY": null,
"World.frameRate": null,
"World.frameCount": null,
"World.seconds": null,
"World.width": null,
"World.height": null,
"World.allSprites": null,
"camera.on": null,
"camera.off": null,
"camera.isActive": null,
"camera.mouseX": null,
"camera.mouseY": null,
"camera.x": null,
"camera.y": null,
"camera.zoom": null,
"comment_GameLab": null,
"var sprite = createSprite": null,
"setAnimation": null,
"x": null,
"y": null,
"velocityX": null,
"velocityY": null,
"scale": null,
"sprite.height": null,
"sprite.width": null,
"visible": null,
"rotation": null,
"rotationSpeed": null,
"rotateToDirection": null,
"debug": null,
"isTouching": null,
"collide": null,
"displace": null,
"overlap": null,
"bounce": null,
"bounceOff": null,
"bounciness": null,
"setCollider": null,
"createEdgeSprites": null,
"shapeColor": null,
"tint": null,
"setVelocity": null,
"getDirection": null,
"getSpeed": null,
"setSpeedAndDirection": null,
"pointTo": null,
"mirrorX": null,
"mirrorY": null,
"getScaledWidth": null,
"getScaledHeight": null,
"lifetime": null,
"nextFrame": null,
"pause": null,
"play": null,
"setFrame": null,
"depth": null,
"destroy": null,
"comment_Sprites": null,
"var group = createGroup": null,
"add": null,
"remove": null,
"clear": null,
"contains": null,
"get": null,
"group.isTouching": null,
"group.bounce": null,
"group.bounceOff": null,
"group.collide": null,
"group.displace": null,
"group.overlap": null,
"maxDepth": null,
"minDepth": null,
"destroyEach": null,
"pointToEach": null,
"setAnimationEach": null,
"setColorEach": null,
"setColliderEach": null,
"setDepthEach": null,
"setHeightEach": null,
"setLifetimeEach": null,
"setMirrorXEach": null,
"setMirrorYEach": null,
"setRotateToDirectionEach": null,
"setRotationEach": null,
"setRotationSpeedEach": null,
"setScaleEach": null,
"setSpeedAndDirectionEach": null,
"setTintEach": null,
"setVelocityEach": null,
"setVelocityXEach": null,
"setVelocityYEach": null,
"setVisibleEach": null,
"setWidthEach": null,
"comment_Groups": null,
"background": null,
"fill": null,
"noFill": null,
"stroke": null,
"strokeWeight": null,
"noStroke": null,
"rgb": null,
"rect": null,
"ellipse": null,
"text": null,
"textAlign": null,
"textFont": null,
"textSize": null,
"arc": null,
"line": null,
"point": null,
"regularPolygon": null,
"shape": null,
"comment_Drawing": null,
"forLoop_i_0_4": null,
"ifBlock": null,
"ifElseBlock": null,
"whileBlock": null,
"comment_Control": null,
"addOperator": null,
"subtractOperator": null,
"multiplyOperator": null,
"divideOperator": null,
"equalityOperator": null,
"inequalityOperator": null,
"greaterThanOperator": null,
"greaterThanOrEqualOperator": null,
"lessThanOperator": null,
"lessThanOrEqualOperator": null,
"andOperator": null,
"orOperator": null,
"notOperator": null,
"randomNumber_min_max": null,
"mathRound": null,
"mathAbs": null,
"mathMax": null,
"mathMin": null,
"mathRandom": null,
"comment_Math": null,
"declareAssign_x": null,
"declareNoAssign_x": null,
"assign_x": null,
"console.log": null,
"declareAssign_str_hello_world": null,
"substring": null,
"indexOf": null,
"includes": null,
"length": null,
"toUpperCase": null,
"toLowerCase": null,
"declareAssign_list_abd": null,
"listLength": null,
"comment_Variables": null,
"functionParams_none": null,
"functionParams_n": null,
"callMyFunction": null,
"callMyFunction_n": null,
"return": null,
"comment": null
},
"show_debug_watch": true,
"contained_level_names": null,
"preload_asset_list": null
},
"published": true
}]]></config>
<blocks/>
</Gamelab>
Original file line number Diff line number Diff line change
Expand Up @@ -198,17 +198,17 @@
"start_in_animation_tab": "false",
"all_animations_single_frame": "false",
"pause_animations_by_default": "false",
"long_instructions": "# Changing the State\r\n\r\nNow that you can display a different screen according to the state of your program, you will need a way to change between states. To go from the \"starting\" state to the \"playing\" state, you can have the user press the \"s\" key. You'll **only** want the program to check for the key press when the program is in the \"starting\" state, so your code for this will go inside the \"starting\" conditional.\r\n\r\n## Do this\r\n* Inside the `if` statement that checks for \"starting\", add in a new `if` statement that checks whether the user has pressed the \"s\" key. (`if (keyDown(\"s\")) {`)\r\n* Inside your new `if` statement, set the value of your `gameState` variable to \"playing\". (`gameState = \"playing\";`)\r\n* Test the code by starting the game and pressing \"s\". The game should start playing after the key is pressed.\r\n\r\nIf the game isn't starting on the start screen, double check that when the `gameState` variable is created at the beginning of the program, its value is \"starting\". (`var gameState = \"starting\";)",
"long_instructions": "# Changing the State\r\n\r\nNow that you can display a different screen according to the state of your program, you will need a way to change between states. To go from the \"starting\" state to the \"playing\" state, you can have the user press the \"s\" key. You'll **only** want the program to check for the key press when the program is in the \"starting\" state, so your code for this will go inside the \"starting\" conditional. Putting one `if` block inside another is called **nesting** conditionals.\r\n\r\n## Do this\r\n* Inside the `if` statement that checks for \"starting\", add in a new `if` statement that checks whether the user has pressed the \"s\" key. (`if (keyDown(\"s\")) {`)\r\n* Inside your new `if` statement, set the value of your `gameState` variable to \"playing\". (`gameState = \"playing\";`)\r\n* Test the code by starting the game and pressing \"s\". The game should start playing after the key is pressed.\r\n\r\nIf the game isn't starting on the start screen, double check that when the `gameState` variable is created at the beginning of the program, its value is \"starting\". (`var gameState = \"starting\";`)",
"project_template_level_name": "Gamelab StartScreen template",
"contained_level_names": null,
"preload_asset_list": null,
"encrypted_examples": [

],
"project_template_level_name": "Gamelab StartScreen template"
]
},
"published": true,
"notes": "",
"audit_log": "[{\"changed_at\":\"2019-01-09 23:52:37 +0000\",\"changed\":[\"notes\",\"code_functions\",\"show_debug_watch\",\"contained_level_names\",\"preload_asset_list\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2019-01-11 23:27:06 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\",\"preload_asset_list\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"}]",
"audit_log": "[{\"changed_at\":\"2019-01-09 23:52:37 +0000\",\"changed\":[\"notes\",\"code_functions\",\"show_debug_watch\",\"contained_level_names\",\"preload_asset_list\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2019-01-11 23:27:06 +0000\",\"changed\":[\"code_functions\",\"contained_level_names\",\"preload_asset_list\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2019-01-14 20:36:17 +0000\",\"changed\":[\"code_functions\",\"long_instructions\",\"contained_level_names\",\"preload_asset_list\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"},{\"changed_at\":\"2019-01-14 20:38:15 +0000\",\"changed\":[\"code_functions\",\"long_instructions\",\"contained_level_names\",\"preload_asset_list\",\"encrypted_examples\"],\"changed_by_id\":324,\"changed_by_email\":\"elizabeth@code.org\"}]",
"level_concept_difficulty": {
}
}]]></config>
Expand Down

0 comments on commit 6c0151b

Please sign in to comment.