Commit graph

3668 commits

Author SHA1 Message Date
Matt Lott
ba6d51659c Show in-game programming language
Closes #3814
2016-08-03 11:08:20 -07:00
phoenixeliot
2e9ff61436 Fix broken ladder in course 2016-08-02 13:43:13 -07:00
Nick Winter
fad53cf43f Don't wait for simulation load progress on game-dev levels 2016-08-02 12:31:36 -07:00
phoenixeliot
5f560f3e7d Don't allow conversion to student without a ClassCode
Fix i18n and tests
2016-08-01 16:44:57 -07:00
phoenixeliot
94e3c5a2b5 Add first/last names to Account Settings 2016-08-01 14:12:35 -07:00
phoenixeliot
d388975217 Fix unescaped HTML in goal descriptions 2016-07-29 16:21:13 -07:00
phoenixeliot
83557910b2 Fix CSV export and projects tab 2016-07-29 14:37:45 -07:00
themaka
8135bd73d0 Added Māori and Croatian to list of languages to display on Diplomat page. 2016-07-29 15:53:01 -04:00
themaka
66817657f0 Added "te reo Māori" (Māori) to locale 2016-07-29 15:34:34 -04:00
themaka
715939dfb1 Adding Croatian language to locale 2016-07-29 15:20:24 -04:00
phoenixeliot
4af822d13a Revert "Add game UI programming language label"
This reverts commit b7f916116d.

