Commit graph

1291 commits

Author SHA1 Message Date
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
Nick Winter
4d347e0d5f Propagated i18n. 2014-12-12 16:13:18 -08:00
Nick Winter
25b91f900d Merge pull request #1926 from Imperadeiro98/master
Internationalized more stuff
2014-12-12 16:11:03 -08:00
Scott Erickson
b0de331a10 Shored up stripe transaction payment defences to try and fix #1906. 2014-12-12 15:27:58 -08:00
Imperadeiro98
f98469122a Update i18n-edit-model-view.jade 2014-12-12 22:35:16 +00:00
Imperadeiro98
9c911ce149 Update thang-type-edit-view.jade 2014-12-12 22:32:19 +00:00
Imperadeiro98
e609ea7c5c Update edit.jade 2014-12-12 22:25:17 +00:00
Imperadeiro98
3ab5ee22c9 Update versions-modal.jade 2014-12-12 22:15:10 +00:00
Imperadeiro98
72485eb5a9 Update patches.jade
Couldn't figure out how to handle "Pending", "Accepted", etc.
2014-12-12 22:04:21 +00:00
Imperadeiro98
237b022147 Update edit.jade 2014-12-12 21:43:20 +00:00
Scott Erickson
e5c5f0ba04 Fixed Karma client test runner. 2014-12-12 13:12:35 -08:00
Imperadeiro98
a793339ee1 Update contact.jade 2014-12-12 16:28:56 +00:00
Nick Winter
b897055618 Added translation key for subscription status label. 2014-12-12 07:27:28 -08:00
Nick Winter
ce36fa461f Fixed i18n typo that Imperadeiro98 noticed. 2014-12-11 06:57:58 -08:00
Scott Erickson
02953d0e6c Set up a subscription page with subscription info and the subscribe button, taking that logic out of the payments page. 2014-12-10 13:42:12 -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
6f437d11b1 Some work on making simulation unstoppable. 2014-12-09 09:00:34 -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
39aa34e426 Updated teacher's page description now that core levels are free again. 2014-12-08 10:41:56 -08:00
Imperadeiro98
a96cd4f3c0 Update payments-view.jade 2014-12-08 08:50:12 +00:00
Matt Lott
3deef7f5da Turning off signup title and description A/B tests
These have been on a long time.  Using short title and no description.

