Skip to content

staging to levelbuilder#4778

Merged
Hamms merged 44 commits into
levelbuilderfrom
staging
Oct 23, 2015
Merged

staging to levelbuilder#4778
Hamms merged 44 commits into
levelbuilderfrom
staging

Conversation

@Hamms

@Hamms Hamms commented Oct 23, 2015

Copy link
Copy Markdown
Contributor

No description provided.

islemaster and others added 30 commits October 23, 2015 02:17
…ake Projectile use StudioAnimation and StudioSpriteSheet instead of doing its own thing.
CI cookbook-version sync via Berkshelf
0586f2b Merge pull request #4768 from code-dot-org/extract-animation-wrapper (Brad Buchanan)
ae4393b Merge pull request #4771 from code-dot-org/promote-k12 (Caley Brock)
f541f2b Merge pull request #4774 from code-dot-org/berks_update (Will Jordan)
fabdbe6 fix syntax (Will Jordan)
1206fd4 Merge pull request #4713 from code-dot-org/berks_update (Will Jordan)
a88e880 CI cookbook-version sync via Berkshelf (Will Jordan)
b0d520d Merge pull request #4772 from code-dot-org/levelbuilder (Elijah Hamovitz)
08b74b3 levelbuilder changes (elijah) (Continuous Integration)
[Finishes #105433088] Changes to randomNumber
8228a7a Merge pull request #4695 from code-dot-org/randomNumber (Bjvanminnen)
4f48542 Automatically built. (Continuous Integration)
0586f2b Merge pull request #4768 from code-dot-org/extract-animation-wrapper (Brad Buchanan)
ae4393b Merge pull request #4771 from code-dot-org/promote-k12 (Caley Brock)
f541f2b Merge pull request #4774 from code-dot-org/berks_update (Will Jordan)
fabdbe6 fix syntax (Will Jordan)
wjordan and others added 14 commits October 23, 2015 11:53
fix cdo-varnish ppa uri
Change to reporting the answer text rather than the answer index (per request).
In application controller, HintViewRequest was using script_level even
though it was outside of the logical block checking for the existence of
script_level.

It's now in its own little logical block so that its requirements are
quite a bit more clear.
…ndefined

HintViewRequest logic was in the wrong place
Hamms added a commit that referenced this pull request Oct 23, 2015
@Hamms Hamms merged commit 0d785ad into levelbuilder Oct 23, 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.

7 participants