1706 commits

Author	SHA1	Message	Date
Scott Erickson	472f8899dd	Merge branch 'master' of https://github.com/tmrdja/codecombat into tmrdja-master ... Conflicts: app/views/editor/level/edit.coffee	2014-04-24 13:17:43 -07:00
Nick Winter	b9173a5ea5	Fixed #913, I think. (This was just built into marked.)	2014-04-24 12:24:22 -07:00
Scott Erickson	0a313a110c	Removed a piece of logging.	2014-04-24 12:07:11 -07:00
Scott Erickson	8ab50205aa	Fixed more buttons in treema.	2014-04-24 11:50:49 -07:00
Scott Erickson	1eb2adbc61	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-24 11:22:50 -07:00
Scott Erickson	76f36294b0	Fixed #908, while keeping things like opening revert or contact modals in the level editor from breaking.	2014-04-24 11:22:43 -07:00
Nick Winter	73f39095e6	Upgraded table sorter.	2014-04-24 11:09:01 -07:00
tmrdja	14ebc957de	Changed responsive view for LevelEditor	2014-04-24 11:51:16 +02:00
Michael Schmatz	c408196814	Fix for runtime errors	2014-04-23 16:44:31 -07:00
Nick Winter	86aa4cd0fe	Updated janky include_flow skip levels.	2014-04-23 16:11:47 -07:00
Darredevil	47eef39bc7	Added Gold Rush level	2014-04-24 02:07:59 +03:00
Nick Winter	68f3eeb770	Two tiny profile improvements.	2014-04-23 11:26:20 -07:00
Michael Schmatz	628a784ac4	Progress towards LinkedIn integration	2014-04-23 11:25:36 -07:00
Scott Erickson	c85971e5e6	Added i18n population action to the level editor.	2014-04-22 17:56:41 -07:00
Scott Erickson	9c8841e838	Merge remote-tracking branch 'origin/master'	2014-04-22 16:42:50 -07:00
Scott Erickson	5921575a02	Hack to fix a bug with the components view in the thang editor.	2014-04-22 16:42:41 -07:00
dpen2000	dd00e2abe6	Replace generic text Sign Up to Create a New Content	2014-04-23 00:37:10 +01:00
edtrist	3962d37681	#889 - moved CocoCollection.coffee to app/collections and updated references	2014-04-22 20:42:26 +01:00
Michael Schmatz	7419b269f1	Merge pull request #894 from codecombat/feature/worker-lint ... Background linting/transpilation/hasChangedSignificantly	2014-04-22 12:05:03 -07:00
Michael Schmatz	6122d31e28	Removed web worker logging listener	2014-04-22 12:03:33 -07:00
Michael Schmatz	3110e6e56a	Renamed test_worker to aether_worker	2014-04-22 11:58:27 -07:00
Michael Schmatz	392dbb9f8d	Removed superfluous comment	2014-04-22 11:51:51 -07:00
Michael Schmatz	3bbedbc100	Added background transpile	2014-04-22 11:46:17 -07:00
Nick Winter	ab77176ed0	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-22 11:11:10 -07:00
Nick Winter	675db1b76f	Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents.	2014-04-22 11:11:08 -07:00
Michael Schmatz	e0f8d1343e	Fixed race condition	2014-04-22 11:04:56 -07:00
Scott Erickson	bb0cbf1151	Removed some old code that didn't work out.	2014-04-22 10:43:08 -07:00
Michael Schmatz	81809956b8	hasChangedSignificantly async refactor ... Still checking for bugs	2014-04-22 08:54:35 -07:00
Scott Erickson	f57be1ae52	Migrated to the new email system, along with a setting for recruit notifications.	2014-04-21 16:15:23 -07:00
Michael Schmatz	0f435b41ae	Merge pull request #885 from codecombat/master ... Merge master into worker-lint	2014-04-21 14:13:43 -07:00
Scott Erickson	1e50ef36ce	Merge branch 'RefactorAndDeltaSystemNaming' of https://github.com/dpen2000/codecombat into dpen2000-RefactorAndDeltaSystemNaming	2014-04-21 12:53:11 -07:00
tmrdja	826a5f56db	Added responsive view for LevelEditor	2014-04-21 21:15:22 +02:00
Scott Erickson	c754f7b943	Merge branch 'master' into feature/loading-views	2014-04-21 11:53:18 -07:00
Scott Erickson	9bc8ae11da	Fixed some indentation.	2014-04-21 11:42:21 -07:00
dpen2000	de69f740e4	Fix deltas referring to last system saved ... If a system is added, it is added to treema at the end of the list of systems. Treema then raises it's changed event resulting in this order being set on the level. The next time a system is added, the first system is in it's correct position and so the delta shows it as moving. This changes ensures we save the correct order in the first instance.	2014-04-19 19:59:21 -04:00
Scott Erickson	044556e5a4	Fixed a bug with the level editor that prevented selecting thangs to add.	2014-04-19 10:27:14 -07:00
Ting-Kuan	974e5e1b24	remove debugging msg.	2014-04-19 13:09:50 -04:00
Ting-Kuan	7321052c18	Fix supermodel with resource value and fix ladder view under supermodel resource management.	2014-04-19 13:06:47 -04:00
Ting-Kuan	375aca2c0a	Fix: Some level systems load forever.	2014-04-19 12:08:40 -04:00
Ting-Kuan	692693c181	Merge branch 'master' into feature/loading-views ... Conflicts: app/locale/en.coffee app/views/editor/level/edit.coffee app/views/kinds/CocoView.coffee app/views/play/ladder/ladder_tab.coffee app/views/play/ladder_view.coffee app/views/play/level/level_loading_view.coffee	2014-04-19 01:15:04 -04:00
Michael Schmatz	a7867e5e2d	Added background linting ... Background hasChangedSignificantly is soon!	2014-04-18 14:59:08 -07:00
dpen2000	b20f8fd260	Refactor getNameById to use mongo db's $in instead of parallel and use a new generic method in Handler.coffee	2014-04-18 21:06:57 +01:00
George Saines	71ee31ef49	styling the community page	2014-04-18 13:02:07 -07:00
Nick Winter	848ebf2ffe	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-18 09:53:34 -07:00
Nick Winter	844c1391ca	Reworked top nav. Many improvements to job profile form.	2014-04-18 09:53:28 -07:00
Ting-Kuan	75224e0cd9	hideLoading on ThangEditView and ComponentConfigView.	2014-04-17 22:41:07 -04:00
Ting-Kuan	64f986c286	Remove dependency management in supermodel.	2014-04-17 22:16:29 -04:00
Scott Erickson	ed0c7e1412	Creators of documents are automatically added as watchers. Added a patch creation email for watchers.	2014-04-17 17:09:01 -07:00
Ting-Kuan	69fe4428e4	Before merge to master.	2014-04-17 19:52:09 -04:00
Ting-Kuan	a5e2069d60	Move onLoaded logic from CocoView to ChildrenView. Prevent level_loading_view being unveiled before game starts.	2014-04-17 19:37:31 -04:00
Ting-Kuan	1c1cf2f189	Fix loading of Level.	2014-04-17 19:23:35 -04:00
Scott Erickson	21e8d7b26f	Fixed patches denormalization.	2014-04-17 15:44:19 -07:00
Scott Erickson	7ccaa8c843	Fixed a bug, colored a badge.	2014-04-17 14:39:52 -07:00
Scott Erickson	cdaf2ebfaf	Set up the tabs and views in the level editor to reload so that when patches are applied, their changes are visible.	2014-04-17 14:23:33 -07:00
Ting-Kuan	b7439ed1ca	Fix loading bar and retry block in ladder_view, #857.	2014-04-17 16:54:26 -04:00
Scott Erickson	781a8ec913	Fixed the play and save buttons.	2014-04-17 13:37:08 -07:00
Scott Erickson	07afba01df	Merge branch 'master' into feature/jsondiffpatch ... Conflicts: app/views/editor/level/thangs_tab_view.coffee	2014-04-17 13:25:42 -07:00
Scott Erickson	b5406b0149	Set up the rest of the component/system buttons and nav bars.	2014-04-17 13:24:17 -07:00
Ting-Kuan	fe96289bf6	debugging: ladder_view doesn't show loading bar.	2014-04-17 15:57:08 -04:00
Nick Winter	2230b32829	Merge pull request #863 from dpen2000/FixTypeError ... Fix javascript error occuring when e is null/undefined	2014-04-17 11:37:51 -07:00
Scott Erickson	9eff958dcb	Fixed the level and component watch buttons.	2014-04-17 11:35:09 -07:00
Nick Winter	46487f55a4	Fixed up some styles for job profile page, and prevented long links from destroying things with poor wrapping.	2014-04-17 11:34:55 -07:00
dpen2000	7bc9bb5328	Fix javascript error occuring when e is null/undefined	2014-04-17 14:32:35 -04:00
Scott Erickson	8f4535853b	Fixed the component history button.	2014-04-17 11:29:12 -07:00
Scott Erickson	4c1143f026	Tweaked the versions history modal.	2014-04-17 11:22:33 -07:00
Scott Erickson	8a2b762446	Fixed a bug where opening a modal by data attributes would sometimes open it multiple times.	2014-04-17 11:12:09 -07:00
Scott Erickson	8859405e18	Reworked the nav bars in the level editor.	2014-04-17 11:02:00 -07:00
Nick Winter	40367e701c	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-17 10:12:26 -07:00
Nick Winter	eec1888b22	gzipping when in production but not going through Cloudflare.	2014-04-17 10:12:23 -07:00
Ting-Kuan	360e594f3d	Merge branch 'feature/loading-views' of https://github.com/codecombat/codecombat into feature/loading-views ... Conflicts: server/commons/Handler.coffee	2014-04-17 12:58:29 -04:00
dpen2000	a6ed7c9bff	Fix players above the current player coming out in wrong order in original and simulators leaderboard	2014-04-16 18:20:59 -04:00
Michael Schmatz	e764277874	Merge pull request #850 from dpen2000/MoreSimulatorsLeaderboardImprovements2 ... Implement rank column in simulators leaderboard	2014-04-16 13:26:42 -07:00
Scott Erickson	02a7381fa9	Fixed the watch buttons for levels and components.	2014-04-16 11:02:40 -07:00
Scott Erickson	731726dcd3	Merge branch 'master' into feature/jsondiffpatch	2014-04-16 10:42:43 -07:00
Scott Erickson	f88e0ac0ab	Set up patches for components.	2014-04-16 10:42:32 -07:00
dpen2000	62e2de6cee	Split simulate tab into own view / template Leaving out "RESET AND SIMULATE GAMES" button for now	2014-04-16 17:07:25 +01:00
Scott Erickson	b9a978dd13	Fixed the colors tab view.	2014-04-16 08:44:04 -07:00
Ting-Kuan	2e50d7b15d	Merge branch 'feature/Change-view-to-fit-new-supermodel' into feature/loading-views ... Conflicts: app/views/play/ladder/ladder_tab.coffee app/views/play/ladder_view.coffee	2014-04-16 11:38:05 -04:00
Scott Erickson	476d153717	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-16 08:07:54 -07:00
Scott Erickson	94c4179417	Fixed some things that were keeping brunch from working.	2014-04-16 08:03:41 -07:00
Ting-Kuan	c53eb562a3	Remove debug msg.	2014-04-16 02:31:18 -04:00
Ting-Kuan	52a73ceae3	Migrate view to fit new supermodel.	2014-04-16 02:28:59 -04:00
Scott Erickson	c395a3414e	Merge branch 'master' into feature/jsondiffpatch	2014-04-15 15:18:57 -07:00
dpen2000	a74f89c30c	Implement rank column in simulators leaderboard	2014-04-15 23:13:10 +01:00
Scott Erickson	58b1019934	Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor.	2014-04-15 15:09:36 -07:00
Nick Winter	f762d95ab8	ModelModal and simple leaderboard pagination.	2014-04-15 15:01:54 -07:00
Scott Erickson	e06c3dbb0b	Fixed the thangs tab view preventing the new patches view from handling clicks correctly.	2014-04-15 13:21:33 -07:00
Scott Erickson	1efabc3738	Fixed the fix.	2014-04-15 12:31:35 -07:00
Scott Erickson	69fba34f64	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-15 12:27:46 -07:00
Scott Erickson	b238ccaf27	Fixed the context-menu preventer in the level editor.	2014-04-15 12:27:35 -07:00
Scott Erickson	bb53e963b6	Removed a hack no longer needed.	2014-04-15 12:27:11 -07:00
Nick Winter	e49344bd87	A few job profile fixes and cleanup.	2014-04-15 10:45:54 -07:00
Ting-Kuan	af399f4415	Merge branch 'master' into feature/loading-views	2014-04-15 13:34:20 -04:00
Nick Winter	9194f842e6	Added some job description fields.	2014-04-15 09:28:19 -07:00
Nick Winter	1239617bd4	Fixed browser majorVersion detection for Safari. Adjusted range radius property regexp.	2014-04-14 16:34:11 -07:00
Nick Winter	2b7e629c7f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-14 14:49:42 -07:00
Nick Winter	e908ae2fb4	Fixed #772.	2014-04-14 14:49:38 -07:00
gosnat	ebddcb57a9	Update play_view.coffee ... Adding the "Find the Spy" level to the user created list.	2014-04-14 15:43:23 -05:00
Nick Winter	1794e5e040	Fixed #813 (sort of).	2014-04-14 11:18:02 -07:00
Nick Winter	8aa36178af	Fixed #769. Added some analytics timing tracking. Added replacement for $.browser.	2014-04-13 20:31:23 -07:00
dpen2000	2345a7d8e8	Additional fix on #831 - remove additional call to fetch as constructor of SimulatorsLeaderboardData does fetch, remove commented code	2014-04-13 19:58:50 -04:00
Nick Winter	af0b8aa5e2	A few fixes and cleanup for #831.	2014-04-13 15:28:16 -07:00
Nick Winter	3d945492b0	Merge branch 'SimulatorsLeaderboard2' of git://github.com/dpen2000/codecombat into dpen2000-SimulatorsLeaderboard2	2014-04-13 14:48:45 -07:00
Nick Winter	a9725f2dc6	A bit of error handling.	2014-04-13 14:48:36 -07:00
Ting-Kuan	8e19d8b71f	Change some resource loading logic to fit new SuperModel.	2014-04-13 13:29:43 -04:00
Ting-Kuan	573a4ae847	Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815 ... Conflicts: app/models/SuperModel.coffee app/views/editor/thang/edit.coffee	2014-04-13 10:37:35 -04:00
Ting-Kuan	4979344ee5	Remove schema loading code.	2014-04-13 10:36:09 -04:00
dpen2000	ec3c292b72	Implement simulators leaderboard	2014-04-13 02:35:58 +01:00
Nick Winter	08616def10	Refactored contribute views to share some templates and link to users' profile photos and GitHub accounts when available.	2014-04-12 14:53:09 -07:00
Ting-Kuan	77c4c586dd	Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815 ... Conflicts: app/locale/en.coffee	2014-04-12 17:13:06 -04:00
Ting-Kuan	508b570fea	Merge branch 'master' into feature/loading-views ... Conflicts: .gitignore app/locale/en.coffee app/models/SuperModel.coffee app/views/editor/thang/edit.coffee app/views/kinds/CocoView.coffee	2014-04-12 17:07:30 -04:00
Ting-Kuan	0e08a4106b	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: scripts/windows/coco-dev-setup/batch/localisation/fr.coco scripts/windows/coco-dev-setup/batch/localisation/languages.coco scripts/windows/coco-dev-setup/batch/localisation/zh.coco scripts/windows/coco-dev-setup/batch/localization/de.coco scripts/windows/coco-dev-setup/batch/localization/zh-HANS.coco scripts/windows/coco-dev-setup/batch/localization/zh-HANT.coco scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat scripts/windows/coco-dev-setup/batch/scripts/get_language.bat scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat scripts/windows/coco-dev-setup/batch/scripts/get_text.bat scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat scripts/windows/coco-dev-setup/batch/scripts/setup.bat scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat scripts/windows/coco-dev-setup/batch/setup.bat scripts/windows/coco-dev-setup/recycle_bin/dev-setup.bat scripts/windows/coco-dev-setup/recycle_bin/git-test.bat	2014-04-12 16:52:14 -04:00
Ting-Kuan	7ae3bd5a60	Fix style and supermodel based on #815. ... Fix ladder_view and ladder_tab. Change error handling functions in CocoView.	2014-04-12 16:29:49 -04:00
Nick Winter	8349578057	Fixed #786.	2014-04-12 12:35:45 -07:00
Scott Erickson	30f785f7cf	Moved the model schemas into a models folder.	2014-04-12 10:51:02 -07:00
Scott Erickson	5a794306fe	Merge branch 'refactorSchemas' of https://github.com/adi2412/codecombat into adi2412-refactorSchemas	2014-04-12 08:53:24 -07:00
Scott Erickson	6eab5003f8	Merge branch 'feature/jsondiffpatch'	2014-04-12 08:52:35 -07:00
Scott Erickson	10b1660419	Fixed the level editor so you can save again.	2014-04-12 08:48:49 -07:00
Aditya Raisinghani	e04787475c	Rebased master to get updated schemas and added patch schema	2014-04-12 15:16:42 +05:30
Aditya Raisinghani	b932bf1e7c	Deleted schemas from /server and modified files to point to /app/schemas	2014-04-12 14:45:59 +05:30
Aditya Raisinghani	6fb5b59a01	Refactored schemas to be in /app	2014-04-12 14:33:55 +05:30
Scott Erickson	35fe47bbac	Merge branch 'feature/jsondiffpatch'	2014-04-11 22:52:58 -07:00
Scott Erickson	53579b2632	Merge branch 'master' into feature/jsondiffpatch ... Conflicts: app/templates/editor/level/save.jade app/templates/editor/thang/edit.jade	2014-04-11 22:52:05 -07:00
Scott Erickson	308adec7c7	Merge branch 'master' into feature/jsondiffpatch ... Conflicts: app/templates/editor/level/save.jade app/templates/editor/thang/edit.jade	2014-04-11 22:52:00 -07:00
Scott Erickson	0eb74ab287	Added buttons for performing actions on patches.	2014-04-11 22:33:09 -07:00
Nick Winter	a792286161	Ameliorated #468, maybe. At least, it doesn't erroneously show the name errors any more.	2014-04-11 22:30:28 -07:00
Scott Erickson	34bf484bf2	Added data merge conflict handling.	2014-04-11 21:11:52 -07:00
Nick Winter	99ead5d193	#223 is done, since goals aren't in scripts, and I just removed some goals-of-scripts stuff.	2014-04-11 19:51:20 -07:00
Ting-Kuan	a6235842b6	Change populate model to accept resource name.	2014-04-11 22:35:20 -04:00
Nick Winter	f0aa5e1d5e	Fixed #681 by removing full-screen button in Safari.	2014-04-11 18:19:52 -07:00
Nick Winter	99b430c1b4	Fixed #714 with a hack.	2014-04-11 17:55:47 -07:00
Nick Winter	91c2f0fa33	Fixed #715, and some misc cleanup.	2014-04-11 17:36:15 -07:00
Nick Winter	97d4017869	Hacky way to get play background to fit with new loading image.	2014-04-11 16:15:26 -07:00
Nick Winter	1607790ea3	Updated jQuery UI from 1.10.3 to 1.10.4 for Treema autocomplete bug.	2014-04-11 14:59:09 -07:00
Scott Erickson	bbb9fb7a64	Added a patches view.	2014-04-11 14:19:17 -07:00
Nick Winter	10bb17c38a	Added getThangByID method to Thang. Handled a few error corner cases with the time popup.	2014-04-11 14:03:13 -07:00
Nick Winter	b330e783bf	Merge branch 'signupSocialButtons' of git://github.com/adi2412/codecombat into adi2412-signupSocialButtons	2014-04-11 13:28:11 -07:00
Nick Winter	ae65f07e7e	Added some i18n and improved employer page.	2014-04-11 12:49:44 -07:00
Scott Erickson	e3a1f170cf	Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader ... Conflicts: app/views/kinds/CocoView.coffee app/views/play/level/level_loading_view.coffee	2014-04-11 11:19:16 -07:00
Nick Winter	3751bf903e	Merge pull request #806 from 1c7/master ... New features: chinese language version use Youku	2014-04-11 10:33:10 -07:00
Scott Erickson	97a7bc7614	Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch ... Conflicts: app/initialize.coffee bower.json	2014-04-11 10:32:19 -07:00
Nick Winter	8d5e129c2c	Merged the jobs in. Look out for Treema bugs from the last four months.	2014-04-11 10:20:12 -07:00
Nick Winter	26266963f4	Updated to jQuery 2.1.	2014-04-11 10:12:39 -07:00
Nick Winter	a68f3efb99	Added specific job profile photo support. Improved right column design a bit.	2014-04-10 17:54:28 -07:00
Nick Winter	7a35a6248f	Adding contact form for employers to contact candidates.	2014-04-10 14:59:32 -07:00
Ting-Kuan	a5e6496a7c	Make resources as static class to avoid loading multiple times. ... Clean debug message.	2014-04-10 16:59:08 -04:00
Scott Erickson	a3951b0fa7	Extended the save version modal to allow submitting patches.	2014-04-10 13:09:44 -07:00
Nick Winter	e9416ee128	Added some autocompleters for job profile Treema. Projects are now entirely links.	2014-04-10 11:58:51 -07:00
Michael Schmatz	a796d88967	Fixed tutorial modal for nonexistent tutorials	2014-04-10 11:42:22 -07:00
Scott Erickson	3c832d3707	Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks.	2014-04-10 11:13:33 -07:00
Michael Schmatz	42bf2996af	Made Aether ignore variable hoisting ... See #813	2014-04-10 10:36:32 -07:00
Scott Erickson	5629284c76	Added text diff library to delta view.	2014-04-10 10:24:14 -07:00
Scott Erickson	66d455285e	Integrated the delta view into the save view for levels.	2014-04-09 19:07:44 -07:00
Nick Winter	26cebf7e7e	Fixing some recruitment profile bugs.	2014-04-09 18:10:30 -07:00
Nick Winter	dd46f9d039	Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks.	2014-04-09 16:46:44 -07:00
Scott Erickson	b15380047c	Tweak to view.	2014-04-09 16:09:53 -07:00
Scott Erickson	f2d21b960f	Added a delta subview for displaying deltas of schema'd data.	2014-04-09 16:09:35 -07:00
Nick Winter	f17775cc10	Implemented George's jobs page design.	2014-04-09 13:14:52 -07:00
Aditya Raisinghani	495d1be620	Added social buttons to Sign up modal	2014-04-10 01:01:30 +05:30
Nick Winter	76054345d7	Fixed #805.	2014-04-09 09:04:59 -07:00
1c7	56c18441e4	use youku for Chinese Version	2014-04-09 13:50:13 +08:00
Nick Winter	c226835ff2	Fixed a couple bugs in custom TreemaNodes.	2014-04-08 17:13:05 -07:00
Ting-Kuan	6729cfc292	First commit.	2014-04-08 12:03:03 -04:00
Nick Winter	b96bca8c18	Finished most of basic features for job profiles.	2014-04-07 17:58:02 -07:00
Nick Winter	9af6694054	More work on the job profiles.	2014-04-07 15:21:05 -07:00
Aditya Raisinghani	7cc9d22254	Moved nanoscroller to bower components and related fixes.	2014-04-08 03:04:36 +05:30
Nick Winter	1b79de0d86	Loading active candidate profiles from the database into a table for employers.	2014-04-06 17:01:56 -07:00
Nick Winter	13f34341b2	Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat	2014-04-06 14:55:14 -07:00
Ting-Kuan	ac51404d4c	remove debug msg.	2014-04-06 16:40:06 -04:00
Ting-Kuan	20c624e0b8	Refactor CocoView.	2014-04-06 16:37:00 -04:00
Aditya Raisinghani	634ed82938	Fixed the background for spectate view	2014-04-07 01:00:35 +05:30
Nick Winter	5c8c7fff1d	Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower.	2014-04-05 17:05:03 -07:00
Ting-Kuan	4e41676219	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-05 10:51:40 -04:00
Scott Erickson	abaf32fc7a	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-04 14:57:55 -07:00
Michael Schmatz	2411269f2b	Added rank/number of sessions text	2014-04-04 14:55:55 -07:00
Michael Schmatz	0684bcff9c	Improved styling on graphs	2014-04-04 14:22:30 -07:00
Scott Erickson	2093049f5c	Fixed a bug with the profile view caused by the new page loading system.	2014-04-04 13:59:40 -07:00
Michael Schmatz	06f164525f	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/views/play/ladder/ladder_tab.coffee	2014-04-04 13:48:39 -07:00
Michael Schmatz	7019bb6dea	Added score histogram to ladder tab	2014-04-04 13:38:36 -07:00
Ting-Kuan	de9337820b	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/assets/main.html scripts/windows/coco-dev-setup/batch/config/finished_header.coco scripts/windows/coco-dev-setup/batch/config/github_header.coco scripts/windows/coco-dev-setup/batch/config/install_header.coco scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco scripts/windows/coco-dev-setup/batch/config/readme.coco scripts/windows/coco-dev-setup/batch/localisation/de.coco scripts/windows/coco-dev-setup/batch/localisation/fr.coco scripts/windows/coco-dev-setup/batch/localisation/languages.coco scripts/windows/coco-dev-setup/batch/localisation/zh-HANS.coco scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco scripts/windows/coco-dev-setup/batch/localisation/zh.coco scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat scripts/windows/coco-dev-setup/batch/scripts/get_array.bat scripts/windows/coco-dev-setup/batch/scripts/get_config.bat scripts/windows/coco-dev-setup/batch/scripts/get_download.bat scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat scripts/windows/coco-dev-setup/batch/scripts/get_extension.ps1 scripts/windows/coco-dev-setup/batch/scripts/get_language.bat scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.bat scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat scripts/windows/coco-dev-setup/batch/scripts/get_text.bat scripts/windows/coco-dev-setup/batch/scripts/get_var.ps1 scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1 scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat scripts/windows/coco-dev-setup/batch/scripts/open_readme.bat scripts/windows/coco-dev-setup/batch/scripts/open_text_file.bat scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat scripts/windows/coco-dev-setup/batch/scripts/print_file.bat scripts/windows/coco-dev-setup/batch/scripts/print_finished_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_github_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_info.bat scripts/windows/coco-dev-setup/batch/scripts/print_install_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_license.bat scripts/windows/coco-dev-setup/batch/scripts/print_npm_and_brunch_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat scripts/windows/coco-dev-setup/batch/scripts/run_script.bat scripts/windows/coco-dev-setup/batch/scripts/setup.bat scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat scripts/windows/coco-dev-setup/batch/setup.bat	2014-04-04 14:32:42 -04:00
Scott Erickson	1971ddcefb	Moved somethingLoaded calls until after calls that would register more to load. A probably suboptimal way of making sure the progress numerator never reaches the progress denominator until it's actually time.	2014-04-04 10:12:22 -07:00
Ting-Kuan	fe27756b06	Pull from upsatream.	2014-04-04 12:52:22 -04:00
Scott Erickson	978c84bc89	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-03 18:43:36 -07:00
Scott Erickson	3b3b825be0	Set up a new loading/progress system for views.	2014-04-03 18:43:29 -07:00
Nick Winter	9a70abb104	Don't need to explicitly skip Mobile Artillery's next level now.	2014-04-03 16:37:24 -07:00
Aditya Raisinghani	1c3117836f	Shifted nanoscroller to vendor.	2014-04-04 00:13:09 +05:30
Michael Schmatz	3aa31c7246	Graphs with D3!	2014-04-02 18:41:11 -07:00
Nick Winter	670f94cc22	Fixed #418, no more print/save dialogues evaaarr.	2014-04-02 14:42:34 -07:00
Aditya Raisinghani	44979c074d	Integrated nanoscroller.	2014-04-03 03:10:06 +05:30
Nick Winter	ae9769e3ce	Added read only notification in editors. Fixed #374.	2014-04-01 13:15:30 -07:00
Nick Winter	ba3c4af536	Fixed last piece of #673.	2014-04-01 10:51:03 -07:00
Nick Winter	b316a3e078	Merge branch 'dev/Warn_when_a_depended-on_System_is_missing' of git://github.com/gintau/codecombat into gintau-dev/Warn_when_a_depended-on_System_is_missing	2014-04-01 09:44:06 -07:00
Nick Winter	785cb342a2	Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master	2014-04-01 09:12:48 -07:00
Ting-Kuan	e076440d1b	Move Noty to vendor folder.	2014-04-01 02:41:04 -04:00
Ting-Kuan	085d181ed3	Use Noty to produce warning message while adding component with not added system.	2014-04-01 00:47:50 -04:00
Nick Winter	8c013c1192	Fixed 101: added level completion status to /play.	2014-03-31 15:48:22 -07:00
Nick Winter	389323953b	Fixed #180.	2014-03-31 13:56:13 -07:00
Nick Winter	d8a194f895	Actually using loading screen template.	2014-03-31 13:21:08 -07:00
Dominik Kundel	1c6aea9c1c	Merge remote-tracking branch 'upstream/master'	2014-03-31 20:35:32 +02:00
tmrdja	dfe6bce351	Added contextmenu ... Added contextmenu	2014-03-31 18:33:14 +02:00
Nick Winter	cb27124285	Fixed #135.	2014-03-30 17:24:07 -07:00
tmrdja	f8de6162d1	Added contextmenu ... Added contextmenu with Delete and Duplicate button	2014-03-30 19:38:54 +02:00
Nick Winter	6bff295d2e	Linking up Prabh's Coin Mania level.	2014-03-29 18:04:29 -07:00
Nick Winter	54f4e8d1e9	Merge branch 'dev/error_message_for_editor' of git://github.com/gintau/codecombat into gintau-dev/error_message_for_editor	2014-03-29 17:38:14 -07:00
Nick Winter	a79fe37ca1	Merged; made a couple tweaks.	2014-03-29 17:30:12 -07:00
Dominik Maier	fb607d06fa	Implemented popover for playback scrubber that will show the time the mouse is hovering over, the current time as well as the total ime of the level. Fixing #670	2014-03-30 00:38:45 +01:00
Nick Winter	c58a1682f4	Fixed #519 for real, I think.	2014-03-29 14:09:45 -07:00
Nick Winter	bd0ecd76e5	Fixed SearchView projections.	2014-03-29 13:22:21 -07:00
Ting-Kuan	130d322d60	Move error_view's dom to template file.	2014-03-28 23:51:15 -04:00
Nick Winter	5bcaf2c746	Fixed #64 (I hope; let's UX test.)	2014-03-28 17:06:21 -07:00
Nick Winter	cf81d51a89	Fixed #46.	2014-03-28 15:23:12 -07:00
Nick Winter	c4a56dc9a5	Added a thing which highlights the guide every 5 minutes until clicked. Fixed #11.	2014-03-28 12:22:53 -07:00
Nick Winter	ff7e2d5d47	Fixed #728.	2014-03-28 11:02:23 -07:00
Nick Winter	62867534a7	Fixed #727.	2014-03-28 09:52:07 -07:00
Scott Erickson	84cb0bfd0d	Merge pull request #713 from Sighne/master ... Migrate .on, .once - ThangTypeEditView	2014-03-28 09:34:29 -07:00
Dominik Kundel	267d033997	initial coffeescript support. No proper highlighting of executing parts and errors are not displayed inline	2014-03-28 14:42:08 +01:00
Dominik Kundel	35a16b47ff	Merge remote-tracking branch 'upstream/master'	2014-03-28 14:37:14 +01:00
Nick Winter	b0b37aa9d8	Made play/pause and scrubber look even more disabled when disabled.	2014-03-27 15:07:37 -07:00
Nick Winter	2677751dc5	Merge branch 'lbox-prog' of git://github.com/Shrihari/codecombat into Shrihari-lbox-prog	2014-03-27 14:58:06 -07:00
Nick Winter	31119f402a	Cleaned up readyToRank logic a bit.	2014-03-27 14:55:45 -07:00
Nick Winter	1cab83236c	Merge branch 'master' of git://github.com/jayant1992/codecombat into jayant1992-master	2014-03-27 14:22:44 -07:00
Nick Winter	7ab5adcdac	Merge pull request #700 from pedrofgsrj/loginAutocomplete ... Fixed issue #597	2014-03-27 14:20:58 -07:00
Nick Winter	127c4a4e0f	Refactored defaults for Aether's fancy options, and overriding them with query parameters. Reduced non-dev-mode script debug logging.	2014-03-27 13:36:33 -07:00
Laura Lebbah	5d894ea053	Migrate .on, .once - ThangTypeEditView	2014-03-27 21:33:59 +01:00
Ting-Kuan	6012a3ce9e	Show error message when editor fails to initiate.	2014-03-27 14:35:20 -04:00
Pedro Sobrinho	38bf27020a	Fixed issue #597	2014-03-26 20:55:03 -04:00
Jayant Jain	648df5eb41	Updated rank my game check, fixes #666	2014-03-27 03:36:27 +05:30
Scott Erickson	37beb1bc6b	Made the ladder tab better able to handle unloaded gplus and facebook apis.	2014-03-26 14:53:09 -07:00
Scott Erickson	fae9034dfc	Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master ... Conflicts: app/models/SuperModel.coffee	2014-03-26 14:29:16 -07:00
Scott Erickson	462d365ce0	Sorted the friend sessions a bit.	2014-03-26 14:22:04 -07:00
Scott Erickson	781b33092c	Added a google plus connect button.	2014-03-26 14:19:05 -07:00
Scott Erickson	132b22f14a	Got the gplus friends loading now.	2014-03-26 13:50:01 -07:00
Scott Erickson	ad70a7f0c6	Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master	2014-03-26 11:48:47 -07:00
Scott Erickson	3b8cba291d	Removed some unnecessary callbacks.	2014-03-26 11:48:40 -07:00
Jayant Jain	71294f14b2	Updates fb and g+ functions to be called on api load, fixes #695	2014-03-26 22:03:20 +05:30
swapnesh	1118324b41	Migrate from .on, .once to .listenTo, .listenToOnce	2014-03-26 03:25:11 +05:30
Dominik Kundel	fe8a4901de	Merge remote-tracking branch 'upstream/master' ... Conflicts: app/locale/de.coffee bower.json	2014-03-25 17:07:36 +01:00
Shrihari	aee18523b0	Fix for #506	2014-03-25 13:28:22 +05:30
Scott Erickson	bda499b561	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-24 14:43:08 -07:00
Scott Erickson	2c329a256f	Removed all the setting properties to null in destroy methods that don't need them since destroy nullifies all properties.	2014-03-24 14:42:56 -07:00
Nick Winter	97613f12b4	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-24 14:38:35 -07:00
Nick Winter	a42e33764e	Merged, fixed.	2014-03-24 14:38:18 -07:00
Scott Erickson	53118984ff	Undid a listenTo on a jQuery elem.	2014-03-24 14:29:53 -07:00
Scott Erickson	57f6f4d244	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-24 14:27:28 -07:00
Scott Erickson	e9b3db2eb9	Fixed destroy to not break stopListening, which uses off.	2014-03-24 14:27:10 -07:00
Ruben Vereecken	3f3eeab02a	Fixed NaN in ladder in case a player has never played before	2014-03-24 19:46:50 +01:00
Michael Schmatz	83bfc28a9e	Partially refactored scoring callback pyramid of hell	2014-03-24 10:58:43 -07:00
Scott Erickson	f55cef5ced	Merge branch 'migrateBBevents' of https://github.com/Shrihari/codecombat into Shrihari-migrateBBevents	2014-03-24 10:38:57 -07:00
Shrihari	093cc66fa0	Reverted few wrong migrations	2014-03-24 22:56:32 +05:30
Shrihari	f085b0d319	Refactored cast-button events	2014-03-24 22:41:27 +05:30
Shrihari	0160538b44	More migrations	2014-03-24 22:28:34 +05:30
Scott Erickson	bf039ed485	Merge pull request #642 from gintau/feature_-_select_dependents_(extant_component_treema) ... Select dependents when a extant component is selected.	2014-03-24 09:31:27 -07:00
Shrihari	69ee16f77f	Fixed wrong migrations	2014-03-24 21:37:09 +05:30
Nick Winter	92c87dc4ad	Merge branch 'fix/scroll-spell-debug-view' of git://github.com/gintau/codecombat into gintau-fix/scroll-spell-debug-view	2014-03-24 08:28:48 -07:00
Ting-Kuan	e9118142db	Fix issue #662	2014-03-24 10:54:59 -04:00
Shrihari	67f5270bfc	Migrate .on, .once - Batch 1	2014-03-24 12:23:41 +05:30
Nick Winter	5852b87aa3	A little longer debounce is better.	2014-03-23 18:55:44 -07:00
Nick Winter	808762c229	Merge pull request #663 from domenukk/master ... fixes codecombat/codecombat#655	2014-03-23 18:11:40 -07:00
Dominik Maier	f66e210c73	regarding codecombat/codecombat#655 debounce debounces.	2014-03-24 01:18:36 +01:00
Nick Winter	dbeb3d445b	Give focus back to spell view on palette click.	2014-03-23 16:48:30 -07:00
Dominik Maier	dcbd55a864	regarding codecombat/codecombat#655 -> adds asynchronous name checking that actually works.	2014-03-24 00:47:41 +01:00
Nick Winter	656b34fc34	Fixed comment gutter icons jumping all over the place.	2014-03-23 16:00:23 -07:00
Dominik Maier	0dee3d042f	fixes codecombat/codecombat#655 completely ... Removes asynchronous name checking, though, if it ever worked.	2014-03-23 23:04:39 +01:00
Dominik Maier	459a1f9e48	fixes codecombat/codecombat#655	2014-03-23 18:41:15 +01:00
Nick Winter	7ba959045a	A slight enhancement to #650, plus fixing CocoModels thinking they're modified when schema defaults have been added.	2014-03-23 10:00:16 -07:00
Scott Erickson	8ca5f23749	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-23 09:30:46 -07:00
Scott Erickson	72b88a3ee9	First pass on setting up gplus friends on the ladder page.	2014-03-23 09:30:01 -07:00
dpen2000	970552a6d6	Fix "Simulating game between" line to only have one "and"	2014-03-23 13:35:24 +00:00
Nick Winter	fd2d9b6833	Merge pull request #658 from ItsLastDay/editor_tweaks ... Added tooltip in level-editor (issue #174)	2014-03-22 17:30:52 -07:00
Mikhail Koltsov	2316773cb1	removed Label requierment	2014-03-22 23:25:18 +04:00
Mikhail Koltsov	36cfdfda46	Added labels above selected thangs in level-editor (issue #174)	2014-03-22 23:17:15 +04:00
Nick Winter	96fe1e42f0	Merge pull request #657 from adi2412/reloadCode ... Made changes to reloadAllCode to reload only the team's code.	2014-03-22 10:36:17 -07:00
Aditya Raisinghani	bee5d528ec	Made changes to reloadAllCode to reload only the team's code.	2014-03-22 22:56:41 +05:30
Nick Winter	29e7b8e5c1	Fixed mail to correctly capture the matches.	2014-03-22 09:48:36 -07:00
Michael Schmatz	5141873725	Added resimulateAllSessions method	2014-03-22 09:07:01 -07:00
Scott Erickson	0df09f7f35	Fixed an ever-reloading bug.	2014-03-21 21:11:51 -07:00
Scott Erickson	2cdfbf1c48	Merged conflicts.	2014-03-21 19:56:25 -07:00
Scott Erickson	6445924598	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/templates/play/ladder/ladder_tab.jade app/views/play/ladder/ladder_tab.coffee	2014-03-21 19:53:32 -07:00
Scott Erickson	14ee9c30ce	Added facebook friends to the ladder page.	2014-03-21 19:50:54 -07:00
Nick Winter	b91f3200c2	Merge pull request #649 from jayant1992/master ... Fixes #641, the list of levels in editor reloads properly upon changing ...	2014-03-21 17:46:10 -07:00
Nick Winter	e101fb04eb	For #648: Keeping localStorage fallback for played levels temporarily until most have migrated to user property. Fixed #627.	2014-03-21 17:42:13 -07:00
Jayant Jain	860c3a34d3	Fixes #641, the list of levels in editor reloads properly upon changing language	2014-03-22 05:51:44 +05:30
dpen2000	a35d0cb651	Implement saving lastLevel in database re #627	2014-03-22 00:01:32 +00:00
Nick Winter	f0640dd2e8	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-21 16:22:51 -07:00
Nick Winter	ba66dbf5a1	Adding CLAs view.	2014-03-21 16:22:47 -07:00
dpen2000	b1b0579cb3	Save autocastDelay as a setting on User re #627	2014-03-21 22:46:14 +00:00
Ting-Kuan	0db309f526	Select dependents when a extant component is selected.	2014-03-21 12:19:47 -04:00
Nick Winter	b30bf35945	Fixed #638, I hope.	2014-03-21 08:09:08 -07:00
Nick Winter	a3dadd6a40	Merge branch 'editor_tweaks' of git://github.com/ItsLastDay/codecombat into ItsLastDay-editor_tweaks	2014-03-21 07:25:33 -07:00
Mikhail Koltsov	45b87ed38e	finally got it right	2014-03-21 13:45:56 +04:00
Mikhail Koltsov	0ece400a18	Level editor: selecting a thang now moves the scroll in existant-thang list	2014-03-21 11:54:55 +04:00
Nick Winter	424390ae84	Moved antiscroll init; disabled it for now because of bugginess.	2014-03-20 22:00:34 -07:00
Nick Winter	ca1e3742c0	Added simulation counts.	2014-03-20 15:40:02 -07:00
Scott Erickson	22555790b5	Set up a trimmed down leaderboard showing just top players and your rank.	2014-03-20 14:40:17 -07:00
Scott Erickson	dbbf9ce8b3	Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master ... Conflicts: app/styles/editor/level/thangs_tab.sass app/templates/editor/level/thangs_tab.jade app/views/editor/level/thangs_tab_view.coffee	2014-03-20 11:22:23 -07:00
Nick Winter	b7e8f2ecb5	Merge pull request #605 from kvasnyk/master ... Fix for #272 bug.	2014-03-19 18:31:20 -07:00
Nick Winter	ff1e64e1f6	Less useless ladder refresh requests.	2014-03-19 18:26:38 -07:00
Scott Erickson	954a3ac4cb	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-19 17:11:53 -07:00
Scott Erickson	b6c9b6276c	Tweaked logging of sprite building.	2014-03-19 17:11:45 -07:00
iulianR	bfac03a73c	Rearranged play_view.cofee for consistency	2014-03-19 01:57:21 +02:00
Scott Erickson	74e068af0b	Fixed some bugs from the migration from _.cloneDeep to $.extend	2014-03-18 13:47:51 -07:00
Scott Erickson	a461a14d6e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-18 13:08:34 -07:00
Scott Erickson	37a9b7f319	Switching from the slow _.cloneDeep to the fast $.extend	2014-03-18 13:08:26 -07:00
Jayant Jain	80f53d2c6b	Adds search bar for adding thangs in level editor	2014-03-19 00:41:03 +05:30
Nick Winter	4355813d69	Don't throw away fully loaded supermodels in between simulations or refresh tabs when not looking at them.	2014-03-18 11:26:15 -07:00
kvasnyk	5216432bf9	Fix for #272 bug.	2014-03-18 05:47:53 +01:00
Dominik Kundel	c55b608886	Merge remote-tracking branch 'upstream/master' ... Conflicts: app/templates/play/level/modal/editor_config.jade	2014-03-17 19:39:38 +01:00
Aditya Raisinghani	b5bef94eb3	Fixed issue with video on multiplayer page modal	2014-03-17 19:52:03 +05:30
Nick Winter	6c2a78c060	Show videos in HD if possible. Use ready state on level loader.	2014-03-17 05:52:19 -07:00
Nick Winter	833c310a91	Merge pull request #579 from ItsLastDay/popover ... Fix for issue #496	2014-03-17 04:30:57 -07:00
Mikhail Koltsov	df3739517d	fixed issue #496	2014-03-17 12:28:49 +04:00
Scott Erickson	db4ae0cd2d	Made some tips show up more rarely.	2014-03-17 00:12:11 -07:00
Scott Erickson	7555dce172	Tweaked the loading page progress bar.	2014-03-17 00:05:45 -07:00
Nick Winter	65c53a9e43	Check anonymous for clicking link.	2014-03-16 22:17:56 -07:00
Scott Erickson	dc4252a94d	Moved the tips into the level loader screen and gave them i18n.	2014-03-16 22:01:21 -07:00
Scott Erickson	5a8d1b0a2b	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-16 21:43:21 -07:00
Scott Erickson	de34896a9a	Playback is now disabled during casting. Also cleaned out some remaining hover logic.	2014-03-16 21:43:14 -07:00
Nick Winter	f02f4e77d0	Improved next game routing and speed. Hid that catastrophically dangerous reset all games button.	2014-03-16 21:33:46 -07:00
Scott Erickson	e88c79681d	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-16 21:04:44 -07:00
Scott Erickson	c663bd74cf	Tweaks to the scrubber. Sliding it around no longer changes its play state; it only pauses playback if you click.	2014-03-16 21:04:36 -07:00
Nick Winter	ffb9ec2908	Merged.	2014-03-16 20:36:18 -07:00
Nick Winter	9a64fb5dac	Work on /multiplayer modal.	2014-03-16 20:32:24 -07:00
Scott Erickson	296a7584a6	Ladder page now shows the ladder for anonymous users, and prods them to sign up if they click a link or button that would have them play.	2014-03-16 20:28:02 -07:00
Dominik Kundel	6a983dcb8c	changed name of event triggered when config is changed and introduced new event when language is changed	2014-03-17 02:14:04 +01:00
Scott Erickson	e430a6c2de	Added multiplayer launch view.	2014-03-16 17:33:57 -07:00
Scott Erickson	3fa0124d7e	Removed wizard loading code from home view, for now anyway.	2014-03-16 17:21:17 -07:00
Scott Erickson	dd8ea18186	Merge remote-tracking branch 'origin/master'	2014-03-16 17:13:18 -07:00
Scott Erickson	f23e3285cd	Fixed a bug.	2014-03-16 17:12:55 -07:00
Nick Winter	b550708113	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-16 17:07:24 -07:00
Nick Winter	6db33fd967	Brawlwood protectAPI on!	2014-03-16 17:07:10 -07:00
Scott Erickson	eee8fbba2c	New level page with new artwork.	2014-03-16 16:59:48 -07:00
Nick Winter	aa4f1baf73	Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions.	2014-03-16 13:23:01 -07:00
Dominik Kundel	ce6533de59	changing ace edit mode based on setting	2014-03-15 23:14:57 +01:00
Jayant Jain	91515b1cea	Clicking a thang in the left list automatically pans to the sprite on the editor map	2014-03-16 03:11:40 +05:30
Dominik Kundel	46133ab85d	added select statement for programming language	2014-03-15 22:00:29 +01:00
Nick Winter	b210423419	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-15 12:31:43 -07:00
Nick Winter	ca75cc4a1a	Fixed #405 with a sledgehammer--just loading all Components before loading level editor.	2014-03-15 12:31:39 -07:00
Michael Schmatz	efba8a0654	Fixed control bar leaderboard button for #429	2014-03-15 11:34:59 -07:00
Michael Schmatz	6dcbaddbbd	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/views/play/spectate_view.coffee	2014-03-15 09:20:44 -07:00
Michael Schmatz	2c6e667bb7	Added API for queue messages count	2014-03-15 09:20:13 -07:00
honam bang	e63e787a30	Removed spaces for coding convention	2014-03-15 08:30:47 -07:00
bang honam	70f3ca8f8e	Added a line for coding convention	2014-03-15 08:30:37 -07:00
Nick Winter	7b1f8d1114	Merge pull request #547 from jayant1992/master ... Improved panning and zooming for editor	2014-03-15 08:05:02 -07:00
Nick Winter	95cd3782a1	Oops, don't keep sending ladder updates just to me.	2014-03-15 07:45:44 -07:00
Nick Winter	8276dbf2d1	Merge branch 'loading-view'	2014-03-14 19:44:33 -07:00
Nick Winter	b2efb1bba5	More work on the loading view.	2014-03-14 19:44:19 -07:00
Nick Winter	efd0d82dea	Working on new loading view design.	2014-03-14 17:06:08 -07:00
Michael Schmatz	357b73be93	Fixed bug in next game button, fixed wizard positions	2014-03-14 16:14:35 -07:00
Michael Schmatz	075ea23be9	Fixed random sessions fetching	2014-03-14 12:54:54 -07:00
Scott Erickson	39ed6c3a43	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-14 11:58:42 -07:00
Scott Erickson	af8008596a	Made editing thangs in the level editor not so slow by avoiding calling level.serialize.	2014-03-14 11:58:29 -07:00
Michael Schmatz	71aa6cc2c6	Added random session pair choosing ... Due to a bug I cannot test this immediately	2014-03-14 11:30:06 -07:00
Jayant Jain	ece932595c	Enables drag-panning for editor and region chooser	2014-03-14 23:57:00 +05:30
Nick Winter	5c76ca71e3	Added configuring of behaviors to the editor config.	2014-03-14 10:14:48 -07:00
Nick Winter	3c0b496033	Fix for if aceConfig doesn't exist yet.	2014-03-14 07:46:36 -07:00
Nick Winter	c28d2bb576	Merge pull request #545 from dkundel/master ... Implemented editor config to allow Vim & Emacs key bindings as proposed in #99	2014-03-14 07:35:11 -07:00
Nick Winter	6e9945040f	Truncated long score graphs; made my-matches score graphs independent of time; showed crude score y-axis for now.	2014-03-13 19:20:22 -07:00
Dominik Kundel	7e955c72b8	apply config to editor	2014-03-14 02:49:58 +01:00
Nick Winter	795bd8f63b	Moved Glen from Archmages to About.	2014-03-13 18:27:08 -07:00
Dominik Kundel	8a5aeb6227	save editor config to database	2014-03-14 02:09:11 +01:00
Nick Winter	42a8862fa9	Merge pull request #541 from dkundel/master ... Easy use of coordinates as discussed in #10 and minor fixes	2014-03-13 18:05:04 -07:00
Dominik Kundel	6f2a04c5c0	added new editor config modal	2014-03-14 00:54:06 +01:00
Dominik Kundel	f618338d32	added button to access new modal for editor config	2014-03-14 00:53:29 +01:00
Dominik Kundel	4cbdc3cb4b	highlight lines after insertion	2014-03-14 00:52:18 +01:00
Nick Winter	8554de7c4b	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-13 15:35:31 -07:00
Nick Winter	e2d2e96cf5	Fixed several bugs with Thang selection and the SpellView and HUD.	2014-03-13 15:35:28 -07:00
Michael Schmatz	3262ad81f2	Merge branch 'master' of github.com:codecombat/codecombat ... Conflicts: app/views/play/spectate_view.coffee	2014-03-13 15:24:04 -07:00
Michael Schmatz	7aa506e58c	Various changes to spectate view	2014-03-13 15:22:35 -07:00
Scott Erickson	b2e9768127	Set up a build queue for async sprite sheet building, which lessens blocking the main thread.	2014-03-13 13:25:03 -07:00
Scott Erickson	c238b49f52	Fixed initial wizard position.	2014-03-13 11:07:08 -07:00
Nick Winter	c8103154a9	Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n.	2014-03-13 09:02:19 -07:00
Jayant Jain	c24469e86b	Minor UI updates to level editor's thang tab	2014-03-13 12:19:51 +05:30
Nick Winter	28d56f526e	Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces.	2014-03-12 20:59:19 -07:00
Michael Schmatz	6eda2d24a5	Commented out line 133	2014-03-12 17:52:05 -07:00
Michael Schmatz	aea9e9d1a6	Spectate view is nearing completion	2014-03-12 17:51:13 -07:00
Dominik Kundel	8990b9d194	paste coordiante if click + shift	2014-03-13 01:50:59 +01:00
Nick Winter	7e16821743	Updates for /play levels list.	2014-03-12 16:41:09 -07:00
Nick Winter	ac8f12ef20	I don't think we need this template any more.	2014-03-12 16:03:32 -07:00
Nick Winter	ddea7d1531	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-12 15:44:33 -07:00
Scott Erickson	19184a88b0	Fixed showing the guide at the beginning of the level.... more.	2014-03-12 13:49:28 -07:00
Nick Winter	1ca9b2d3e5	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-12 12:45:46 -07:00
Scott Erickson	ed60f5932f	Fixed showing the guide at the beginning of the level.	2014-03-12 12:44:06 -07:00
Scott Erickson	853a80dd23	Fixed loading marks so they are positioned correctly when they load and the world is paused.	2014-03-12 12:43:51 -07:00
Nick Winter	77c9217357	Better handling of refreshing ladder and matches views depending on idle state.	2014-03-12 11:39:09 -07:00
Nick Winter	49ab47e3fe	Allowing shift+space to insert spaces as well as end scripts. Not ideal yet, 'cause we can't selectively not insert the space when canceling a script.	2014-03-12 10:01:31 -07:00
Nick Winter	f83fe6ce14	Fixed bugs with sprite rotation updating.	2014-03-12 09:31:45 -07:00
Nick Winter	2e354a7f11	Fixed #519, pressing esc while loading level, and CocoSprites updating actions and other things unnecessarily while paused. Watch for bugs with that last one.	2014-03-12 09:10:36 -07:00
Nick Winter	da762fbc4f	Merge branch 'rubenvereecken-versions_modal'	2014-03-12 08:30:02 -07:00
Nick Winter	0125c46dc2	Resolved merge conflict.	2014-03-12 08:29:42 -07:00
Ruben Vereecken	4b72ee1d04	Clean up	2014-03-12 15:43:49 +01:00
Ruben Vereecken	ddae5d0763	Added Version History to Level Components	2014-03-12 15:32:55 +01:00
Michael Schmatz	a6fb2a3994	Various changes to spectate view	2014-03-12 07:32:30 -07:00
Ruben Vereecken	2a86daaa2a	Added Version History to Thang Types	2014-03-12 15:22:15 +01:00
Prabh Simran Singh Baweja	5e964cd6cf	Update play_view.coffee ... New Level Added : Sword Loop	2014-03-12 15:58:33 +05:30
Scott Erickson	9cb80783ff	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-11 22:01:47 -07:00
Scott Erickson	8ddbb49845	Trying out promises to simplify view loading.	2014-03-11 22:01:38 -07:00
Nick Winter	b560827e32	Working on cleaning up some server errors.	2014-03-11 19:17:58 -07:00
Nick Winter	2b487eeed8	Using /db/thang.type instead of /db/thang_type in URLs, for consistency.	2014-03-11 18:30:25 -07:00
Nick Winter	40ea643f67	Merge pull request #523 from dkundel/master ... Avoid flickering of editor when executing the script.	2014-03-11 18:07:17 -07:00
Nick Winter	8c57b31c54	Fixed a couple bugs with the matches tab.	2014-03-11 18:06:48 -07:00
Dominik Kundel	c7ca878c69	added class property that got missing	2014-03-12 01:26:11 +01:00
Nick Winter	392534878a	Keeping old matches, up to 200, and showing them as stale. Added LevelSession.isRanking for better display of when you're still in the initial ranking phase.	2014-03-11 16:31:39 -07:00
Dominik Kundel	714c6ddf9b	Merge remote-tracking branch 'upstream/master'	2014-03-11 23:50:51 +01:00
Dominik Kundel	4c7da1ea69	update Gutter only if changed	2014-03-11 23:47:27 +01:00
Nick Winter	852b1c97ac	Added idle.js so we can stop refreshing the page forever on ladder views when they're not looking.	2014-03-11 13:59:12 -07:00
Michael Schmatz	4062bba245	Created initial spectate level view	2014-03-11 13:12:45 -07:00
Ruben Vereecken	8709cdc472	Finished Article History	2014-03-11 19:33:27 +01:00
Nick Winter	eac219a2be	Inserted score history graph into ladder update emails.	2014-03-10 22:03:33 -07:00
Nick Winter	32baf2ae79	Improved my-matches rank history and name fetching, ladder update emails, ladder update unsubscribes.	2014-03-10 21:30:46 -07:00
Nick Winter	6ce65488aa	Added simple rank history graph. Improving ladder update mail.	2014-03-10 20:22:25 -07:00
Ruben Vereecken	af73e5a594	Added a versions modal for every type	2014-03-10 23:29:34 +01:00
Ruben Vereecken	8e989ec08f	Got the level history view set up as before, but better	2014-03-10 23:17:19 +01:00
Nick Winter	c4a3b71786	Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal	2014-03-10 13:57:51 -07:00
Nick Winter	6055512ac7	Working on ladder updates.	2014-03-10 13:20:00 -07:00
Ruben Vereecken	68b10d9023	History now shows a loading bar upon opening	2014-03-10 20:06:36 +01:00
Nick Winter	77f7276759	Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal	2014-03-10 11:29:47 -07:00
Ruben Vereecken	06ae06fa34	Used mix-ins to combine Modal and VersionView	2014-03-10 19:08:53 +01:00
Nick Winter	234b3f105d	Reworked ladder game victory modal main call to action to actually submit game for ranking.	2014-03-10 10:36:28 -07:00
Nick Winter	6a71e97204	Improvements to HUD actions.	2014-03-10 09:37:05 -07:00
Ruben Vereecken	f6ece2d63e	Created a modal version of Version History	2014-03-10 12:16:08 +01:00
Nick Winter	3d71fcbc70	Wins, losses, and realizing that I'm not doing server code right.	2014-03-09 18:46:11 -07:00
Nick Winter	2d32bc1ac4	Reduced unnecessary name fetching.	2014-03-09 13:22:22 -07:00
Nick Winter	3e82e0b599	Disallow submission of non-denormalized sessions to ladders.	2014-03-09 12:53:11 -07:00
Nick Winter	34983059aa	Fixed bug with trying to show challenger modals with no hash to indicate we should.	2014-03-09 11:52:05 -07:00
Nick Winter	39c4657204	Fixed HUD showing actions backwardly. Added rank numbering to leaderboard.	2014-03-08 15:43:56 -08:00
Nick Winter	b3964571e1	Fixed bug importing animations into existing ThangTypes that had only containers.	2014-03-08 15:04:11 -08:00
Scott Erickson	afbe2200a6	Fixed a bug with the new race condition fix. Moving the schemas to the application would be good.	2014-03-08 13:52:34 -08:00
Nick Winter	b0238d74a4	Let's just show 200 leaderboard entries for now until we have paging.	2014-03-08 11:50:10 -08:00
Nick Winter	1c44e3df1e	Fixed bug with linking to #my-matches tab.	2014-03-08 11:37:33 -08:00
Nick Winter	68099bbd7c	Victory modal for ladder games takes you back to the ladder matches.	2014-03-07 21:20:09 -08:00
Michael Schmatz	2f378106ca	Added checking level ladder status before submitting	2014-03-07 18:16:50 -08:00
Alexei Nikitin	98b36d299c	Update article model	2014-03-08 05:05:35 +04:00
Nick Winter	b6ae73ef29	Merge pull request #492 from Shrihari/issue464 ... Fixed Spell Debug View width bug	2014-03-07 16:14:57 -08:00
Scott Erickson	8fa9c9c410	Set up the level play view to show the guide on startup based on the showGuide property.	2014-03-07 15:18:56 -08:00
Scott Erickson	13b9a9cb58	Added dungeon arena tutorial to a few hardcoded places.	2014-03-07 15:16:13 -08:00
Scott Erickson	17231bce06	Added showsGuide and type properties to level.	2014-03-07 13:13:58 -08:00
Scott Erickson	be03485538	Set up the ladder play modal to be more forthright getting new players to play the tutorial.	2014-03-07 12:58:17 -08:00
Scott Erickson	d8d917ecf9	Set up better teardown for the ladder view.	2014-03-07 12:15:16 -08:00
Scott Erickson	610fc0694b	Turning off view caching by default now. Should help lower the memory footprint.	2014-03-07 11:57:15 -08:00
Shrihari	5274f22467	Fixed Spell Debug View width bug	2014-03-08 01:10:12 +05:30
Scott Erickson	d14f862359	Ladder view can now be linked to to play against a specific team.	2014-03-07 11:23:06 -08:00
Nick Winter	6e47416d24	Fixed some level IDs.	2014-03-06 19:09:15 -08:00
Michael Schmatz	45cd7e31ca	Made simulator level-independent	2014-03-06 18:48:41 -08:00
Scott Erickson	a6c4fe8d02	Merge branch 'master' of https://github.com/rubenvereecken/codecombat into rubenvereecken-master	2014-03-05 20:04:14 -08:00
Nick Winter	2d69abf674	Merge pull request #481 from dkundel/master ... Proposed UX improvement for #6	2014-03-05 13:45:14 -08:00
Dominik Kundel	a033a80722	Merge remote-tracking branch 'upstream/master'	2014-03-05 22:18:53 +01:00
Dominik Kundel	b0d571c7ad	highlight only the executing statement	2014-03-05 22:17:34 +01:00
Scott Erickson	0a8d5b5b97	Merge branch 'master' of https://github.com/Shrihari/codecombat into Shrihari-master	2014-03-05 10:35:06 -08:00
Shrihari	f6324807b3	Moved "Skip (esc)" next to Continue button	2014-03-05 23:36:18 +05:30
Dominik Kundel	d16d024782	further changes in design of highlighting lines in code	2014-03-05 17:06:46 +01:00
Shrihari	0ec431f90a	Moved 'skip tutorial' text to locales.	2014-03-05 13:46:21 +05:30
Dominik Kundel	a0e39480e3	new UI design for executing and executed lines in ACE editor	2014-03-05 02:00:38 +01:00
Nick Winter	4556536df4	Hooked up new HUD icons.	2014-03-04 11:15:31 -08:00
Ruben Vereecken	d43ff5d217	Added an anonymous check on the Fork button	2014-03-04 11:24:38 +01:00
Nick Winter	65d9186ef1	Fixed actions showing up under dialogue bubbles on repeated toggling.	2014-03-03 16:55:36 -08:00
Nick Winter	7b25eeec47	HUD properties now flow into columns more evenly, have max styling.	2014-03-03 16:45:03 -08:00
Nick Winter	873c560a06	Added Alexandru's Bubble Sort Bootcamp Battle to /play.	2014-03-03 16:22:50 -08:00
Nick Winter	c944e78271	Ladder views now show level descvription content if present.	2014-03-03 14:59:39 -08:00
Ruben Vereecken	0aa8e7bb7d	Added owner-based save enabling on Thang Types. NOTE server-sided doesn't work yet	2014-03-03 22:21:56 +01:00
Scott Erickson	d66a9d6be0	Set up a generic choose tab for root views so hash->tab behavior is baked in.	2014-03-03 13:21:05 -08:00
Nick Winter	0c45b6c0e3	Fixes for ladder refreshing.	2014-03-03 12:21:59 -08:00
Ruben Vereecken	ee920afea9	Disabled buttons for non-owners in Article Editor	2014-03-03 21:13:02 +01:00
Michael Schmatz	a5864c4f0c	Live leaderboard updating	2014-03-03 12:10:27 -08:00
Scott Erickson	fb75ad36e7	Added team icons to the ladder play view.	2014-03-03 12:04:31 -08:00
Ruben Vereecken	942b69ea9f	Created hasWriteAccess on Cocomodel, used it for level access	2014-03-03 20:41:35 +01:00
Scott Erickson	65d39e658d	Removed the old team view cruft.	2014-03-03 11:15:46 -08:00
Scott Erickson	0d054bec8e	Refactored the universal wizard loading to happen silently when you import ThangType.	2014-03-03 10:42:11 -08:00
Scott Erickson	feaeb1dc98	Made the wizard icons colored based on user settings.	2014-03-03 10:21:51 -08:00
Scott Erickson	d3b6836a06	Fixed some bugs with the new ladder view when you haven't played before.	2014-03-03 09:20:14 -08:00
Scott Erickson	5bb56ac818	Merge branch 'feature/new-ladder-view'	2014-03-03 09:05:52 -08:00
Scott Erickson	22e80f6d24	Set up a play modal, starting to refactor wizard thang type loading to be shared across the site.	2014-03-03 09:03:44 -08:00
Nick Winter	20fb9ba5b4	Merge pull request #461 from rubenvereecken/master ... Localization centred patches and additions	2014-03-03 07:37:46 -08:00
Nick Winter	86fd098159	Localized WizardSprite movement hey handling to WizardSprite file.	2014-03-03 07:28:40 -08:00
Nick Winter	f2f0a993af	Merge branch 'thanish-move-wizard' of git://github.com/mnmtanish/codecombat	2014-03-03 07:22:44 -08:00
Ruben Vereecken	b8b22bb739	Localized 'Create New ..' and 'Search .. Here'	2014-03-03 12:45:04 +01:00
Nick Winter	82b250b9a3	protectAPI off again for Brawlwood, too slow for now.	2014-03-02 17:51:57 -08:00
Nick Winter	a8ef87c9ea	Fixed a few bugs; re-enabled protectAPI for Brawlwood.	2014-03-02 16:06:22 -08:00
Ruben Vereecken	c2d247e686	Editor tables now load i18n correctly after search.	2014-03-03 00:31:49 +01:00
Scott Erickson	956e2b3c40	Set up the my matches tab in the new ladder view.	2014-03-02 13:24:41 -08:00
Scott Erickson	d0f416f668	Rearranging the ladder view.	2014-03-02 12:43:21 -08:00
Muhammed Thanish	da2ebf857a	Increase delay	2014-03-02 14:02:30 +05:30
Nick Winter	6c48660922	No save button when there's nothing to save. Messing with AudioPlayer playSound API a bit.	2014-03-01 16:57:29 -08:00
Muhammed Thanish	d7e031fd00	Use key.isPressed() to get movement direction	2014-03-02 03:27:06 +05:30
Muhammed Thanish	7ea9260322	Use WizardSprite	2014-03-02 01:45:49 +05:30
Nick Winter	2f130da090	HUD supports more hudProperties. Palette looks at programmableObjectProperties. Fixed bug with level editor frames advancing.	2014-03-01 11:06:44 -08:00
Muhammed Thanish	8cc8103288	Add keyboard shortcuts to move the wizard	2014-03-01 19:58:15 +05:30
Tay Yang Shun	47b37426d0	Added Level Editor page breadcrumbs.	2014-03-01 14:52:51 +08:00
Tay Yang Shun	f43dd2f3ff	Added breadcrumbs for Editor Search Results, Thang Editor and Article Editor pages.	2014-03-01 14:47:31 +08:00
Nick Winter	71ebe7a0aa	Lowered Surface framerate in the level editor, since ain't nobody got CPU time for 'dat.	2014-02-28 17:12:23 -08:00
Scott Erickson	4de425bd58	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-28 13:59:33 -08:00
Scott Erickson	10795df7d9	Renamed hardcoded project-dotas to brawlwoods.	2014-02-28 13:59:02 -08:00
Nick Winter	b5ff264ad0	Merge pull request #441 from yangshun/level-editor-freeze ... Redirect to level editor only after modal hidden event is triggered. Fixes #438 and #439.	2014-02-28 12:48:56 -08:00
Nick Winter	52903cc0de	Using String and Array docs when appropriate now.	2014-02-28 12:43:31 -08:00
Nick Winter	6db8051122	Only show action timeline when 'action' is in the hudProperties.	2014-02-28 11:38:41 -08:00
Scott Erickson	d12b923eaf	Made a casting progress bar on the canvas to test vs having it shown in the cast button.	2014-02-28 11:05:41 -08:00
Tay Yang Shun	8af62d53cd	Redirect to level editor only after modal hidden event is triggered. Fixes #438.	2014-03-01 01:55:30 +08:00
Nick Winter	aef1bc63ba	Smarter infinite loop detection vs. web-worker-is-still-loading detection.	2014-02-27 20:01:27 -08:00
Scott Erickson	df196cc531	Modals now stop the level from starting until they close.	2014-02-27 16:44:11 -08:00
Scott Erickson	7c734d6bc9	Added an async name checker for the wizard settings modal.	2014-02-27 14:42:11 -08:00
Scott Erickson	b31527abef	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-27 14:08:04 -08:00
Scott Erickson	02cb9155c0	Improved a bunch of things with the wizard settings view.	2014-02-27 12:25:59 -08:00
Scott Erickson	f991bc3a58	Removed some vestigial wizard coloring code from the settings account view.	2014-02-27 12:02:08 -08:00
Michael Schmatz	5d2c430779	Merge pull request #435 from yangshun/editor-modal-input-focus ... Auto-focus on the modal's input field for creation of new entities in editor.	2014-02-27 09:21:09 -08:00
Tay Yang Shun	d2a6b3822e	Re-added submit form event	2014-02-28 01:17:19 +08:00
Michael Schmatz	53a317df77	Merge pull request #434 from yangshun/play-button ... Deferred saving of latest level	2014-02-27 09:07:27 -08:00
Michael Schmatz	9deadad99f	Merge pull request #427 from yangshun/music-button ... Blur the music button after click so that subsequent space and enter keydown events do not trigger it.	2014-02-27 09:06:18 -08:00
Tay Yang Shun	57f896b950	Added newline to end of file.	2014-02-27 15:38:03 +08:00
Tay Yang Shun	947b8766c2	Auto-focus on the modal's input field for creation of new entities in editor. Fixes issue #379	2014-02-27 15:32:18 +08:00
Tay Yang Shun	04895a9204	Merge branch 'master' into play-button	2014-02-27 14:09:37 +08:00
Tay Yang Shun	514fe358c1	Trigger storage of latest level only after the level is guaranteed to be able to load	2014-02-27 14:08:25 +08:00
Scott Erickson	74186b7772	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-26 19:30:49 -08:00
Scott Erickson	ec7028af60	Fixed uploading images for articles.	2014-02-26 19:30:37 -08:00
Nick Winter	c26995a3a9	Home button on ladder level goes to ladder.	2014-02-26 18:58:25 -08:00
Nick Winter	48122000ed	Gold shows up as an int in the HUD now.	2014-02-26 18:09:09 -08:00
Nick Winter	0cf20b577d	Added a delay to the property documentation on spell debug hover.	2014-02-26 17:23:59 -08:00
Nick Winter	172242d226	Re-denormalize session if things have changed. Removed some logs.	2014-02-26 17:06:21 -08:00
Scott Erickson	0fd1c03b7f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-26 15:56:25 -08:00
Scott Erickson	ea73d91a6b	Made the docs modal larger.	2014-02-26 15:44:46 -08:00
Michael Schmatz	b648098c95	Implemented espionage mode	2014-02-26 14:14:43 -08:00
Tay Yang Shun	b48a9fabc6	Blur the music button after click so that subsequent space and enter keydown events do not trigger it. Fixes issue #306.	2014-02-27 02:42:25 +08:00
Scott Erickson	f89768d76d	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-25 17:15:01 -08:00
Scott Erickson	02d1dc2445	Added a screen for when playback ends.	2014-02-25 17:14:39 -08:00
Nick Winter	3c5902a1d2	Trying to get session code merging to work again.	2014-02-25 14:46:48 -08:00
Nick Winter	b86c32c3e2	Merge pull request #422 from yangshun/level-not-found ... Redirect to play page for non-existent levels. Fixes issue #396	2014-02-25 14:17:44 -08:00
Tay Yang Shun	373a618cff	Moved internationalisation of level load error message into template file	2014-02-26 06:14:29 +08:00
Tay Yang Shun	11c5f7419a	Used internationalised strings for level not found message	2014-02-26 05:54:33 +08:00
Tay Yang Shun	8a24407d3e	Redirect to play page for non-existent levels. Fixes issue #396	2014-02-26 04:59:35 +08:00
Scott Erickson	1b4699556a	Fixed a bug where sometimes new worlds would hide the hud speaker unnecessarily.	2014-02-25 12:39:22 -08:00
Nick Winter	a440c4dff0	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-25 10:48:33 -08:00
Nick Winter	0380a30522	Fixes for not storing default code in other sessions. sass-brunch 1.8. Removed tutorial link for now. Round wizards.	2014-02-25 10:48:23 -08:00
Scott Erickson	168f268d21	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-24 19:49:12 -08:00
Scott Erickson	242342315f	Can now drag the mouse to move around the map.	2014-02-24 19:49:05 -08:00
Nick Winter	3472b3da97	Working on different shadow shapes. Fixed bug with palette property ownership.	2014-02-24 17:53:35 -08:00
Scott Erickson	7f738562e9	Fixed a playback bug where if you clicked the scrubber while playing, it would continue playing instead of pausing properly.	2014-02-24 16:53:55 -08:00
Nick Winter	ab8d63f545	Improved grouping of palette properties.	2014-02-24 15:48:30 -08:00
Scott Erickson	34205a0789	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-24 14:58:02 -08:00
Nick Winter	32c45b80a9	Fixed performance problem with duplicate user code problem annotations.	2014-02-24 14:12:41 -08:00
Scott Erickson	e48bdfa1a7	Added your score to the ladder/team view.	2014-02-24 13:03:04 -08:00
Scott Erickson	43a49b3e6f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-24 12:52:43 -08:00
Scott Erickson	77f923752f	Fixed #411.	2014-02-24 12:52:35 -08:00
Nick Winter	21975bedd2	Fixed #408.	2014-02-24 11:21:51 -08:00
Nick Winter	10e10aa961	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-24 09:58:15 -08:00
Nick Winter	91412ccd69	Playback and level editor shortcut tweaks.	2014-02-24 09:58:12 -08:00
Scott Erickson	d146febb32	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-24 09:47:20 -08:00
Scott Erickson	3f0f391556	Finished up work on the wizard settings modal.	2014-02-24 09:46:40 -08:00
Scott Erickson	2d6dd36a68	Saturation and lightness was flipped on the spritebuilder. Fixed.	2014-02-24 09:06:22 -08:00
Nick Winter	af43f18c23	Fixed selective includeFlow.	2014-02-24 08:59:50 -08:00
Nick Winter	af965ccb93	Fixes for ThangListEntryView popover hover states.	2014-02-23 17:11:27 -08:00
Nick Winter	933bcf9e6b	Showing property documentation when hovering in code in addition to clicking on palette entries.	2014-02-23 16:34:03 -08:00
Nick Winter	68497b2cf3	Added arg names or ... for functions which take arguments in spell palette entries.	2014-02-23 13:27:02 -08:00
Nick Winter	5b88b58a75	Fixed application of a few i18n tags in wizard/picture settings.	2014-02-23 12:31:41 -08:00
Nick Winter	11f742ff0f	Included Hour of Code explanation in play footer.	2014-02-23 11:48:34 -08:00
Nick Winter	60eb0db1aa	A few fixes for IE, anonymous errors, and cast button overflow.	2014-02-23 11:23:26 -08:00
Nick Winter	0a334b310f	Merge pull request #398 from jmr0/master ... fixing language selection disappearance when showing cached home view	2014-02-23 08:32:27 -08:00
jmr0	f00d9b2acc	changing showDiplomatSuggestionModal function name and moving language build call to it from afterRender	2014-02-22 21:06:37 -05:00
Nick Winter	43c1240a03	Fixed cast button moving around due to anticipated errors early.	2014-02-22 18:02:58 -08:00
Nick Winter	c21952646a	Stop cast button progress overlay before cast settings gear.	2014-02-22 17:50:45 -08:00
Nick Winter	8565e3f315	Adding the button, not just the shortcut, for beautification.	2014-02-22 17:18:58 -08:00
Nick Winter	9eb8bb97f5	Trying out a Ctrl+Shift+B code beautifier option.	2014-02-22 16:58:54 -08:00
jmr0	1562b02fd1	still need this for rendering after a language switch	2014-02-22 19:32:43 -05:00
jmr0	34df232d4f	fixing language selection disappearance when showing cached home view	2014-02-22 19:32:43 -05:00
Nick Winter	b3009ae909	Fixed #7 with a nice cast-end sound (just reverse of cast sound).	2014-02-22 15:26:38 -08:00
Nick Winter	702eca5c81	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-22 12:04:10 -08:00
Nick Winter	72cfcf96ed	Added basic opponent wizard. Disabled synchronous multiplayer for ladder levels.	2014-02-22 12:01:05 -08:00
Scott Erickson	5c85f227c6	Removed the hover playback control.	2014-02-21 17:11:16 -08:00
Nick Winter	26f11f40a9	Fix for destroying level.	2014-02-20 17:21:15 -08:00
Nick Winter	4e5ecb0c9e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-20 17:21:03 -08:00
Scott Erickson	bf80b806c6	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-20 17:06:25 -08:00
Scott Erickson	da0238ceba	Switched the level view to grab opponent code from submittedCode instead of code.	2014-02-20 16:53:08 -08:00
Nick Winter	06f1e284c9	Added comment highlighting icon.	2014-02-20 16:14:31 -08:00
Nick Winter	edcb7f45b6	Merge pull request #395 from tips48/master ... Block Ctrl-S while playing	2014-02-20 15:29:16 -08:00
Scott Erickson	d9b86b84dc	Fixed a bug with the coloring of avatars in the hud.	2014-02-20 15:13:15 -08:00
Aidan Matzko	e3ab7a4d7e	Block Ctrl-S while playing	2014-02-20 18:11:20 -05:00
Nick Winter	3c651abe20	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-20 14:05:37 -08:00
Nick Winter	97b6094fe8	Tweaks for ladder views.	2014-02-20 13:58:35 -08:00
Nick Winter	284576521f	Added fullscreen toggle to play with.	2014-02-20 13:19:49 -08:00
Scott Erickson	5cefb8fc30	Merge branch 'production'	2014-02-20 11:47:02 -08:00
Michael Schmatz	a2b811d52f	Added visual feedback for simulation buttons	2014-02-20 10:40:19 -08:00
Nick Winter	bce184b9da	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-20 10:39:19 -08:00
Nick Winter	f81e0c85ef	Fixes for popover behavior.	2014-02-20 10:39:16 -08:00
Michael Schmatz	cb0c22f0c9	Replaced rank button with button going to ladder page	2014-02-20 10:14:25 -08:00
Michael Schmatz	7c5192820f	Put more security on the session submissions and improved simulation status rendering	2014-02-20 09:44:44 -08:00
Michael Schmatz	e593fd23b4	Improved interface for simulating games	2014-02-20 08:06:14 -08:00
Nick Winter	f85a55c8b7	Cast -> Cast Spell	2014-02-19 18:20:21 -08:00
Nick Winter	7c2960f2ce	Improved visibility of cast button progress overlay.	2014-02-19 18:04:37 -08:00
Nick Winter	0469c918db	Make dead dudes look deader. Eagerly destroy ThangListEntryView popovers, Highlander-style. Announce eternal brunch.	2014-02-19 17:02:39 -08:00
Nick Winter	01374d63c4	Better comment formatting. Manual cast by default on Project DotA.	2014-02-19 14:00:54 -08:00
Scott Erickson	26af051cca	Set up indie sprites and their avatars to use the new colorConfig property.	2014-02-19 13:43:44 -08:00
Scott Erickson	613e7848dc	Fixed a bug with the setting of opposing team spells, not to modify anything when there are no specified teams.	2014-02-19 11:45:29 -08:00
Scott Erickson	86f94cb5fd	Refactored dynamic sound loading to the level view, since the level loader is no longer in service after finishing loading.	2014-02-19 11:42:33 -08:00
Scott Erickson	e85f5c7e6b	Fixed modals not being able to be opened after restarting the level when no scripts are running.	2014-02-19 11:15:36 -08:00
Scott Erickson	0bf772d745	Changing the files view to replace files when there are name collisions.	2014-02-19 10:55:15 -08:00
Scott Erickson	ece08ba366	Fixed the matches order on the ladder team page.	2014-02-19 08:19:13 -08:00
Nick Winter	a8794f4e7e	Merged	2014-02-18 12:55:18 -08:00
Nick Winter	1c82fc5bb0	Fix for opponent teams not working.	2014-02-18 12:54:47 -08:00
Scott Erickson	27fb2ec37d	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-18 12:27:56 -08:00
Scott Erickson	f383e5b9fa	Fixes for the ladder team view.	2014-02-18 12:27:10 -08:00
Nick Winter	f54fcfe6c0	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-18 11:49:15 -08:00
Nick Winter	636b1bb30d	Fixed home wizard scale.	2014-02-18 11:48:36 -08:00
Scott Erickson	5a436ce10b	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-18 11:41:29 -08:00
Scott Erickson	d2d2099c4a	Fixing a bug with the tome problem view.	2014-02-18 11:39:11 -08:00
Scott Erickson	cacf6539c1	Working on the ladder and team views.	2014-02-18 11:38:49 -08:00
Nick Winter	9cdc07d07c	Fixed spell palette doc duplication.	2014-02-18 11:23:01 -08:00
Nick Winter	d45f67a8c3	Fixed some popover and modal layout and bugs.	2014-02-18 10:03:57 -08:00
Scott Erickson	452a43cae9	Working on the ladder and team views.	2014-02-17 17:42:41 -08:00
Nick Winter	6f0ed9040a	Fixes for dirt path, fast portraits, and slow transpilation. Starting to move Aether stuff into a Tome worker with Catiline.	2014-02-17 17:38:49 -08:00
Nick Winter	2c41d403bc	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-16 15:30:07 -08:00
Nick Winter	e3824d7698	Many improvements to the spell palette.	2014-02-16 15:30:00 -08:00
Scott Erickson	bbe5399a97	Fixed #370	2014-02-16 12:51:20 -08:00
Scott Erickson	5bbe829586	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-15 17:36:40 -08:00
Scott Erickson	be83b5420f	Fixed the goals view, which wasn't being properly shown.	2014-02-15 17:36:27 -08:00
Nick Winter	f3b58a9416	Merged.	2014-02-15 15:45:53 -08:00
Nick Winter	3c7cac8ba9	Trying to do some memory cleanup.	2014-02-15 15:44:45 -08:00
Scott Erickson	72712a349c	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-15 12:07:28 -08:00
Scott Erickson	663a09ed4b	Spell list updates based on the existence of thangs now.	2014-02-15 09:22:13 -08:00
Michael Schmatz	c418e282ae	Put in pairwise simulation button	2014-02-14 16:53:37 -08:00
Nick Winter	fdf1e21e72	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-14 16:52:54 -08:00
Nick Winter	50f683534f	Support for seeing this.now() in spell palette.	2014-02-14 16:52:50 -08:00
Scott Erickson	597ace25cc	Fixed the spell list tab entry view popover to not popover when using the dropdown.	2014-02-14 16:08:01 -08:00
Scott Erickson	a25b1be916	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-14 15:57:54 -08:00
Michael Schmatz	63a5769bcf	Fixed various bugs in simulator and put in home view	2014-02-14 15:50:42 -08:00
Scott Erickson	7faa401177	Trying to improve memory by clearing out all properties of destroyed objects.	2014-02-14 13:31:26 -08:00
Scott Erickson	1349a59084	Refactored destroy functions to have super be the last thing.	2014-02-14 10:57:47 -08:00
Scott Erickson	693fa06afb	Fixed a bug in the competitor code session setting when the player has no code yet.	2014-02-14 10:38:20 -08:00
Nick Winter	da866a418c	Fixed cast options clicking.	2014-02-13 17:43:42 -08:00
Michael Schmatz	db0695513e	Implemented reverse sorting of backbone collection	2014-02-13 17:30:59 -08:00
Michael Schmatz	6011ac0df4	Changed subscription frequency to prevent multiple score registrations	2014-02-13 17:19:43 -08:00
Michael Schmatz	ca7376b794	Worked around mongoose toObject ... Also tried elementary memory leak fix	2014-02-13 17:10:01 -08:00
Scott Erickson	4001d1c7fe	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-13 16:42:49 -08:00
Scott Erickson	476cc87628	Set up the ladder to be able to compete against other sessions.	2014-02-13 16:42:35 -08:00
Nick Winter	9a835ffc0a	Re-enabled spell tab entry docs.	2014-02-13 16:09:32 -08:00
Michael Schmatz	d33c39c21e	Added continuous simulation and fix for "no team"	2014-02-13 15:59:40 -08:00
Scott Erickson	8775e86161	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-13 15:54:01 -08:00
Scott Erickson	97b4e7661d	Level loader now loads session based on the team property in the url.	2014-02-13 15:51:41 -08:00
Scott Erickson	9327d420bc	Fixed a bug.	2014-02-13 15:51:18 -08:00
Michael Schmatz	d6e99273bc	Quick fix for team not being detected	2014-02-13 15:42:00 -08:00
Michael Schmatz	ad0590f9ba	Merged in Scott's changes manually	2014-02-13 15:14:10 -08:00
Scott Erickson	1d3e013cc6	Merge remote-tracking branch 'origin/master' ... Conflicts: app/views/play/ladder_view.coffee	2014-02-13 15:11:11 -08:00
Scott Erickson	32337df156	Trimmed down the ladder view for now.	2014-02-13 15:09:40 -08:00
Michael Schmatz	480de71eb6	Leaderboard is starting to work	2014-02-13 15:02:49 -08:00
Michael Schmatz	40c26bb395	Scoring queues mostly working	2014-02-13 12:59:24 -08:00
Nick Winter	aa282c3a35	Updates for formatting palette docs.	2014-02-13 11:18:20 -08:00
Scott Erickson	2b742da9e4	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-13 10:38:43 -08:00
Michael Schmatz	14530b779a	Refactored scoring submissions, added beginnings of spectator view	2014-02-13 10:37:44 -08:00
Scott Erickson	2e280fad6b	Set up the multiplayer modal with a submit button for the ladder queue.	2014-02-13 10:16:27 -08:00
Nick Winter	9ac0939bb8	Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again.	2014-02-13 09:26:21 -08:00
Nick Winter	adaedc240c	Fixed cast button click bug.	2014-02-12 20:45:29 -08:00
Nick Winter	04abe36837	Don't need that Docs import.	2014-02-12 20:36:17 -08:00
Nick Winter	8a80b9770d	More work on docs. Got rid of Docs.coffee.	2014-02-12 18:54:45 -08:00
Nick Winter	d2345432ff	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-12 16:42:31 -08:00
Nick Winter	dc8c4394e1	Spell palette entries now using property docs from components.	2014-02-12 16:42:09 -08:00
Scott Erickson	8176e2258f	Set up the goal manager to use goals from the new level goals property, rather than from scripts. Backward-compatible for now.	2014-02-12 16:20:25 -08:00
Scott Erickson	f3489a6c2f	Added a 'stop' button for viewing end animations on thang types.	2014-02-12 16:18:25 -08:00
Nick Winter	b7be08ac19	Fixed one more leak.	2014-02-12 13:43:17 -08:00
Nick Winter	cdf268ce4f	Merged.	2014-02-12 13:10:58 -08:00
Nick Winter	5655084981	Fixed a ton more leaks.	2014-02-12 12:41:41 -08:00
Scott Erickson	2f48925e86	Added a list of goals as a property to levels for when they won't be added by scripts. Set up the editor to be able to edit these values.	2014-02-12 12:27:02 -08:00
Scott Erickson	59f0d8a93e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-12 09:55:35 -08:00
Michael Schmatz	1a2fa68473	Merge branch 'feature/task-queue' ... Conflicts: app/views/play/level/tome/spell.coffee	2014-02-11 15:58:38 -08:00
Scott Erickson	71b6ebf8eb	More memory fixes.	2014-02-11 15:47:59 -08:00
Michael Schmatz	76b949ac1e	Various changes before merge	2014-02-11 15:47:06 -08:00
Scott Erickson	d9f4594c9f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-11 15:39:02 -08:00
Scott Erickson	ac49e5eec1	More memory fixes.	2014-02-11 15:38:36 -08:00
Michael Schmatz	b29ab56fe2	Fixed simulation goals	2014-02-11 15:26:57 -08:00
Nick Winter	c29e4d6c9c	Stupid casting sound effect.	2014-02-11 15:05:54 -08:00
Scott Erickson	2a19da5ba2	More memory fixes.	2014-02-11 14:58:45 -08:00
Scott Erickson	b904e1f939	More memory fixes.	2014-02-11 14:24:06 -08:00
Michael Schmatz	a6b15663a4	Merge branch 'master' into feature/task-queue ... Conflicts: app/views/play/level/tome/spell.coffee	2014-02-11 13:10:59 -08:00
Michael Schmatz	cef7e89326	Added goal states listener	2014-02-11 13:09:53 -08:00
Michael Schmatz	58bfddeebf	Background simulation is now showing signs of life!	2014-02-11 12:58:23 -08:00
Scott Erickson	b0a74e5b1a	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-11 12:24:25 -08:00
Nick Winter	2d9606a8eb	includeFlow only on the currently selected Thang.	2014-02-11 12:16:53 -08:00
Scott Erickson	166bb6db45	More memory cleanup.	2014-02-11 12:10:21 -08:00
Nick Winter	d22c716dce	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-11 12:02:53 -08:00
Scott Erickson	aa4cc8d9c4	Added a whole bunch of view teardown.	2014-02-11 12:02:49 -08:00
Nick Winter	d2a7bfd11c	Added GoldView.	2014-02-11 12:02:27 -08:00
Scott Erickson	8ff38a724d	Fixing some event tearing down.	2014-02-11 11:31:02 -08:00
Michael Schmatz	612a374b3f	Progress on simulator	2014-02-11 11:27:39 -08:00
Michael Schmatz	c0d43ea32b	Merge branch 'master' into feature/task-queue	2014-02-10 17:10:26 -08:00
Michael Schmatz	7faabc37e3	Simulation button	2014-02-10 17:09:51 -08:00
Nick Winter	7d5db41f5d	God prepares Workers for Angelic consumption ahead of time.	2014-02-10 17:09:19 -08:00
Michael Schmatz	cc3b93a0f8	Transfer teamSpellMap from tome to levelBus	2014-02-10 16:18:39 -08:00
Nick Winter	f812241bd5	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-10 14:50:35 -08:00
Nick Winter	9507be4c9a	Turned off includeFlow for horrific performance reasons on project-dota for now.	2014-02-10 14:19:54 -08:00
Michael Schmatz	465ea22b1a	More progress with queues and client-side simulation	2014-02-10 13:18:39 -08:00
Scott Erickson	9f5b51da19	Made goals for other teams invisible.	2014-02-10 12:49:38 -08:00
Nick Winter	26016f48e2	Skip protectAPI for now. Defer worker termination until after it reports stats.	2014-02-09 18:44:31 -08:00
Nick Winter	f2bcf019fa	Should update code when other player changes it again.	2014-02-08 15:32:14 -08:00
Nick Winter	2e7a1fd0ef	Working on the contribute pages -- #314.	2014-02-08 10:21:12 -08:00
Nick Winter	2a740f777e	Starting to add contributor avatars.	2014-02-07 18:38:17 -08:00
Nick Winter	b2bf4db222	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-07 16:47:38 -08:00
Scott Erickson	0365998658	Began work on a ladder view.	2014-02-07 15:51:05 -08:00
Nick Winter	2efb9a0ea1	Simple team switch links in multiplayer menu.	2014-02-07 10:51:21 -08:00
Nick Winter	86de427204	Messing with team setting.	2014-02-06 17:31:08 -08:00
Nick Winter	2a3e47b08f	Using playable team config from Alliance system.	2014-02-06 16:05:41 -08:00
Nick Winter	6af2d34f59	Fixed a ton of memory leaks, but not all of them.	2014-02-06 14:00:27 -08:00
Scott Erickson	332ea0df2c	Fixed the level editor save view knowing if the level has changes to save.	2014-02-06 10:30:49 -08:00
Nick Winter	2a8d0eb694	Updates for ThangsList refreshing its Thangs.	2014-02-05 20:08:28 -08:00
Nick Winter	cc3465fd6f	Improvement for errors updating action of non-existent Thangs in HUD.	2014-02-05 15:54:34 -08:00
Nick Winter	cec52d70f3	Improvements to how Tome subviews manage Thang updates.	2014-02-05 15:16:59 -08:00
Scott Erickson	6533196bc7	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-03 14:01:30 -08:00
Scott Erickson	81912d25d1	Added a handler for when components or systems go rogue, so they don't take down the level editor quite so hard.	2014-02-03 14:01:20 -08:00
Nick Winter	738b791683	Updated to new Aether range info, fixing error line numbers.	2014-02-03 13:58:25 -08:00
Scott Erickson	09bb669439	Fixed #300	2014-02-02 16:51:22 -08:00
Nick Winter	068f798d58	Fixed bugs in Tome spell views swapping.	2014-02-02 10:26:42 -08:00
Nick Winter	7ba6e5d0f2	Fixed #316.	2014-01-31 16:32:46 -08:00
Nick Winter	ee7d8a06fe	A few SpellView / debugger fixes.	2014-01-31 16:16:59 -08:00
Nick Winter	632316314e	Don't include flow for invisible methods, don't include protectAPI for non-writable methods.	2014-01-31 14:51:06 -08:00
Nick Winter	6303d28554	Refactored bobbing.	2014-01-31 10:21:32 -08:00
Nick Winter	d79d66c175	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-30 16:36:40 -08:00
Nick Winter	6e40fa09a6	Updated some Bootstrap event names.	2014-01-30 16:36:36 -08:00
Scott Erickson	3093b59588	Fixed #296	2014-01-30 16:25:06 -08:00
Scott Erickson	46d1d10abe	Removed an unnecessary fat arrow.	2014-01-30 16:20:58 -08:00
Scott Erickson	c376ba6841	Fixed #303	2014-01-30 16:19:55 -08:00
Scott Erickson	1b75ab15db	Added some error handlers for messed up thang type configs.	2014-01-30 16:17:41 -08:00
Scott Erickson	591a8e9ab5	Made the revert modal reload the page if anything was reverted.	2014-01-30 15:38:49 -08:00
Michael Schmatz	fe89c9fbad	Fix for #290	2014-01-30 15:03:55 -08:00
Scott Erickson	210235553e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-30 12:19:44 -08:00
Scott Erickson	5429e8ad2a	Cleaning up editors in the systems and components tabs.	2014-01-30 12:19:25 -08:00
Nick Winter	b09d1b1c74	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-30 12:03:35 -08:00
Nick Winter	a6bfb6770c	Matched gradient background colors in HUD to ThangAvatarView.	2014-01-30 12:03:33 -08:00
Scott Erickson	827b5a3756	Fixed the world select modal.	2014-01-30 11:55:46 -08:00
Scott Erickson	ed1b5c6560	Fixed slowness to editing settings for large levels.	2014-01-30 11:40:24 -08:00
Scott Erickson	65f74e9587	Improved the navbars in the level editor.	2014-01-30 11:37:40 -08:00
Nick Winter	067d3abd75	Improved handling of spawning Programmables in Tome after the fact.	2014-01-29 16:26:08 -08:00
Nick Winter	e0108a3166	A few fixes for the Bootstrap 3 migration. Fixed #280.	2014-01-29 12:18:37 -08:00
Scott Erickson	f065406cf5	Merge branch 'feature/bootstrap3'	2014-01-29 10:40:34 -08:00
Scott Erickson	bac4fbcd7d	Fixed naming. ... Improved tome updating of programmable spell thangs.	2014-01-29 10:14:12 -08:00
Nick Winter	01efb2f92b	Improvements to SpellDebugView hover.	2014-01-29 08:38:37 -08:00
Nick Winter	c3f5c1c334	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-28 15:24:12 -08:00
Nick Winter	fb7739727c	Updates for Aether's protectAPI stuff.	2014-01-28 15:24:08 -08:00
Scott Erickson	6e9f93d299	Merge branch 'master' into feature/bootstrap3 ... Conflicts: app/styles/editor/level/edit.sass Also experimenting with a new layout for the level editor.	2014-01-28 12:46:17 -08:00
Scott Erickson	00872f80f9	Fixed the bug where opening a modal or switching a tab while having a thang to add selected would create a thang.	2014-01-28 11:54:16 -08:00
Scott Erickson	e2db421d1c	Fixed cloning.	2014-01-28 09:22:23 -08:00
Scott Erickson	9336a637ce	Merge branch 'master' into feature/bootstrap3	2014-01-27 21:25:26 -08:00
Scott Erickson	a82a6a4188	Systems part of #266.	2014-01-27 21:25:01 -08:00
Scott Erickson	ca026610b1	Component part of #266.	2014-01-27 21:06:27 -08:00
Scott Erickson	b4cd7bdec4	Fixed #281	2014-01-27 19:03:22 -08:00
Scott Erickson	fa8928c187	Fixed the wizard sprite on the home page again.	2014-01-27 18:55:25 -08:00
Scott Erickson	13af9febbf	More fixes for #283	2014-01-27 18:44:05 -08:00
Scott Erickson	26d6c2dc5b	Fixed the new model modal in search.	2014-01-27 11:30:22 -08:00
Scott Erickson	b48fb6823e	Fixed the progress bar for loading pages.	2014-01-27 11:12:58 -08:00
Scott Erickson	88c8c3896b	Merge branch 'master' into feature/bootstrap3	2014-01-27 11:03:04 -08:00
Scott Erickson	fa3ab69dab	Level preview now loads from backups so that brunch reloads don't cause the preview to break.	2014-01-27 11:00:36 -08:00
Scott Erickson	9206dda3ba	Systems now autosave too in the level editor.	2014-01-27 10:39:16 -08:00
Scott Erickson	692b24dde0	#267	2014-01-26 15:59:33 -08:00
Scott Erickson	26e9dc3b09	Fixed system order in the level view.	2014-01-26 15:37:32 -08:00
Scott Erickson	9da955d1a2	Set up a backup system for the editor using localStorage.	2014-01-26 14:46:25 -08:00
Nick Winter	47c78d1758	Revamped SpellToolbarView.	2014-01-25 15:11:29 -08:00
Nick Winter	d262dfaca7	A few visual tweaks to the spell view flow.	2014-01-24 17:48:11 -08:00
Nick Winter	45329df4cd	Temp fix for debugger bug on a relevant session.	2014-01-24 13:46:51 -08:00
Nick Winter	6fa38bd889	Several improvements to hover debugging.	2014-01-24 13:03:04 -08:00
Nick Winter	9b9df12ea0	Huge Aether performance fix; spells now scroll while debugging.	2014-01-24 08:01:00 -08:00
Scott Erickson	0727e11669	Merge branch 'bootstrapMigration' of https://github.com/TomSteinbrecher/codecombat into feature/bootstrap3 ... Conflicts: app/templates/play/level/playback.jade	2014-01-23 20:15:36 -08:00
Tom Steinbrecher	cd33376dea	Upgrade from Bootstrap 2 to Bootstrap 3	2014-01-23 21:49:29 -05:00
Scott Erickson	0a34bfc7a8	Fixed a couple things with the component versions view.	2014-01-22 18:54:20 -08:00
Scott Erickson	dcaa24ffa9	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-22 17:38:31 -08:00
Scott Erickson	4ff2abc4b0	Refactored a collection into its own file.	2014-01-22 17:38:22 -08:00
Nick Winter	af6abda7cd	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-22 10:56:54 -08:00
Nick Winter	3b7a908dcd	Handled a couple errors.	2014-01-22 10:56:49 -08:00
Scott Erickson	00a7de12c9	Fixed a selection bug.	2014-01-21 10:54:59 -08:00
Scott Erickson	01a43bb3d7	Added filters to the extant thangs column.	2014-01-21 10:42:09 -08:00
GlenDC	b2ddde96cd	Merge https://github.com/codecombat/codecombat	2014-01-21 18:05:14 +01:00
Nick Winter	24c4051442	Merge branch 'feature/time-travel-debugger'	2014-01-21 09:04:09 -08:00
Nick Winter	6ea4f645f8	Added spell toolbar view. Made many time-travel debugger improvements.	2014-01-21 09:03:04 -08:00
GlenDC	c12e232ec1	Merge https://github.com/codecombat/codecombat	2014-01-21 18:01:58 +01:00
Scott Erickson	68567c1366	Fixed level editor preview.	2014-01-20 23:14:34 -08:00
Scott Erickson	e61d31f48c	Level editor displays thangs in a more orderly fashion.	2014-01-20 23:02:23 -08:00
Scott Erickson	4b1b72627c	Reenabled projecting on the search views.	2014-01-20 22:38:36 -08:00
Scott Erickson	2cf19a4781	Renamed canvases to spritesheets in the edit thang view.	2014-01-20 22:37:47 -08:00
Scott Erickson	514adb2159	Improved the speed of placing down thangs in levels with lots of extant thangs.	2014-01-20 21:19:54 -08:00
Scott Erickson	222fa6100b	Set up the level editor to lazily load thang types.	2014-01-20 17:20:04 -08:00
GlenDC	262a523458	Merge branch 'FixThangScroll' of https://github.com/phansch/codecombat	2014-01-20 23:50:19 +01:00
Scott Erickson	7f4f268ff8	Improved the refresh rate for the color tab, and made it work with containers.	2014-01-20 12:57:29 -08:00
Philipp Hansch	2c6c60307b	Disable body scrolling in Thang List ... This overwrites the native scrolling behavior for the thangs-list div by manually setting the value of @scrollTop	2014-01-20 12:15:20 +01:00
Nick Winter	f87c3a37e8	More progress on debugger.	2014-01-19 09:14:42 -08:00
GlenDC	6c46dc3fda	Tracked down common used i18n tags and applied it already on the nl.coffee file	2014-01-19 17:00:41 +01:00
Nick Winter	0a8d64046a	Starting work on time-travel debugging interface.	2014-01-19 07:08:28 -08:00
GlenDC	abbd576b4d	Added the else statement. This can be used to make pull request #253 more advanced.	2014-01-19 14:08:32 +01:00
dristic	7f39693d70	Save latest level played to local storage. Change play link when latest level is available on home page.	2014-01-18 23:15:59 -08:00
Scott Erickson	8b0a0c4e51	Added unsubscribe view.	2014-01-17 10:47:42 -08:00
Nick Winter	053927eaec	Fixed home page wizard scale.	2014-01-16 16:27:34 -08:00
Nick Winter	5267febd8f	Couple fixes for small errors when running with no Programmables.	2014-01-16 14:29:57 -08:00
GlenDC	553ad833ed	Merge https://github.com/codecombat/codecombat	2014-01-16 22:27:09 +01:00
GlenDC	5cc24ea1b2	Logs now a warning in the console to give user the feedback that there are no programmable thangs which makws the level unplayable.	2014-01-16 22:26:34 +01:00
GlenDC	b557c43f60	Hotfix for previous commit, forgot to uncommit some stuff	2014-01-16 22:22:42 +01:00
GlenDC	926b31f62f	Resolved issue #160	2014-01-16 22:18:38 +01:00
Nick Winter	1fb68ae717	Fixed bug with team assignments and spell permissions.	2014-01-16 11:37:04 -08:00
Scott Erickson	c5b9b103c5	Merge branch 'feature/team-colors' ... Conflicts: app/lib/world/world.coffee app/models/ThangType.coffee	2014-01-16 10:14:21 -08:00
Nick Winter	af7344175a	Merged and tweaked phansch's save indicator from #205.	2014-01-16 10:10:27 -08:00
Nick Winter	6f5b37e86d	Possible fix for Grab the Mushroom problems.	2014-01-16 09:20:02 -08:00
Philipp Hansch	3a63428c0c	Add jquery fading ... Also using the level:session-will-save callback	2014-01-16 17:13:14 +01:00
Scott Erickson	f230e8983c	Fixed the level preview view.	2014-01-15 18:37:47 -08:00
Michael Schmatz	74d5b1a845	Merge pull request #199 from GlenDC/master ... Issue #30 is resolved + Added Dutch Translations + Hotfixes	2014-01-15 15:54:04 -08:00
GlenDC	a7368fb51e	Converted line endings to unix endings for 3 files	2014-01-16 00:35:17 +01:00
Scott Erickson	47effcd50e	Got the rest of team colors set up.	2014-01-15 15:16:31 -08:00
Nick Winter	172d97ed83	Fixed #87 I hope; at least, dramatically reduced memory leakage.	2014-01-15 13:04:48 -08:00
Philipp Hansch	17afb62dc9	Add basic code-saved indicator ... Using the tome:spell-changed callback to determine when to start showing the code-saved indicator	2014-01-15 20:58:39 +01:00
GlenDC	d5907059ed	Resolved issue #30	2014-01-15 01:58:37 +01:00
GlenDC	92416dc4f2	Created view versions for components, systems and thangs (fix #30)	2014-01-15 01:33:24 +01:00
GlenDC	4633ced78d	Created superclass & common templates for article & level (fix for #30)	2014-01-15 01:12:21 +01:00
Scott Erickson	bf4011044f	Initially working on using team colors, but it's not working yet.	2014-01-14 13:16:30 -08:00
Scott Erickson	f4a2209d6f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-14 12:53:18 -08:00
Scott Erickson	83e7a98869	Fixed the versions pages.	2014-01-14 12:53:06 -08:00
Nick Winter	4a702176a6	Updated i18n, added /employers.	2014-01-13 22:29:58 -08:00
Nick Winter	d6f2f41cf8	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-12 12:24:24 -08:00
Scott Erickson	c4028a8036	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-12 12:06:48 -08:00
Nick Winter	1572228aa5	Merge branch 'master' of git://github.com/GlenDC/codecombat into GlenDC-master	2014-01-12 12:01:56 -08:00
Nick Winter	8ab997680e	Turned off A/B test for Break the Prison.	2014-01-12 12:00:38 -08:00
Scott Erickson	6d60221668	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-12 11:58:24 -08:00
Scott Erickson	be80858648	Added wizard color setting.	2014-01-12 11:54:50 -08:00
GlenDC	683b72f67a	First big fix for issue #23. The issue is as good as fixed besides some details I think.	2014-01-11 17:25:04 +01:00
Nick Winter	00f4699ce5	Further fixes for save modals.	2014-01-10 17:32:29 -08:00
Scott Erickson	1f9c531938	Got rid of a bunch of logs.	2014-01-10 16:57:38 -08:00
Scott Erickson	95900f230f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-10 16:48:45 -08:00
Scott Erickson	1a3c6498e8	Built the thang editor colors tab.	2014-01-10 16:48:28 -08:00
Nick Winter	a6f1ce53ba	Merged #152, and slightly improved update interval handling.	2014-01-10 16:36:36 -08:00
dristic	21915f358c	Add clear timers to not have timer running in the background on home page.	2014-01-10 16:18:39 -08:00
GlenDC	100a296951	Fixed Issue #26	2014-01-10 22:31:26 +01:00
Nick Winter	69df0079af	Fixed bug returning to normal selection from talking portrait in HUD.	2014-01-09 18:30:18 -08:00
Scott Erickson	2d5ca50e89	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-09 14:04:53 -08:00
Scott Erickson	3c3e38b585	Set up thang avatar views with the new db portraits.	2014-01-09 14:04:46 -08:00
Nick Winter	98245d0fb9	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-09 11:28:14 -08:00
Nick Winter	3a954ff91c	A bit more CoffeeScript-y.	2014-01-09 11:28:08 -08:00
Scott Erickson	4e34b38c83	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/views/play/level/hud_view.coffee	2014-01-09 11:05:51 -08:00
Scott Erickson	8077c62ceb	Set up talking portraits in the hud.	2014-01-09 11:04:22 -08:00
Nick Winter	e2414f7c5a	Hopefully fixed #106 by being super conservative about whether G+, FB, and Twitter can be loaded.	2014-01-09 10:49:34 -08:00
Ronald Cheng	278b4d8754	If you have pressed esc, do not get prompted about it	2014-01-08 23:09:58 -08:00
Scott Erickson	391207d00f	Fixes for unit portraits.	2014-01-08 22:30:00 -08:00
Nick Winter	03a5614a18	Fixed #96.	2014-01-08 19:18:23 -08:00
Ronald Cheng	81eed31714	Create notification that esc can skip dialogs ... If you use the shift-space combination at least 5 times per page load, a message will pop up next to the continue button stating that you can press esc to skip dialog.	2014-01-08 14:23:36 -08:00
Nick Winter	70cd16cee4	Fixing bug with application require for now. Shoutout for Firebase.	2014-01-06 23:45:33 -08:00
Scott Erickson	250b7322a9	Fixed #56	2014-01-06 21:25:18 -08:00
Scott Erickson	f0147e8f7c	More tweaks to the thang editor.	2014-01-06 19:33:36 -08:00
Scott Erickson	ddbf45b50c	Made the thang editor a little more organized.	2014-01-06 19:09:43 -08:00
Scott Erickson	59ec63c041	Fixed #60.	2014-01-06 18:12:57 -08:00
Scott Erickson	aeaeb84fe5	Fixed general articles showing up in the guides.	2014-01-06 18:03:17 -08:00
Scott Erickson	a9c70f9a7d	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-06 17:15:24 -08:00
Scott Erickson	94cb6ea4e1	Fixed up the search optimization and installed thang portraits into the level editor.	2014-01-06 17:11:57 -08:00
Nick Winter	1297126abd	Added back lang val instead of attr setting.	2014-01-06 16:58:50 -08:00
Scott Erickson	fe984d7c73	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-06 15:36:50 -08:00
Scott Erickson	27e7b6c240	Tweaks for thang portraits.	2014-01-06 15:36:35 -08:00
Nick Winter	8b4ec9b263	Merged and cleaned up #79.	2014-01-06 15:18:40 -08:00
Nick Winter	f53f20a6ad	Fixed #86.	2014-01-06 14:53:21 -08:00
Tom Steinbrecher	60c4b360d5	Added ContribueClassView, which all contribute pages are now based off of. ... Moved nav in to contribute_nav.jad, allowing for easier addition of nav to contribute pages. Fixed other small bugs.	2014-01-06 17:30:35 -05:00
Scott Erickson	f656a4f4cf	Set up portrait uploading for thangs.	2014-01-06 12:37:35 -08:00
Nick Winter	316b382d81	Fix for announcement duplicates.	2014-01-06 10:33:52 -08:00
Tom Steinbrecher	75894d1160	Issues 13 and 14. Contributor pages, and fixed the scrolling bug better than before	2014-01-06 00:56:32 -05:00
Nick Winter	1185731fd0	Fixed two bugs with the CLA.	2014-01-05 15:07:30 -08:00
Nick Winter	f1186f6092	Contributor emails now indicate saved.	2014-01-05 14:45:55 -08:00
Nick Winter	ec20cac6f7	Allowed access to character class emails by prompting for signup on check.	2014-01-05 14:20:48 -08:00
Nick Winter	1d223f790b	Trying to force soft tabs and Unix newlines.	2014-01-04 16:41:25 -08:00
Nick Winter	01cfcbedc7	Updated some $attr, $val, and $prop calls.	2014-01-04 15:49:13 -08:00
Scott Erickson	c4bfcd5c2d	Refactored portraits to be built in sprite sheets separately.	2014-01-04 08:55:12 -08:00
Scott Erickson	594b54a40e	Can now set admin permissions on the dev environment.	2014-01-03 14:28:00 -08:00
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00