Commit graph

727 commits

Author SHA1 Message Date
Josh Callebaut
8347c8247f Merge branch 'master' of https://github.com/codecombat/codecombat 2016-01-28 13:57:56 -08:00
Scott Erickson
277c526dc3 Add CourseVictoryModal 2016-01-25 13:03:29 -08:00
Josh Callebaut
aea23072e3 Fix #3348 - don't display score button for levels without a score type 2016-01-22 11:27:38 -08:00
Nick Winter
e872ead632 Implement Brazil coupon 2016-01-11 09:52:46 -08:00
Imperadeiro98
b7ba677b00 Use view in template 2015-12-26 14:21:06 +00:00
Nick Winter
21ae7d47be Don't load extra level completion images unless it's that level 2015-12-23 08:21:11 -08:00
Imperadeiro98
d321bb7a95 Removed spr from spell_list_entry_thangs.jade 2015-12-22 21:41:20 +00:00
Scott Erickson
7c516c4d9f Move product information to the db 2015-12-14 11:10:50 -08:00
Imperadeiro98
e284ec7959 Courses i18n
Also, removed duplicated 'Continue' string
2015-12-08 20:05:08 +00:00
Imperadeiro98
b0a1334eec Removed play-level-modal
I think it is no longer used
2015-12-07 21:36:50 +00:00
Nick Winter
e375b8cdc8 Merge pull request #3185 from Imperadeiro98/the-branch
Refactor to use view in template
2015-12-07 09:28:26 -08:00
Nick Winter
f38eea3590 Merged. Turn off chained rankings for now since they are slow and don't work anyway 2015-12-06 04:36:41 -08:00
Scott Erickson
97c28e1c8a Improve slow level loading on CampaignView
* Fix LevelSetupManager to call onLevelSync asynchronously if level is not loaded on init
* Show a progress bar in level-info-container while level is loading asynchronously
2015-12-04 10:26:09 -08:00
Scott Erickson
b2ed489197 Make sure LadderView displays a valid link back to levels for course arenas 2015-12-03 13:46:50 -08:00
Nick Winter
b0e9670453 Fixed course indexing for first levels in courses 2015-12-03 12:04:49 -08:00
Nick Winter
0d65d73024 Finish merging master into courses-vhoc 2015-12-02 10:10:50 -08:00
Nick Winter
c77e1c0fa2 Add course complete visual state for student CourseDetailsView
Also including a few misc tweaks to CourseDetailsView and the end-of-course HeroVictoryModal state.
2015-12-02 09:52:52 -08:00
Nick Winter
6b1c859e91 Preserve SuperModel when navigating between course levels 2015-12-01 12:23:01 -08:00
Nick Winter
ae6eca583a Present 'Play Classroom Version' before playing a campaign level when appropriate 2015-12-01 11:24:16 -08:00
Nick Winter
457b9d0dbf Simple AI -> Simple CPU, since players read it as 'AL' (who is SIMPLE AL?) 2015-11-30 15:27:52 -08:00
Nick Winter
22af180a86 Move gold display to DuelStatsView for Wakka Maul and remove army power display for non-army ladders 2015-11-30 14:58:36 -08:00
Nick Winter
8fd47535d1 Put video into its own guide tab, fix intro tabs 2015-11-30 13:54:13 -08:00
Matt Lott
7b01fd7b65 Add course name to victory modal 2015-11-25 14:23:35 -08:00
Matt Lott
24345cf296 Course victory modal current and next level names 2015-11-24 16:46:27 -08:00
Nick Winter
7cba3f3725 Don't show code language selector for course ladders 2015-11-24 13:52:37 -08:00
Nick Winter
9f0a843593 Enable auto-submission to ladder for Wakka Maul 2015-11-24 13:35:15 -08:00
Nick Winter
67f14c7928 Try putting AI players in league ladders 2015-11-24 13:18:38 -08:00
Nick Winter
ec7f17a149 Show level indexes in courses 2015-11-24 08:56:28 -08:00
Nick Winter
2fecaf9618 Show AI flare in ladders. Show more players for league ladders. 2015-11-19 15:18:53 -08:00
Nick Winter
c8ceca4d3d Add user.courseInstances, use it for course ladders 2015-11-19 10:41:31 -08:00
Scott Erickson
7a6c42b89f Set up course-ladder level handling
* LadderView displays course info, different style for course-ladder levels
* LadderView hides simulate tab for course-ladder levels
* HeroVictoryModal links to LadderView for course-ladder levels
* CourseDetails page links to LadderView for course-ladder levels
* Enable course instances for league simulation
2015-11-18 14:02:45 -08:00
Imperadeiro98
a19225013b Refactor to use view in template 2015-11-18 19:16:44 +00:00
Nick Winter
a5fc31dbb3 Allow multiplayer levels to earn achievements 2015-11-17 15:23:35 -08:00
Nick Winter
0abb9a38ad Use nanoscroller to allow intro doc scrolling 2015-11-15 08:23:12 -08:00
Nick Winter
5d9d5c0ae6 Remove ProblemAlertView help button 2015-11-14 17:33:05 -08:00
Scott Erickson
8b00c38350 Merge pull request #3168 from Imperadeiro98/use-view
Refactor to use view in template for issue #3138
2015-11-12 09:58:49 -08:00
Nick Winter
2259076800 LoadingScreen -> level intro behavior 2015-11-10 15:22:09 -08:00
Imperadeiro98
28363f780a Small tweaks 2015-11-09 21:35:33 +00:00
Imperadeiro98
8e8a3103d5 Refactor to use view in template for issue #3138
This removes getRenderData from: CareersView, SaveCampaignModal,
InfiniteLoopModal, SpellListEntryThangsView, SaveLoadView,
PlaySettingsModal and JobProfileCodeModal.
2015-11-09 21:29:27 +00:00
Nick Winter
964b3f534c Remove Bloc offer 2015-11-03 15:45:05 -08:00
Scott Erickson
7b54a04d33 Fix reload code button in play view on IE9 2015-10-28 15:45:34 -07:00
Scott Erickson
f95426dbd9 Fix done button in LevelPlayView in IE9
It had no background.
2015-10-28 15:24:08 -07:00
Scott Erickson
a5793630c2 Stop showing ChooseHero tab in GameMenu for course and course-ladder levels 2015-10-27 13:21:39 -07:00
Scott Erickson
58eaec8e6b Refactor MainLadderView to use view in template 2015-10-26 14:23:06 -07:00
Nick Winter
afa410a370 Added Ace of Coders tournament rankings. 2015-10-26 13:30:49 -07:00
Imperadeiro98
6ee44bd6cc Fixed i18n in infinite_loop.jade 2015-10-26 12:46:06 +00:00
Nick Winter
e15b30893f Note tournament end, undo tournament simulation bias 2015-10-15 06:32:52 -07:00
Imperadeiro98
9184566d67 Update pt-PT and standardize new tip 2015-10-13 21:07:21 +01:00
Nick Winter
537ede7740 Merge pull request #3108 from Imperadeiro98/i18n-and-cleanups
Added i18n to some strings
2015-10-13 12:27:58 -07:00
Nick Winter
0c7169f5c0 Merge pull request #3088 from javatlacati/patch-1
Update level_loading.jade
2015-10-13 12:21:19 -07:00
Imperadeiro98
fbfb80d4bf Added i18n to some strings 2015-10-13 16:05:47 +01:00
RUSLAN LÓPEZ CARRO
5ff287a511 Update level_loading.jade 2015-10-09 09:35:30 -05:00
Nick Winter
a34e4b3afd Merge pull request #3084 from Imperadeiro98/clean-up
Cleaned up a couple of files
2015-10-08 16:25:50 -07:00
RUSLAN LÓPEZ CARRO
1f1d74fb3b Update level_loading.jade
How about adding these two quotes? :D
2015-10-08 11:36:19 -05:00
Scott Erickson
2d2f4814f4 Add course membership required error to LevelLoadingView 2015-10-06 12:48:58 -07:00
Imperadeiro98
7949e4fbab Cleaned up a couple of files
Removed some unused strings, an unnecessary style and an event
2015-10-05 22:30:02 +01:00
Nick Winter
dc10dc3b61 Add skip button to Bloc offer 2015-09-18 08:27:37 -07:00
Nicholas Winter
5151ab9091 Describe Ace of Coders tournament 2015-09-15 16:36:50 -07:00
Nicholas Winter
3eeb9a6a26 Reset some stuff for Ace of Coders and Robot Ragnarok. Put multiplayer link back now that we have two good mirror match levels and aren't listing the old arenas. 2015-09-12 06:54:14 -07:00
Nick Winter
b1fd171a27 Opening up the ladder tab view by hiding the FB/G+ ladder column for now. Adding submitted dates to the leaderboards. 2015-09-08 06:44:26 -07:00
Nick Winter
b3496cbf6b A couple tweaks for the duel stats view. 2015-09-04 17:01:06 -07:00
Nick Winter
73f3e7cdd9 League now preserved throughout ladder navigation flow. Mirror match support for submitting to both sides at once. 2015-09-04 16:21:45 -07:00
Nick Winter
d92ca389d6 Switched ladder views to display red/blue team instead of humans/ogres. 2015-09-03 15:46:56 -07:00
Nick Winter
02676dc59f Fixed #2988. 2015-09-03 05:10:06 -07:00
Nick Winter
256b19d331 More improvements and fixes for league ladder pages. 2015-08-21 03:28:25 -07:00
Nick Winter
20c6248dba Added rough army power indicator to DuelStatsView. 2015-08-20 15:21:05 -07:00
Nick Winter
78605ef459 Added DuelStatsView for ladder matches. 2015-08-20 11:57:47 -07:00
Nick Winter
da0b7d3e64 Merge pull request #2955 from codecombat/leagues
Leagues!
2015-08-19 15:34:54 -07:00
Nick Winter
f4d796a717 More ladder page support for leagues. Linking to clan league pages from clans pages. 2015-08-19 15:30:37 -07:00
Nick Winter
11f9238a91 Added Robot Ragnarok limited time challenge. 2015-08-19 12:16:48 -07:00
Nick Winter
32ca453dec Added /play/ladder/levelID/clan/clanID clan-specific ladder pages. 2015-08-15 06:45:38 -07:00
Nick Winter
52aa877f46 Cleaned up an old file. 2015-08-13 08:30:18 -07:00
Nick Winter
49dc71a157 Added a Bloc coupon code after A Mayhem of Munchkins. 2015-08-12 10:25:56 -07:00
Nick Winter
7ee155278d Not showing the 'Course: ' in course level names to teachers/players in the obvious places. 2015-08-10 12:01:03 -07:00
Nick Winter
69e7c68784 Hide Kithgard Mastery from slow/young players, and highlight it once for fast/old players. Fix clan button link. 2015-08-07 07:33:30 -07:00
Nick Winter
66212b0559 Don't show victory text for hero levels. New Clans button. Floor stretching support for firn cliff. 2015-08-05 16:17:27 -07:00
Nick Winter
3f323d27d0 Removed achievement and rewards from course-type level victory screens. Added victory text, return-to-course-button, and level feedback and reviews to course-type levels. 2015-08-04 11:35:10 -07:00
gnerkus
835074e5e6 chore (coding tips): Add more quotes for #710 2015-07-31 21:58:10 +01:00
Sean P. Kane
6205ff26ae Add a tip for the loading screen #710 2015-07-25 14:05:32 -07:00
Cat Sync
11aeb05e66 Limit to showing 6 concepts. For now, show the last 6 in the array. 2015-07-21 13:28:13 -04:00
Nick Winter
899aae5798 Consolidated extra resources. 2015-07-10 14:20:25 -07:00
Nick Winter
45c249ac27 Not asking for resubscription in buy gems modal if already subscribed. 2015-07-07 11:50:55 -07:00
Nick Winter
07f81755b0 Added deprecation message to old arenas, highlighting new hero arenas instead. 2015-07-07 11:43:38 -07:00
Nick Winter
b0c7b50761 Added programming concept tags to campaign and level editor. 2015-06-30 11:27:58 -07:00
Imperadeiro98
d868894845 Updated i18n in play-account-modal.jade 2015-06-27 12:39:42 +01:00
Nick Winter
270340a79f Removed Learnable. 2015-06-24 09:18:13 -07:00
Nick Winter
a85d52ebe2 Made a tabbed interface for Programmaticon V's Vector and standard library documentation. 2015-06-10 15:18:37 -07:00
Nick Winter
4e08d453b7 Added some code for the glacier world. 2015-06-08 13:20:54 -07:00
Imperadeiro98
8a1bbec80e Updated i18n 2015-05-16 13:57:46 +01:00
Nick Winter
c7c27d3208 Added missing half of recent loading quotes addition. 2015-05-14 11:30:14 -07:00
Nick Winter
80af32180c Fixed #1638: detect and automatically report unrecoverable world loading errors, plus adding better instructions for checking dev console. We can't recover yet, but having eyes on it will hopefully give us better visibility on this kind of error. 2015-04-25 17:29:02 -07:00
Nick Winter
63596aa6b5 Fixed #2450: added i18n for new items in the victory modal. 2015-04-18 21:10:35 -07:00
Nick Winter
b358296120 Fixed #2420. Fixed #2605. Can now change programming language from LadderPlayModal. 2015-04-18 16:57:02 -07:00
Nick Winter
86ae0979c5 Working on #2505; do we have TLS for the analytics server yet? 2015-04-18 16:02:18 -07:00
Nick Winter
7471b14c4d Fixed #2013: removed autorun code. Fixed preloading to actually happen, but only on short solutions without a ton of statement execution. 2015-04-18 15:52:24 -07:00
Nick Winter
2eb95c32df Propagated i18n. 2015-04-16 18:35:40 -07:00
Nick Winter
75b3361efe Fixed #2390. Fixed #2391. Added hero-ladder and replayable particles to campaign level banners, plus replayable difficulty indicators. 2015-04-13 17:07:13 -07:00
Nick Winter
a7bb97e5f2 Fixed #2649: made leaderboard buttons more obvious. 2015-04-13 16:26:58 -07:00
Nick Winter
8649383a8c Fixed #2416: LadderTabView now shows hero portraits. 2015-04-13 16:17:22 -07:00
Nick Winter
2eec3e7831 Simplified share progress email to just share with parents, not friends. 2015-04-08 18:31:13 -07:00