Some heights in gameplay were made worse by this; needs some more work.
2016-07-29 11:23:42 -07:00
phoenixeliot
dd66a8c252 Add detection of HTML/CSS/JS comments for entrypoints 2016-07-28 15:10:01 -07:00
Nick Winter
82c4367308 Avoid \n escape character in i18n strings for tooling 2016-07-28 13:47:23 -07:00
Nick Winter
d77625bc77 Game dev levels (#3810)
* Tweak API doc behavior and styling

* Instead of moving to the left during active dialogues, just move to the top
* Allow pointer events
* Adjust close button
* Re-enable pinning API docs for game-dev and web-dev levels

* Make sidebar in PlayGameDevLevelView stretch, better layout columns

* Set up content of PlayGameDevLevelView sidebar to scroll

* Add rest of PlayGameDevLevelView sidebar content, rework what loading looks like

* Finish PlayGameDevLevelView

* Add share area below
* Cover the brown background, paint it gray

* Tweak PlayGameDevLevelView

* Have progress bar show everything
* Fix Surface resize handling

* Fix PlayGameDevLevelView resizing incorrectly when playing

* Add GameDevVictoryModal to PlayGameDevLevelView

* Don't show missing-doctype annotation in Ace

* Hook up GameDevVictoryModal copy button

* Fix onChangeAnnotation runtime error

* Fix onLevelLoaded runtime error

* Have CourseVictoryModal link to /courses when course is done

* Trim, update CourseDetailsView

* Remove last vestiges of teacherMode
* Remove giant navigation buttons at top
* Quick switch to flat style

* Add analytics for game-dev

* Update Analytics events for gamedev

* Prefix event names with context
* Send to Mixpanel
* Include more properties

* Mostly set up indefinite play and autocast for game-dev levels

* Set up cast buttons and shortcut for game-dev

* Add rudimentary instructions when students play game-dev levels

* Couple tweaks

* fix a bit of code that expects frames to always stick around
* have PlayGameDevLevelView render a couple frames on load

* API Docs use 'game' instead of 'hero'

* Move tags to head without combining

* Add HTML comment-start string

Fixes missing entry point arrows

* Fix some whitespace
2016-07-28 13:39:58 -07:00
Matt Lott
b7f916116d Add game UI programming language label 2016-07-28 12:00:52 -07:00
Rob
4d8d4ff268 Defer breakage of Concept Map if we don't have esper. 2016-07-27 16:55:10 -07:00
Rob
b7fcaa50a6 Change keyword autocomplete logic. 2016-07-27 16:37:57 -07:00
Rob
6c9f351f01 Group concept map by campaign. 2016-07-27 14:17:37 -07:00
Rob
75e3c54d54 Add concept map view to artisans. 2016-07-27 13:44:55 -07:00
Scott Erickson
ac4df997c1 Display treema errors 2016-07-26 16:48:04 -07:00
Scott Erickson
8117a000c1 Fix PlayLevelView race condition typo 2016-07-26 10:38:15 -07:00
Scott Erickson
053ce34faf Prevent users from signing up with or changing to an email-like username 2016-07-25 16:33:48 -07:00
Scott Erickson
34310642c7 Add destudent and deteacher buttons to AdministerUserModal 2016-07-25 16:09:24 -07:00
phoenixeliot
f1f020a50d Use course.releasePhase instead of .adminOnly
Remove old comment
2016-07-25 11:29:30 -07:00
Matt Lott
9962ff83d4 Level editor play classroom options 2016-07-23 21:03:19 -07:00
Nick Winter
ea61499a10 Add Done button hotkey 2016-07-22 17:59:32 -07:00
phoenixeliot
cac87559c6 Remove frequent console logs in web levels 2016-07-22 10:43:08 -07:00
phoenixeliot
f9d0adaca6 Fix levelType refactor 2016-07-22 10:43:08 -07:00
Scott Erickson
b1c69b686c Add admin button to update course content for classrooms 2016-07-21 15:16:17 -07:00
Matt Lott
01679982d5 Remove intro/overview from guide game menu
Unless picoCTF
Will show guide option if non-course and help videos.
2016-07-21 11:11:11 -07:00
phoenixeliot
b1277dc95f Merge branch 'game-dev-levels' 2016-07-21 10:14:22 -07:00
phoenixeliot
2ebf94c3db Combine extracted script/style tags 2016-07-20 17:20:21 -07:00
phoenixeliot
f28c17c9bf Fix spacing to be consistent 2016-07-20 15:47:20 -07:00
phoenixeliot
62813e41a3 Extract styles and scripts 2016-07-20 15:44:01 -07:00
Matt Lott
72905c7ff2 Reduce Mixpanel event tracking
Turning off homepage events and play pageviews.
2016-07-20 14:45:13 -07:00
phoenixeliot
58284dff33 Turn on Ace HTML worker for syntax errors 2016-07-19 11:30:02 -07:00
Matt Lott
01a8312617 🐛Classroom last played string null level check 2016-07-19 10:10:48 -07:00
phoenixeliot
1d616cd92a Fix indentation 2016-07-18 10:46:51 -07:00
phoenixeliot
bb6262483f Allow username-only signup for classroom users
Address some code review feedback

Correct error code in test

Don't try to send emails to empty addresses

Add tests for subscriptions

Add tests for Next Steps email

Fix specs

Add reason for disabled test
2016-07-18 10:41:17 -07:00
Matt Lott
607c129c7f School active licenses admin page 2016-07-18 09:41:42 -07:00
Nick Winter
f94cc2ec1f Fix CS1, CS2, GD1, WD2, CS3, etc. labeling in TeacherClassesView, too 2016-07-17 01:12:58 -07:00
Nick Winter
6e65171a83 i18n, comments, misc cleanup 2016-07-17 00:53:17 -07:00
Nick Winter
b04e968da5 Add support for CSS docs 2016-07-16 23:17:05 -07:00
Nick Winter
5d0b9c875a Fix some typos that made it not work in Firefox (not sure how it worked in Chrome) 2016-07-16 13:32:54 -07:00
Nick Winter
0cd3278b8f Add simple ImageGalleryView for some sample images in web-dev levels 2016-07-16 13:11:43 -07:00
Nick Winter
d37527d21b Ordering/labeling courses: CS1, CS2, GD1, WD1, CS3, etc 2016-07-16 00:35:52 -07:00
Nick Winter
dc6a1de9fa Ordering/labeling courses: CS1, CS2, GD1, WD1, CS3, etc 2016-07-16 00:33:10 -07:00
Nick Winter
b64bcd9f02 Use shareable false/true/'project' for different levels of shareability 2016-07-15 23:26:43 -07:00
Nick Winter
6ae89e31f1 Add direct link to play game/web-dev creations while coding them 2016-07-15 22:14:25 -07:00
Nick Winter
5d26b03918 Add buttons to view game/web-dev levels to courses views 2016-07-15 21:57:04 -07:00
Nick Winter
5f95a4d158 Play game-dev levels without API restrictions. Show game button in CourseDetailsView only when appropriate. 2016-07-15 20:47:09 -07:00
Nick Winter
224ad54bdd View web dev levels. Add proper victory modal game/webpage share links. Fix playing game dev levels. Add generic change transition to all web-dev pages. 2016-07-15 20:03:12 -07:00
Scott Erickson
0570644943 Set up a bunch of game dev, web dev playing logic 2016-07-15 16:57:39 -07:00
Nick Winter
788a14398a Fix starting web dev levels 2016-07-15 16:22:33 -07:00
Scott Erickson
7b38181241 Merge branch 'master' into game-dev-levels 2016-07-15 16:02:21 -07:00
Scott Erickson
ab704a1cab Merge remote-tracking branch 'origin/web-dev-levels' into game-dev-levels
# Conflicts:
#	app/views/play/level/PlayLevelView.coffee
2016-07-15 16:01:57 -07:00
Scott Erickson
10ca59d10f Have CourseVictoryModal used for course-ladder levels 2016-07-15 15:54:22 -07:00
Nick Winter
9be8151959 Don't create God for web-dev levels 2016-07-15 13:24:54 -07:00
Nick Winter
5a688e42c7 Slightly more flexible iframe origin checking 2016-07-15 11:19:22 -07:00
Nick Winter
1e89775486 Basic campaign mode victory modal hookup for web-dev levels 2016-07-15 09:53:16 -07:00
Nick Winter
739973cb47 Sending goal states to GoalManager and GoalStatusView 2016-07-15 09:11:36 -07:00
Nick Winter
c44c16e5d2 Started implementing web-dev goals 2016-07-15 00:40:32 -07:00
Nick Winter
e3670165e7 Remove code for multiple spells; rename SpellListTabEntryView to SpellTopBarView; remove hero avatar from SpellTopBarView 2016-07-14 22:43:25 -07:00
Nick Winter
220db3106c Run button now recreates web-dev DOM; no submit button 2016-07-14 19:48:27 -07:00
Nick Winter
33ba3f6033 Enable docs for web-dev levels 2016-07-14 19:14:18 -07:00
Nick Winter
ed320a8d9e WebSurfaceView now parsing player code through virtual DOM into iframe 2016-07-14 18:07:36 -07:00
Scott Erickson
9d0ad7af44 Start work on having course arenas use the CourseVictoryModal 2016-07-14 16:50:17 -07:00
Scott Erickson
9a79cae09d Fix PlayGameDevLevelView to run in course mode 2016-07-14 16:49:48 -07:00
phoenixeliot
c3ed217964 Fix i18n render bug on SimulateTabView 2016-07-14 16:20:15 -07:00
Scott Erickson
61caf3dcd3 Merge branch 'master' into game-dev-levels 2016-07-14 15:50:04 -07:00
Scott Erickson
dd88f39761 Add shareable property to levels 2016-07-14 15:48:42 -07:00
Scott Erickson
0cb92582f4 Add destroy method 2016-07-14 15:13:02 -07:00
Nick Winter
16b10612b6 Stub WebSurface showing for web-dev levels 2016-07-14 12:34:22 -07:00
phoenixeliot
5e10e34825 Add spy buttons to admin page search results 2016-07-14 11:27:18 -07:00
Nick Winter
c5c831c211 Remove real-time multiplayer prototype code 2016-07-14 10:26:09 -07:00
Scott Erickson
2284a9f495 Remove semi-colons from AnalyticsView to satisfy linter 2016-07-14 10:10:22 -07:00
Nick Winter
349ab24da7 First pass at adding 'web-dev' level type 2016-07-14 09:38:45 -07:00
Nick Winter
c0a70cb2ab Refactor level type checks for easy greppability (level.isType) 2016-07-14 08:58:43 -07:00
Nick Winter
87ed53b24b Merge branch 'master' into web-dev-levels 2016-07-14 08:26:27 -07:00
Scott Erickson
fb9998b15e Add temp buttons to CourseDetailsView for testing PlayGameDevLevelView 2016-07-13 16:05:41 -07:00
Scott Erickson
b982f3fd52 Fix Camera bounds by adding ScriptManager 2016-07-13 16:05:41 -07:00
Scott Erickson
4a51045a41 Fix PlayGameDevLevelView when playing the first time, get frames streaming
For whatever reason, the Angel does not normally allow streaming on the first world.
I hacked around it, but would be good to figure out why that restriction is there
in the first place.
2016-07-13 16:05:41 -07:00
Scott Erickson
c9986ee05a Tweak Promises in PlayGameDevLevelView 2016-07-13 16:05:41 -07:00
Scott Erickson
d7a2219b16 Refactor PlayGameDevLevelView to use promises 2016-07-13 13:28:54 -07:00
Scott Erickson
1b7ac76b9f Add loading and playing to PlayGameDevLevelView 2016-07-13 11:43:25 -07:00
Nick Winter
872e83e9b7 Don't use course hero in verifier / level editor for type: 'course' level 2016-07-13 10:04:43 -07:00
Scott Erickson
3a0695f59c Add some basic info to PlayGameDevLevelView 2016-07-12 15:12:11 -07:00
Scott Erickson
25e348c5ad Initial, basically working PlayGameDevLevelView 2016-07-12 14:07:10 -07:00
Scott Erickson
0b1e1ddcb4 Merge branch 'game-dev-levels' 2016-07-12 11:00:29 -07:00
Nick Winter
cd47a9d4ea Fix inconsistent verifier results when run with multiple levels batched 2016-07-11 16:59:00 -07:00
Matt Lott
f8a67ace0e Remove items from course victory dialog 2016-07-11 16:01:34 -07:00
Matt Lott
16c9f10043 🐛Fix course victory dialog level progress counts
Use classroom versioned levels instead of latest course levels.
Use current level session instead of stale one.
2016-07-11 13:28:52 -07:00
Nick Winter
a5a955ca6b Always show indent guides 2016-07-11 08:35:44 -07:00
David Liu
2ebef96d28 Fix birthday form validation in signup (#3787) 2016-07-11 08:34:29 -07:00
Matt Lott
9b68e91409 🐛Fix analytics dashboard coursePrepaid use 2016-07-10 17:55:07 -07:00
Matt Lott
f598e43957 Admin classroom export respects classroom versioning 2016-07-08 18:47:06 -07:00
Matt Lott
1bf3eb54dd 🐛Fix admin classroom progress export paging 2016-07-08 18:24:47 -07:00
Nick Winter
8c48e4fc14 Remove transpiledCode and screenshot from LevelSession 2016-07-08 17:04:24 -07:00
phoenixeliot
6fb4cbd9ac Remember checkbox state in TeacherClassView 2016-07-08 16:24:33 -07:00
phoenixeliot
b25782f2b6 Pass username/password from CreateAccountModal to AuthModal 2016-07-08 16:24:33 -07:00