1217 commits

Author	SHA1	Message	Date
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	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	1bb76d5902	Fixed shadow placements.	2014-12-23 09:12:41 -05:00
Scott Erickson	d18260c20c	Merge branch 'master' into feature/campaign-editor	2014-12-22 16:39:07 -05:00
Scott Erickson	0bdec68cfc	Set up a save button.	2014-12-22 16:21:57 -05:00
Imperadeiro98	72e426c0e0	Fixed another link	2014-12-22 18:16:06 +00: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
Imperadeiro98	2bca94161e	Fixed a link	2014-12-22 11:22:06 +00:00
Imperadeiro98	0c00f9f0c1	Delete contribute_nav.jade	2014-12-21 21:09:52 +00:00
Nick Winter	f26b43f8a5	Fixed floor y scaling. Fixed issues with client-side disabling of new model / fork / revert population actions without permissions. Ameliorated some ensure_comprehensions warnings.	2014-12-20 16:02:41 -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
Imperadeiro98	a52bf08792	Fixed links	2014-12-20 09:32:59 +00:00
Nick Winter	08cb87c84d	Automatically take screenshots when submitting contact form from level view.	2014-12-19 18:37:42 -08:00
Nick Winter	2df1318e1b	Hooked up i18n for redesigned contribute view.	2014-12-19 15:35:18 -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
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
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