Data from Mixpanel:
Description on:
no 42.09
yes 41.91
Title length:
short 42.26
long 41.74
2014-12-07 21:32:09 -08:00
Matt Lott
06367d106b IE8 unsupported message
Had to go low-tech.  IE8 doesn’t make it far enough for a nicely styled
homepage with unsupported message.
2014-12-07 18:56:59 -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
f504490a37 Using big green button for account creation. 2014-12-06 18:18:42 -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
Nick Winter
d53d1d5ace Merginated. 2014-12-06 17:28:11 -08:00
Nick Winter
9bde375dcc Implemented new AuthModal design (sans green button for signup/login). 2014-12-06 17:27:02 -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
bba78970ea Deleted WizardSettingsView. 2014-12-06 10:23:26 -08:00
Scott Erickson
62cab1e76b Admins can now give users discounts and free accounts from the MainAdminView view. 2014-12-06 10:05:52 -08: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
Imperadeiro98
bf7872b059 Update legal.jade 2014-12-05 15:54:35 +00:00
Imperadeiro98
e4be319875 Update legal.jade 2014-12-05 15:43:37 +00:00
Imperadeiro98
7cd8a57d1e Update legal.jade 2014-12-05 15:38:42 +00: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
Scott Erickson
0edf4e0ca1 Fixed a MailChimp test. Fixed payment and subscription handlers to deny anonymous users. Hid the subscribe button from anonymous users. 2014-12-04 13:07:07 -08:00
Scott Erickson
0f706bfdf6 Fixed GPlus login. 2014-12-03 16:40:28 -08:00
Nick Winter
a8ce1bbfb2 Added unsubscribe button and subscription status on payments screen. 2014-12-03 16:11:46 -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
Nick Winter
f9b239ded7 Fixed #1820. 2014-12-01 08:18: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
bd494dd513 Adding in what will eventually be our App Store URL. 2014-11-30 12:44:18 -08:00
Nick Winter
77a4cea387 Improvements for mobile layouts and mobile and iPad browser detection. 2014-11-30 12:27:34 -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
6fccae579a Made d3 load dynamically for the pages that use it. Refactored a bunch of templates and sass files to have their names match with their respective views. 2014-11-29 15:31:56 -08:00
Nick Winter
c226856204 Fixed typo in previous rewadding. 2014-11-29 14:42:46 -08:00
Scott Erickson
02ddd7f698 Fixed #1816. Cleaned up logging in config.coffee. 2014-11-29 13:47:04 -08:00
Scott Erickson
129e07e231 Refactored a bunch of editor stuff to be included in the wads. Fixed a bug with the I18NEditModelView. 2014-11-29 13:36:48 -08:00
Scott Erickson
17f2d76512 Undid some apparent changes from the last commit. 2014-11-29 12:53:57 -08:00
Scott Erickson
9b5228afd9 Refactored the GameMenu to be part of play.js. Set up the config to automatically bundle templates into their respective views, if their names match. 2014-11-29 12:46:04 -08:00
Scott Erickson
1c33842125 Refactored core templates into a core folder. 2014-11-29 11:39:37 -08:00
Nick Winter
912df310a2 Disabled GitHub login for now, since it's too buggy and also makes the server mad slow. 2014-11-29 10:52:53 -08:00
Scott Erickson
1bd70591a0 Added new mongodb versions to be allowed.
Added error logging for every which reason a user may be unable to pay.
Added more info for users when they hit unknown errors.
2014-11-29 10:46:01 -08:00
Scott Erickson
0bbcdd5698 Made all of lib into a wad. Fixed AuthModal. 2014-11-29 08:54:18 -08:00
Nick Winter
89af30f436 Using home play i18n tag instead of common play tag. 2014-11-28 19:49:13 -08:00
Nick Winter
8400eb6016 Reverted Thang Editor style from my item overhaul batch mode. Fixed what I think was a typo in the latest refactoring. 2014-11-28 19:39:51 -08:00
Scott Erickson
31214e854e Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways. 2014-11-28 17:49:41 -08:00
Scott Erickson
b698745e05 Set up the site to load its logic and templates piecemeal rather than in one giant app.js file. 2014-11-28 16:38:56 -08:00
Nick Winter
4b45385571 Working on paper dolls. 2014-11-28 12:11:59 -08:00
Nick Winter
2d2a9ad681 Updated Hour of Code visitor counting. 2014-11-27 09:44:08 -08:00
Nick Winter
4c900b8870 Working on paper doll equipping. 2014-11-26 19:06:57 -08:00
Erlend Birkenes
83e41bb38e Fixed wrong I18n suffix in Thang Editor section on Community page. 2014-11-27 00:41:29 +01:00
Nick Winter
9feb4e6add Using ACE to add syntax highlighting to code documentation. 2014-11-26 12:33:29 -08:00
Nick Winter
2c0bf2fef1 Requiring certain heroes for certain levels, and showing the choose hero view when they go to play a level where the hero has changed. 2014-11-26 08:53:06 -08:00
Nick Winter
3f9aa1ba79 Changed 'Your Skills' to 'Help' for hero level spell palette. 2014-11-26 07:39:13 -08:00
Nick Winter
18238a1781 Silhouetted items show what level they'd need to unlock after a while on hover from inventory modal. 2014-11-26 07:33:07 -08:00
Scott Erickson
790217f227 Tweaked how the I18N editor works to guard against garbage English submissions and make the chosen language more consistent. 2014-11-25 16:22:06 -08:00
Nick Winter
0b4bc61b01 Exposed home slogan for the smaller screens. Re-hid App Store button for now. 2014-11-25 14:31:24 -08:00
Nick Winter
c2f77470a0 Fixed a couple typos Jade was complaining about. 2014-11-25 13:26:04 -08:00
Scott Erickson
8f55b9bc1b Refactored the AccountSettingsView to be both in the site and in the PlayAccountModal. 2014-11-25 12:43:17 -08:00
Scott Erickson
426202d80a Added a simple payments page. 2014-11-25 11:09:29 -08:00
Scott Erickson
2a135eeaf1 Reworked the account modal links and a little bit of the styling. 2014-11-25 10:39:53 -08:00
Scott Erickson
bb766e9610 Reworked the MainAccountView, AccountSettingsView, and MainUserView to try and simplify things a bit. 2014-11-25 10:39:53 -08:00
Scott Erickson
6b8a9593ef Set up the new site chrome to compress when the height of the screen is < 800px tall. 2014-11-25 10:39:53 -08:00
Nick Winter
bbc9b615ea ItemDetailsView showing item descriptions now. 2014-11-25 10:28:31 -08:00
Nick Winter
5c77eea304 You can now buy heroes. 2014-11-25 10:15:10 -08:00
Nick Winter
98f1eec10c Upgraded choose hero view for locked heroes. Went back to animated heroes instead of feature images. Removed some server logs. 2014-11-25 09:28:50 -08:00
Nick Winter
9accd0cb04 You can now buy cross-class items once you have a hero of that class. When you click to buy an item you can't afford, it takes you to the gem shop. Increased amount of items you can purchase a bit more. 2014-11-24 10:51:20 -08:00
Nick Winter
1535b6bdd2 Fixed play footer in new styling regime. 2014-11-23 15:48:08 -08:00
Nick Winter
f248de0dc5 Adding i18n to skill docs. 2014-11-23 12:52:34 -08:00
Nick Winter
c7f8565ae7 Getting a few more placeholder stats filled in automatically in ItemDetailsView. Showing buildTypes for Builder's Hammer docs. Fixed font casing / humanizing for skills granted. 2014-11-23 11:08:20 -08:00
Nick Winter
f16c1b5030 Fixed a few UX issues Chloe found. 2014-11-22 20:56:46 -08:00
Scott Erickson
1a85fea33b Fixed the editor views, get that site chrome outta there. 2014-11-22 18:51:21 -08:00
Nick Winter
6851c309fb Moved older campaigns from world map view to site footer. 2014-11-22 18:45:22 -08:00
Scott Erickson
0e6965d097 Hiding the iPad link for now. 2014-11-22 17:44:26 -08:00
Scott Erickson
cfcd09c112 Set up the new Heald-designed site chrome. 2014-11-22 17:41:13 -08:00
Matt Lott
fcb098b3aa Remove cast button text A/B test 2014-11-22 16:50:49 -08:00
George Saines
2151cd6799 added the additional default inventory icons, added the dungeon map path 2014-11-22 16:14:43 -08:00
Nick Winter
549fb8aa37 Attempting to require purchase of tarnished bronze breastplate in The Raised Sword. 2014-11-21 16:23:26 -08:00
Nick Winter
dae3c9cef6 Always show Buy Gems menu on iPad. 2014-11-21 14:55:04 -08:00
Nick Winter
d00c7d6a3a Allow buying gems when not logged in on iPad. 2014-11-21 14:41:04 -08:00
Nick Winter
f5f2d57db6 Paused branchingGroup A/B test and set everyone to no-practice. Realized that no-practice wasn't working at all, so fixed that. 2014-11-20 19:56:44 -08:00
Nick Winter
afff1056cb Don't be draggin' all these images around yo. 2014-11-19 16:36:06 -08:00
Matt Lott
41db27c709 Apply markdown to error messages and hints 2014-11-19 15:27:06 -08:00
Nick Winter
07a09e34d8 Fixed small-caps font-variant on docs popover titles. 2014-11-19 15:01:30 -08:00
Scott Erickson
13de055c0b Set up a basic achievements list modal for the world map. 2014-11-19 14:56:40 -08:00
Nick Winter
96ff44017e A few fixes for unequippable cross-class item state. 2014-11-18 19:37:08 -08:00
Scott Erickson
1889c771f2 Added the close button to the GameMenuModal. 2014-11-18 13:57:44 -08:00
Scott Erickson
46f9667311 Made the double click hint alert in the inventory modal more visible. 2014-11-18 13:28:04 -08:00
Scott Erickson
a04bc63b87 Equip hint and available header now are visible only when there are items to equip. 2014-11-18 13:20:59 -08:00
Scott Erickson
208f05cf67 Added an equip button to every piece of available equipment. 2014-11-18 13:02:06 -08:00
Matt Lott
05cc9c2f46 Move sync pvp status UI to control bar
Replaces level name UI for hero-ladder levels.
2014-11-18 09:01:07 -08:00
Scott Erickson
95dca575d1 Set up stripe on the server and site to allow purchases through the website. 2014-11-17 15:15:08 -08:00
Matt Lott
f56d01419f Update sync pvp teams and real-time playback
-Non-creator will switch teams upon joining a sync pvp game, if creator
is on same team
-Team swapping should only affect level session
-Real-time multiplayer submit now reloads PlayLevelView to ease loading
both player’s latest level sessions, and then automatically starts
real-time playback.
2014-11-17 15:07:10 -08:00
Nick Winter
e5aada2e5b Incorporated tweaked victory modal background assets. 2014-11-16 21:26:21 -08:00
Nick Winter
b7c2a33ddc Fixed some i18n on the PlayHeroesModal, and started showing special hero skills. 2014-11-15 07:40:10 -08:00
Nick Winter
7bbc270f26 Merge pull request #1748 from Imperadeiro98/master
Update achievements.jade
2014-11-15 07:32:28 -08:00
Scott Erickson
36305cde97 Altered the G+ login button to only login when you click it, it gives feedback on login progress, and fixed a bug where sometimes there would be a cross-domain error because we were trying to serialize a window. 2014-11-14 11:04:24 -08:00
Nick Winter
05a3577de9 Fixed a mistake with level progression around the Forgetful Gemsmith move. Fixed double-click-to-equip sizing. Locked purchases for cross-class items for real now. Additional insurance for clearing selection after code reload. 2014-11-13 10:49:37 -08:00
Imperadeiro98
4c8d959c8a Update achievements.jade
The titles were not being translated.
2014-11-13 17:02:32 +00:00
Scott Erickson
ed8285248f Put in the new InventoryModal background. 2014-11-12 18:01:35 -08:00
Scott Erickson
5b034194ee Put in the new BuyGemsModal design. 2014-11-12 17:17:24 -08:00
Scott Erickson
07cf741015 Changed the campaign switching icons arrows nested in the campaign maps. 2014-11-12 16:26:35 -08:00
Scott Erickson
1b73569072 Forgot jade != coffeescript. 2014-11-12 14:34:23 -08:00
Scott Erickson
a7d48f4b3c Tweaked the gems icon to be visible for ipad and admins. 2014-11-12 14:25:34 -08:00
Scott Erickson
913dda65aa Created the VectorIconSetupModal, a quick way to get portraits aligned to a container. 2014-11-12 14:14:07 -08:00
Scott Erickson
c3eecd15be Set up the WorldMapView to update the gem count when a player purchases gems or items. 2014-11-12 10:22:56 -08:00
Scott Erickson
ad35109878 Built the BuyGemsModal stub. 2014-11-12 09:40:55 -08:00
Nick Winter
0af7b4d5b7 Preparing for being able to use multiple hero classes. Deleted old ChooseHeroView. Improvements to missile trajectories. 2014-11-11 16:37:00 -08:00
Nick Winter
bc4c4353b2 Added a signup button to the level when not logged in. 2014-11-11 08:49:16 -08:00