Skip to content

DTT#4255

Merged
joshlory merged 137 commits into
testfrom
staging
Sep 30, 2015
Merged

DTT#4255
joshlory merged 137 commits into
testfrom
staging

Conversation

@joshlory

Copy link
Copy Markdown
Contributor

No description provided.

breville and others added 30 commits September 14, 2015 09:59
This adds a small delay from when a level completes to when we pop the success dialog box, allowing the final walk animation to complete.
When 2x2 walls are detected, take a regular tile but draw it double-sized.  I haven't proved out the algorithm but it seems to draw correctly.
Conflicts:
	apps/src/studio/studio.js
Conflicts:
	apps/src/studio/studio.js
- collidables now wander up/down/left/right, no diagonals
- a bunch of pre-made wall layouts in the skin
- support for some wall tiles being slightly enlarged
- support for specific wall tiles being drawn
- floating score emitted by sprite 0 (turned on with floating_score flag in level)
- /s/hoc2015 now shows a dev/admin-only dump of all levels
Conflicts:
	apps/src/studio/studio.js
	dashboard/config/scripts/levels/hoc2015_event_free.level
davidsbailey and others added 28 commits September 29, 2015 13:46
…requires packages to build native extensions).
Update README instructions and cdo-apps cookbook for new sqlite3 gem
…plab-ignore-html

Revert "Revert "Fix canvas issues preventing turtle from drawing line…
commit 18f0a2f
Merge: 2234a90 d89be8f
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Tue Sep 29 14:16:57 2015 -0700

    Merge pull request #4219 from code-dot-org/revert-4218-revert-4210-applab-ignore-html

    Revert "Revert "Fix canvas issues preventing turtle from drawing line…

commit 2234a90
Merge: db9b5d1 f36eb42
Author: Will Jordan <wjordan@users.noreply.github.com>
Date:   Tue Sep 29 13:59:20 2015 -0700

    Merge pull request #4246 from pickettd/updates-for-sqlite

    Update README instructions and cdo-apps cookbook for new sqlite3 gem

commit f36eb42
Author: David Pickett <pickettd@gmail.com>
Date:   Tue Sep 29 10:48:31 2015 -1000

    Update README instructions and cdo-apps cookbook for new sqlite gem (requires packages to build native extensions).

commit d89be8f
Author: David Bailey <dsb123@gmail.com>
Date:   Tue Sep 29 13:47:15 2015 -0700

    fix cspunit3 test

commit 799a538
Author: David Bailey <dsb123@gmail.com>
Date:   Tue Sep 29 13:47:02 2015 -0700

    add diagram of expected pixels in cspunit3 test
commit 18f0a2f
Merge: 2234a90 d89be8f
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Tue Sep 29 14:16:57 2015 -0700

    Merge pull request #4219 from code-dot-org/revert-4218-revert-4210-applab-ignore-html

    Revert "Revert "Fix canvas issues preventing turtle from drawing line…

commit 2234a90
Merge: db9b5d1 f36eb42
Author: Will Jordan <wjordan@users.noreply.github.com>
Date:   Tue Sep 29 13:59:20 2015 -0700

    Merge pull request #4246 from pickettd/updates-for-sqlite

    Update README instructions and cdo-apps cookbook for new sqlite3 gem

commit f36eb42
Author: David Pickett <pickettd@gmail.com>
Date:   Tue Sep 29 10:48:31 2015 -1000

    Update README instructions and cdo-apps cookbook for new sqlite gem (requires packages to build native extensions).

commit d89be8f
Author: David Bailey <dsb123@gmail.com>
Date:   Tue Sep 29 13:47:15 2015 -0700

    fix cspunit3 test

commit 799a538
Author: David Bailey <dsb123@gmail.com>
Date:   Tue Sep 29 13:47:02 2015 -0700

    add diagram of expected pixels in cspunit3 test
add show notes for courses 1 and 2
…n_bugfix

s/Frequency Analysis/FrequencyAnalysis
allow DELETE and POST requests for images through varnish.
Don't cache pegasus not_found responses
Avoid creating symbols based on user input in ProjectsController. Suc…
joshlory pushed a commit that referenced this pull request Sep 30, 2015
@joshlory joshlory merged commit 00be17b into test Sep 30, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.