Commit graph

668 commits

Author SHA1 Message Date
Nick Winter
f1d14d5bcb Updated Zero Sum tournament blurb now that it has ended. 2015-04-06 17:05:39 -07:00
Matt Lott
a77e9cafe9 Merge branch 'clans' 2015-04-06 11:18:08 -07:00
Matt Lott
43fb8ed462 Add clans link everywhere
Top-level menu, world view, user profiles.
Will add to /teachers later.
2015-04-06 11:17:13 -07:00
Nick Winter
08ea51d1d9 Updated default hero costs for the bug where it didn't load them properly. Probably fixed typo in Polish teachers blurb thing. 2015-04-06 10:52:55 -07:00
Nick Winter
3bfc1a88ce Slight copy update. 2015-03-26 22:05:52 -07:00
Nick Winter
ceb81494a0 Preparing for Zero Sum tournament starting tomorrow morning. 2015-03-26 21:05:46 -07:00
Nick Winter
7dff105cdf Insane hackery for #1777 to give us more code editor space, better use of space with tall screens, and scrolling API properties. Watch out for bugs. 2015-03-25 16:47:31 -07:00
Nick Winter
b4ea78e5cb Implementing alternative pricing with Alipay in China to support dedicated China server. 2015-03-23 15:26:44 -07:00
Nick Winter
19e68f7c05 Improvements to spectate for big screens, allowing spectating of chosen top matches. 2015-03-20 15:32:35 -07:00
Nick Winter
e288b95543 Fixed #1961 (castDrainLife -> cast('drain-life') in the docs). 2015-03-20 13:43:00 -07:00
Nick Winter
585fa40a8c Added first draft of campaign info to campaign selector screen. 2015-03-18 16:20:30 -07:00
Nick Winter
3236abc5da Added emphasis for Apocalypse. 2015-03-17 21:20:26 -07:00
Nick Winter
3458f2069b Temporary workaround for #2512. Identifying ageRange. Made poll header slightly smaller. 2015-03-11 20:21:54 -07:00
Nick Winter
b0dc743126 Tweaks to #2418. 2015-03-10 14:49:50 -07:00
Nick Winter
f2ab176fd6 Merge pull request #2418 from divyanshu013/master
A small fix for confusing Hero Modal weaopons list for #1774
2015-03-10 14:42:31 -07:00
Nick Winter
9c99fc455a A few poll fixes. 2015-03-10 09:45:21 -07:00
Nick Winter
dc5fb0af14 Sending a couple more offers in the next-steps emails. 2015-03-09 16:32:29 -07:00
Nick Winter
e21360127d Polls! 2015-03-08 16:36:17 -07:00
Nick Winter
10f2df3480 Added extra lesson resource links to the Guide. 2015-03-05 08:58:11 -08:00
Thejdeep
e6c60a8027 Added a quote 2015-03-02 20:54:30 +05:30
divyanshu013
ae5aafb24a Added /account link to logged in username for #1635
Clicking on the username should point to /account page of the logged in user.
2015-03-02 01:38:47 +05:30
Nick Winter
6789a8d6bc Rearranging tip_open_source_contribute link. 2015-02-28 16:00:04 -08:00
Kojo Idrissa
bad3b48af1 reverted "open_source_1" back to "open_source"; changed "open_source_2" to "open_source_contribute" 2015-02-28 15:47:43 -06:00
Kojo Idrissa
39f04f0f8b added new load message to level_loading.jade and the English, Traditional Chinese and Simplified Chinese localization files 2015-02-28 15:03:40 -06:00
Nick Winter
e881aec7d7 Account button shouldn't show up for anonymous players. 2015-02-26 14:35:41 -08:00
Nick Winter
7d2c99acd7 Added attack/health/speed tooltip explanations on hero picker stat comparison bars. 2015-02-26 08:02:22 -08:00
Imperadeiro98
ed2f498917 Added i18n to subscribe price 2015-02-26 14:41:40 +00:00
Nick Winter
df4b98a9bf Added a new 'artisan' permission, which can edit most of the things admins can, but with less uncomfortable ultimate power. 2015-02-25 18:41:39 -08:00
Nick Winter
a2a78286da Fixed #2407 by implementing styles for new subscribe-in-gem-shop design. 2015-02-25 14:24:32 -08:00
Nick Winter
1ab8274c43 Added a clear storage button to the campaign editor. 2015-02-25 11:09:15 -08:00
Nick Winter
69959caba5 Using common.play instead of home.play for a more-common use of it. 2015-02-23 15:59:42 -08:00
Ryan Marren
f850409dbe made "level" display in other languages 2015-02-21 14:29:40 -05:00
Ryan Marren
a7dadc34aa Added level indicator 2015-02-20 23:50:42 -05:00
Nick Winter
8355ba5a6d Replayable level awards now count up from where they were last time instead of from 0. 2015-02-18 18:01:22 -08:00
divyanshu013
d8716ed40b Added CodeCombat navigation from /play to / for #2044 2015-02-17 23:49:34 +05:30
laituan245
dfaa29c596 Add type (warrior/ranger/wizard) to hero selector modal (Issue #2307) 2015-02-17 00:50:01 +09:00
Nick Winter
7f2e5c4404 Achievements list now shows proper amount of gems and exp for repeatable achievements. 2015-02-13 18:55:23 -08:00
Nick Winter
574f0b1442 Fixed #2303. Sorry, TBL. 2015-02-13 09:29:18 -08:00
Nick Winter
4fec64c3ca Merge pull request #2313 from laituan245/master
Added a "god mode" button to the local dev environment  (issue #2164)
2015-02-13 09:08:09 -08:00
laituan245
9c754bbd96 Added a "god mode" button to the local dev environment #2164 2015-02-14 01:46:04 +09:00
Imperadeiro98
9ddbf1a102 Fixed i18n in buy-gems-modal.jade 2015-02-13 14:54:19 +00:00
Nick Winter
63fa2f86d4 Tracking who is simulating matches so we can see patterns in ill-reported matches. Rejecting simulations from simulators with old versions of the Simulator code. 2015-02-11 20:24:12 -08:00
Matt Lott
af343bfd82 🐛Fix share progress modal i18n 2015-02-11 10:15:03 -08:00
Anirudh GP
ada239b50d Added some quotes for #710 2015-02-10 14:41:03 +05:30
Nick Winter
abbab26d80 Using i18n for achievement descriptions in HeroVictoryModal. 2015-02-09 13:06:00 -08:00
Imperadeiro98
8718cd280f Added i18n 2015-02-09 20:00:52 +00:00
Imperadeiro98
f062f446d3 Fixed i18n 2015-02-09 19:57:28 +00:00
Nick Winter
7b34f90230 Added rough draft of subscribe button in gem shop. 2015-02-09 09:22:18 -08:00
Nick Winter
c2a4700aa2 Mergy merge merge... moved the latest quote to the .rare, since it doesn't fit too well. 2015-02-09 08:42:24 -08:00
Nick Winter
b2dc80b467 Merged those loading tips. 2015-02-09 08:34:13 -08:00
TJ Ledwith
292e679cc6 Update level_loading.jade 2015-02-09 07:08:33 -05:00
Nick Winter
38c6d6f531 Merge pull request #2263 from divyanshu013/master
Improved upon the Buy Gems Window for #2238
2015-02-08 21:44:57 -08:00
divyanshu013
4269f6a652 Improved upon the Buy Gems Window for #2238
Added the header and close button for the Buy Gems Window.
2015-02-09 02:31:03 +05:30
Imperadeiro98
d876c81c97 Made #back-button a button 2015-02-07 22:33:48 +00:00
Nick Winter
8ab6f36364 Crude initial version of ASCII representation for blind players. 2015-02-06 16:54:55 -08:00
Matt Lott
972c3d0d6f Share progress modal
Shown after forgetful-gemsmith
2015-02-06 14:49:50 -08:00
Nick Winter
2bd7c86638 Added bottom footer background texture. 2015-02-06 11:17:48 -08:00
Nick Winter
3da36ccc5d Added new level loading bar art. Using illustrated Start Level button. 2015-02-06 10:26:38 -08:00
Nick Winter
3cbf11d404 Added a back button to hit campaign selector view. 2015-02-05 15:40:45 -08:00
Nick Winter
1d8f91c42f Added campaign world selector portal screen for half of players. 2015-02-05 15:05:33 -08:00
Nick Winter
5542bd8a89 Upgraded level info popover; made it a click instead of a hover; added view scores button to it when level has been completed. 2015-02-03 18:25:38 -08:00
Nick Winter
762192a4a7 A few visual improvements to leaderboadrs. 2015-02-03 17:07:15 -08:00
Nick Winter
86aa265679 Added campaign label banner art. 2015-02-03 09:56:27 -08:00
Nick Winter
60d68ca23c Fixed some memory leaks and particle disposal problems. Re-enabled particles. Tweaked particle stylings. 2015-02-02 18:02:57 -08:00
purenickery
81b69e0c3c Update level_loading.jade 2015-01-31 17:01:43 -07:00
JKniager
f1145852dd Added Tips
Added tips to the tip list.
2015-01-31 16:25:35 -07:00
Nick Winter
4b388f2775 Fixed some memory leaks. Fixed a couple minor bugs. 2015-01-31 12:23:44 -08:00
Nick Winter
c977ecc16f Adding easy observing of leaderboard matches (except top 5). 2015-01-31 10:04:11 -08:00
Nick Winter
022d31c19a Basic leaderboards are working. 2015-01-30 21:36:48 -08:00
Nick Winter
4efbe0a12f Leaderboard skeletons. 2015-01-30 21:36:47 -08:00
Matt Lott
58f8eb6688 Add support for premium video tutorials 2015-01-30 10:48:49 -08:00
Nick Winter
39ad9b8e35 Show hero unlocks in campaign editor, too. 2015-01-29 19:29:37 -08:00
Nick Winter
1630b30351 Fixed showing hero unlock portraits on world map. Showing them now even before their levels are unlocked, and showing until you purchase, not just unlock them. 2015-01-29 19:05:30 -08:00
Nick Winter
57d12c199e Tweaks to campaign status view. Hooking up i18n for Campaigns, but it doesn't work yet. 2015-01-29 09:07:25 -08:00
Nick Winter
aab6d17047 Added campaign completion progress indicator. 2015-01-29 08:26:12 -08:00
divyanshu013
cfdbabb576 Added some quotes for #710 2015-01-27 21:53:37 +05:30
Nick Winter
8f4b3cb85f Deleted unneeded campaign label. 2015-01-22 16:33:35 -08:00
Nick Winter
64008276c2 Finally translating level names and descriptions in the campaign view. 2015-01-22 11:22:35 -08:00
Nick Winter
9e496fa9d0 Propagated i18n. 2015-01-22 10:45:51 -08:00
Adnan Zahid
375d388fe3 Added 6 new tips for the loading screen
Added the following tips:

1) play_level.tip_control_destiny
2) play_level.tip_no_code
3) play_level.tip_code_never_lies
4) play_level.tip_reusable_software
5) play_level.tip_optimization_operator
6) play_level.tip_lines_of_code
2015-01-20 00:06:29 +05:00
Nick Winter
f86d106077 Showing replayable level difficulty in control bar. 2015-01-16 12:50:10 -08:00
Imperadeiro98
ea07cfdd62 Update campaign-view.jade 2015-01-15 18:35:38 +00:00
Scott Erickson
afe590c5cc Hid the misc tab until you have unlocked defense of plainswood, and by extension, the forest. 2015-01-13 15:34:06 -08:00
Nick Winter
f691eb9a86 Reimplemented next-level arrow highlighting. Campaign Editor now draws lines to show level unlock patterns. Removed more old WorldMapView stuff. Can now configure Hero Placeholder say cooldowns per-level. 2015-01-13 09:04:20 -08:00
Scott Erickson
22e1318970 Added a rudimentary (aka programmer-designed) hero-type filter for the item store. 2015-01-12 15:30:18 -08:00
Nick Winter
778647bf19 Fixed layout of non-short item detail property labels. Commented out campaign editor analytics load for now to not kill things. 2015-01-11 10:04:24 -08:00
Imperadeiro98
a9682a8cbe Update ladder-tab-view.jade 2015-01-10 22:52:41 +00:00
Scott Erickson
c8298679a4 Tweaked achievement notification handling, also disabling an endless loop of achievement fetching. 2015-01-09 12:38:00 -08:00
Nick Winter
d66243ad75 Beating replayable levels now shows you the proper gems and xp. 2015-01-07 18:36:02 -08:00
Nick Winter
947811c01b Replayable once-per-day increasing-difficulty level basics. 2015-01-05 10:44:24 -08:00
Nick Winter
9e9d69ec9b Removed try_it text (which was accidentally used in the wrong place anyway). 2014-12-30 16:24:31 -08:00
Nick Winter
d85bf8d59a Fixed disabled level logic. 2014-12-29 08:46:02 -08:00
Nick Winter
744d30737e Merged in campaign editor and campaign view. Destroyed WorldMapView, CampaignOptions, and LevelOptions. Lots of stuff is now stored in the database instead of code. Cleaned up a few unneeded old features. Fixed some problems with checking permissions on first rather than latest versions of documents. 2014-12-28 13:25:20 -08:00
Nick Winter
b4341ad46c Merge branch 'feature/campaign-editor' 2014-12-27 11:03:51 -08:00
Nick Winter
1c1f2008a5 Now able to suggest required items for purchase before level start. 2014-12-24 11:01:50 -08:00
Nick Winter
f17b3bd03b Fixed indentation and punctuation for superpower tip. 2014-12-23 07:57:07 -08:00
Omar S.
f48c2b0def New tip
Added superpower tip
2014-12-23 09:54:31 -05:00
Scott Erickson
1bb76d5902 Fixed shadow placements. 2014-12-23 09:12:41 -05:00
Scott Erickson
0dd2d9efbd Handled merge conflict. 2014-12-22 12:33:52 -05:00
Scott Erickson
a31b385a4d Moving levels and adjacent campaign links around in the CampaignView saves the new position to the CampaignEditorView. 2014-12-22 10:54:07 -05:00
Scott Erickson
efc83b88d0 Hooked up the CampaignView to show adjacent campaigns based on the data. 2014-12-22 10:29:29 -05:00
Nick Winter
08cb87c84d Automatically take screenshots when submitting contact form from level view. 2014-12-19 18:37:42 -08:00
Scott Erickson
0cd85d7aba Got the CampaignView mostly off the hardcoded data. 2014-12-19 16:46:01 -05:00
Scott Erickson
a742772b8f Also added campaign view jade and sass file clones. 2014-12-19 13:06:20 -05:00
Scott Erickson
59318b2f78 Merge branch 'master' into feature/campaign-editor 2014-12-19 12:54:11 -05:00
Nick Winter
d801ed61ce Separating contact emails into premium subscriber support and basic general support. 2014-12-18 20:35:14 -08:00
Matt Lott
7c87dc0c3a Make spell palette help label a button 2014-12-18 00:19:40 -08:00
Matt Lott
9d4c3cc163 A/B Test video tutorial styles 2014-12-17 23:55:11 -08:00
Matt Lott
d494dc9c79 Add video tutorials to game guide 2014-12-17 22:26:36 -08:00
Scott Erickson
1cc6a97e43 Added basic campaign view, working on campaign handlers. 2014-12-16 17:46:24 -08:00
Matt Lott
f1d7fb5fbd Add help button to problem alert 2014-12-15 15:11:27 -08:00
Scott Erickson
b0de331a10 Shored up stripe transaction payment defences to try and fix #1906. 2014-12-12 15:27:58 -08:00
Scott Erickson
94a400bfd8 Hero icons now show up on the world map on levels where you can unlock them. 2014-12-10 10:45:11 -08:00
Nick Winter
239f94697f Fixed IE hero lock image. 2014-12-10 10:37:57 -08:00
Nick Winter
d51db43823 Added desert campaign. 2014-12-10 10:00:52 -08:00
Nick Winter
2b0231e95f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-10 09:45:34 -08:00
Scott Erickson
bf80307142 Put in new, smaller versions of the world map and loading wings for smaller screens. 2014-12-10 09:45:00 -08:00
Nick Winter
b65bc2dd39 Show cool victory text image for players with language defaulted to English. 2014-12-09 19:23:11 -08:00
Nick Winter
5365a9fdf1 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-09 05:38:28 -08:00
Matt Lott
6c60f70914 Update subscribe modal copy A/B test 2014-12-09 00:04:07 -08:00
Matt Lott
1aff798c5e A/B Test alternate subscribe modal copy 2014-12-08 23:43:52 -08:00
Nick Winter
58d549fa8a Styled log out button on world map. 2014-12-08 18:49:45 -08:00
Matt Lott
b9adcd1ab2 Add signup tracking to victory modal 2014-12-08 13:45:01 -08:00
Nick Winter
01c6709c36 Implemented George's WorldMapView user status line design. 2014-12-07 16:55:08 -08:00
Nick Winter
08a5f70fb1 Fixed wrong item showing up selected after an item is bought from inventory. 2014-12-07 15:05:39 -08:00
Nick Winter
9054f70052 Implemented new victory modal design. 2014-12-07 14:03:11 -08:00
Scott Erickson
690a24cda9 Added static imagery to the world map to show better completed, started and premium levels. 2014-12-07 13:28:32 -08:00
Nick Winter
fbd0585379 Merge pull request #1861 from Imperadeiro98/master
Removed more wizard i18n stuff
2014-12-06 18:10:15 -08:00
Scott Erickson
83e1fe8bfe InventoryModal loads item portraits when they are visible, getting rid of dozens of unnecessary web requests. 2014-12-06 14:21:56 -08:00
Imperadeiro98
43c0b399ed Update keyboard_shortcuts.jade 2014-12-06 20:52:30 +00:00
Nick Winter
6344b0c1a3 Unlocked core levels even for non-subscribers, moving extra levels to subscribers-only. 2014-12-05 15:46:15 -08:00
Nick Winter
3c3d98b0ec Merge pull request #1841 from Zacharias030/master
Added another tip to be displayed during loading
2014-12-04 15:34:16 -08:00
Zacharias Fisches
55f85e3682 Added another tip to be displayed during loading
There are only two kinds of people: those that can extrapolate from
incomplete data...
2014-12-05 00:21:36 +01:00
Nick Winter
dffc14f995 Put in a fallback in case somehow the gems weren't loaded for the PlayHeroesView locked hero gem costs. 2014-12-04 13:57:21 -08:00
Nick Winter
a25d306be7 Added restricted hero button where the choose hero would normally go, for heroes unavailable to a particular level. 2014-12-04 13:43:19 -08:00
Nick Winter
6e57cbfb66 LevelLoadingView now handling when a subscription is required (although it can't be, yet, since LevelLoader doesn't tell it). 2014-12-03 12:04:12 -08:00
Nick Winter
0ac9b3758b Fixed bug with subscriptions not working. Added subscription status text to the world map. 2014-12-03 11:19:10 -08:00
Nick Winter
f82ccfc4cb The sky darkened. 2014-12-03 10:04:50 -08:00
Nick Winter
65dde043c7 SubscribeModal is in. 2014-12-03 09:14:14 -08:00
Nick Winter
15d7ac876a Starting SubscribeModal. 2014-12-02 20:01:53 -08:00
Matt Lott
1773744bcd Turn off a/b test hide locked levels
Minor increase in level completion for hiding locked levels was not
statistically significant.  We can run this test again after level
banners and world map paths have been ironed out.
2014-12-02 09:13:42 -08:00
Nick Winter
19dde10a54 Fixed jade comment syntax error. 2014-12-01 18:33:37 -08:00
Scott Erickson
7f97a3b91e The PlayItemsModal now dynamically loads portrait images as they scroll into view. 2014-12-01 17:33:45 -08:00
Scott Erickson
1b12eee3ac Fixed signup in victory modals and ContributeClassView. 2014-12-01 10:49:38 -08:00
Matt Lott
23e60116d5 A/B test hiding locked levels in world map 2014-11-30 22:11:39 -08:00
Nick Winter
35f1ed1e82 Implemented George's new level loading view design. 2014-11-30 18:02:45 -08:00
Nick Winter
9471beafd9 A few fixes for PlayHeroesModal and InventoryModal. 2014-11-30 14:00:29 -08:00
Nick Winter
412955c6be Got rid of some CSS filters that were making the PlayItemsModal take way too much memory. 2014-11-29 17:34:59 -08:00
Nick Winter
af24857255 Do not load silhouetted or hidden items. More importantly, remove the absolute positioning on the .required-level tag inside the item element to save 150MB (!!!) of memory for no discernible reason. (But actualy just remove that whole .required-level tag, because who even needs it.) 2014-11-29 17:06:56 -08:00
Scott Erickson
17f2d76512 Undid some apparent changes from the last commit. 2014-11-29 12:53:57 -08:00