816 commits

Author	SHA1	Message	Date
Nick Winter	913de5dc8c	Additional tweak for #2005.	2014-12-28 15:26:04 -08:00
Imperadeiro98	9018e41c2c	Fixed a issue	2014-12-28 22:43:08 +00: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	f0826c865e	Preparing new campaign levels for migration to new campaign editor.	2014-12-23 17:14:35 -08:00
Scott Erickson	96c8e035cf	Added a CampaignLevelView stub that appears when you double click a level node or one of its children on the treema.	2014-12-23 09:42:24 -05:00
Scott Erickson	b567e737cd	Tweaked campaign editor styling.	2014-12-23 09:19:24 -05:00
Scott Erickson	e6c914f443	Tweaked campaign editor styling.	2014-12-23 09:19:08 -05:00
Scott Erickson	0dd2d9efbd	Handled merge conflict.	2014-12-22 12:33:52 -05:00
Nick Winter	e8d185a860	Embedding level completion checklist inside the level editor.	2014-12-20 20:01:07 -08:00
Nick Winter	8528f5039b	Linking to FAQ from contact page. Now showing all Components in level editor, not just ones that are present in the level.	2014-12-20 14:40:28 -08:00
Nick Winter	2df1318e1b	Hooked up i18n for redesigned contribute view.	2014-12-19 15:35:18 -08: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
George Saines	9e88caf1e1	redesigned the contribute page	2014-12-18 16:31:30 -08:00
Matt Lott	7c87dc0c3a	Make spell palette help label a button	2014-12-18 00:19:40 -08:00
Nick Winter	1b584ae72c	Some fixes for desert campaign options.	2014-12-17 19:37:57 -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	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
Nick Winter	87c34e81c6	Using new border image popover backgrounds.	2014-12-10 11:00:52 -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
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	7651eaf6cc	Fixed A/B test to fire with default English language.	2014-12-09 11:15:03 -08:00
Matt Lott	1aff798c5e	A/B Test alternate subscribe modal copy	2014-12-08 23:43:52 -08:00
Nick Winter	74b426ffbf	Fixed #1875.	2014-12-08 06:24:59 -08:00
Nick Winter	7854d6bf5a	Fixed #1868. Fixed #1846. Made sure that home view slogan always fits in all languages.	2014-12-07 20:17:22 -08:00
Nick Winter	2278e28c42	Hid tooltip arrow for game menu controls.	2014-12-07 18:05:12 -08:00
Nick Winter	5d1a34519b	Fixed up our headings font family fallback.	2014-12-07 17:57:57 -08:00
Nick Winter	01c6709c36	Implemented George's WorldMapView user status line design.	2014-12-07 16:55:08 -08:00
Nick Winter	ac4a252a5e	Fixed some border images in Firefox, and hopefully in other browsers.	2014-12-07 15:51:32 -08:00
Nick Winter	1ba57c7ae1	Fixed issues with gems prompt not laying out properly from item store details view.	2014-12-07 15:29:42 -08:00
Nick Winter	774d366d96	Fixed error padding issue on AuthModal.	2014-12-07 14:37:13 -08:00
Nick Winter	6880a9621e	Fixed overeager modal selection on PlayHeroesModal.	2014-12-07 14:32:23 -08:00
Nick Winter	7a9d09654d	Fixed ellipsis and font on item names in item details view when viewed from inventory modal.	2014-12-07 14:22:59 -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	12a109f146	Lowered ambient WorldMap volume. Hacked together ranger right-hand builder's hammer positioning for now.	2014-12-06 20:06:14 -08:00
Nick Winter	f504490a37	Using big green button for account creation.	2014-12-06 18:18:42 -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	b976a11d65	Removed the module loader modal, replaced with a simple progress bar at the top of the screen.	2014-12-06 13:11:47 -08:00
Nick Winter	477ebb3c48	Fixed an error I saw in Errorception, and a Sass problem I saw in Webkit.	2014-12-06 11:05:52 -08:00
Nick Winter	bba78970ea	Deleted WizardSettingsView.	2014-12-06 10:23:26 -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
Matt Lott	d6265a4065	Fix default locked code css ... Couldn’t get multiple ranges to highlight ranges correctly, so leaving it on for python and coffeescript only.	2014-12-05 14:15:43 -08:00
Matt Lott	bd797e8cfd	Highlight locked default code	2014-12-04 16:33:59 -08:00