3396 commits

Author	SHA1	Message	Date
Philippe Rigovanov	e138d2eed6	Update ru.coffee ... With fixes from [M-r-A](https://github.com/M-r-A)	2014-06-27 04:11:46 +04:00
Michael Schmatz	28bb28cf85	Fixed employer view for manually created candidates	2014-06-26 17:07:17 -07:00
George Saines	a94053fd1d	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-06-26 10:38:18 -07:00
George Saines	e294133bcf	adding the files I forgot	2014-06-26 10:38:13 -07:00
Nick Winter	d360ecac94	Merged in the language-war branch.	2014-06-25 23:00:03 -07:00
Nick Winter	aee95ac5c0	Improved per-language spell palette and tab documentation.	2014-06-25 22:56:39 -07:00
Nick Winter	4cebf1f434	Merge pull request #1232 from Darredevil/patch-11 ... Added new tip tag	2014-06-25 21:23:41 -07:00
Darredevil	c6f19f7d3a	Added new tip tag	2014-06-26 06:23:36 +03:00
Nick Winter	8c6ee66684	Better handling of alternate spell palette documentation syntax for other code languages.	2014-06-25 20:19:11 -07:00
Darredevil	a127cb7a5b	Added a joke tip	2014-06-26 02:11:15 +03:00
Philippe Rigovanov	f2898e3bc0	Update diplomat.jade ... added myself to diplomats	2014-06-26 00:56:41 +04:00
Inez KEMENES	96f74183a5	Update hu.coffee	2014-06-25 17:28:13 +02:00
Nick Winter	04976a7b14	Working on the Tome displaying the proper syntax for the selected programming language. Fixed #1225.	2014-06-24 21:08:01 -07:00
Nick Winter	512e287b6a	Merge pull request #1184 from greyhusky/patch-1 ... Update de-CH.coffee	2014-06-24 17:41:32 -07:00
George Saines	b5ec38f811	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-06-24 16:43:32 -07:00
George Saines	68d7b3997a	modifying the employer page to be more explanatory	2014-06-24 16:43:27 -07:00
Nick Winter	dd9b8a0018	Migrating from tileGroupNumber to tileGroupLetter.	2014-06-24 16:32:44 -07:00
Nick Winter	580d002a98	Messing with marks.	2014-06-24 15:45:33 -07:00
Michael Schmatz	e3a87156a2	Send BCC email to employer when contacting candidates	2014-06-24 14:35:30 -07:00
Scott Erickson	9b873cfab4	Patch modal handles invalid patches.	2014-06-24 17:25:01 -04:00
Scott Erickson	ee0b14eb61	Changed the versions history modal to show name and date.	2014-06-24 16:41:55 -04:00
Scott Erickson	327d273cbe	Fixed gplus login.	2014-06-24 14:44:37 -04:00
Michael Schmatz	988ad6ffda	Attempting to fix G+	2014-06-24 11:29:43 -07:00
Scott Erickson	0363166736	Some tweaks to the guide for the benefit of the criss-cross docs, and hopefully others as well.	2014-06-24 13:23:31 -04:00
Nick Winter	6a31e0bcd3	Fixed bug showing spell palette for languages missing any code snippets.	2014-06-24 10:17:38 -07:00
Nick Winter	8719b80663	Showing expired profiles to admins.	2014-06-24 10:15:38 -07:00
Nick Winter	abcc75a6f2	A bit of error logging for #1220.	2014-06-24 09:43:20 -07:00
Nick Winter	3862bd2376	Clearing backups of old models when saving new versions of versioned models.	2014-06-24 09:43:20 -07:00
Scott Erickson	dde43d5df3	Fixed a case where the supermodel was overriding what a previous supermodel had set for saveBackups.	2014-06-23 16:57:54 -04:00
Nick Winter	815ef88e78	Fixed bugs with camera bobbing with bobbing units and gold views showing up when empty.	2014-06-23 10:36:42 -07:00
Michael Schmatz	27774cdf0f	Fix #1207	2014-06-23 09:46:39 -07:00
Darredevil	4ca1d2bfeb	Added new level "K-means++ Cluster Wars" ... Added new level "K-means++ Cluster Wars"	2014-06-23 03:43:54 +03:00
Nick Winter	a267933f0b	Merge pull request #1200 from Airunedz/patch-1 ... Improve Spanish (Spain) translations	2014-06-22 15:39:43 -07:00
Philippe Rigovanov	f7ec30a586	Update ru.coffee	2014-06-23 01:55:45 +04:00
Nick Winter	105d22c802	Merge pull request #1202 from kumabotz/minor-cleanup ... Minor cleanup	2014-06-22 07:56:15 -07:00
Nick Winter	8698589625	Applying Scott's fix for #1198.	2014-06-22 07:55:29 -07:00
Tery Lim	f03f8da50a	Remove extra spaces	2014-06-22 16:42:06 +08:00
Tery Lim	32868b565d	Fix typo	2014-06-22 16:39:51 +08:00
Tery Lim	88c84911b7	Remove trailing comma	2014-06-22 16:39:07 +08:00
Nick Winter	81f8334f37	Some fixes for CocoSprite alphas.	2014-06-21 22:31:10 -07:00
Airunedz	dfff43d66a	Improve Spanish (Spain) translations ... Changes: Add some translations to Spanish (I'm from Spanin)	2014-06-22 01:07:05 +02:00
Nick Winter	1f29a923cf	Fixed playing multiplayer levels without an opponent, against the AI.	2014-06-21 12:24:14 -07:00
Nick Winter	6813279871	Fixed an infinite loop timeout issue.	2014-06-21 10:56:55 -07:00
Nick Winter	a8f4baebbc	Restricted some more analytics.	2014-06-21 09:47:48 -07:00
Nick Winter	564c463431	Stop tracking Simulator events to Mixpanel.	2014-06-21 09:17:56 -07:00
Nick Winter	52b2e756ef	Merge pull request #1195 from thanosme/patch-1 ... Update el.coffee	2014-06-21 08:44:43 -07:00
Thanasis Manousos	5e2dececb5	Update el.coffee	2014-06-21 18:31:26 +03:00
Nick Winter	dde71485bf	A bit of cleanup.	2014-06-20 20:52:50 -07:00
Nick Winter	17366af245	Merge pull request #1188 from a1ip/master ... Update ru.coffee	2014-06-20 20:49:19 -07:00
Nick Winter	d8e1fa880c	Merge pull request #1181 from djsmith85/patch-1 ... Update de.coffee	2014-06-20 20:45:27 -07:00
Nick Winter	d3d9908ef2	Merge pull request #1180 from djsmith85/patch-2 ... Update de-DE.coffee	2014-06-20 20:45:02 -07:00
Nick Winter	ac0f6e74aa	Merged.	2014-06-20 20:41:34 -07:00
Nick Winter	60ca6e46d3	Ooops, that's a function.	2014-06-20 18:45:57 -07:00
Nick Winter	c9dcc290cb	Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes.	2014-06-20 17:19:18 -07:00
Fergus Leen	88aa8d234c	Facebook friends patch	2014-06-20 02:18:40 +01:00
Nick Winter	bb8b9b2e93	bid -> makeBid.	2014-06-19 17:27:41 -07:00
Michael Schmatz	34f5377754	Increased infinite loop timeout	2014-06-19 17:16:08 -07:00
Michael Schmatz	40fd1674ad	Temporary fix for bid function in hover debugger	2014-06-19 17:09:45 -07:00
Nick Winter	7b59c42f5d	Added stupid method argument compilation info for bid(blockNumber) to various Aether compilation steps.	2014-06-19 15:41:35 -07:00
thanosme	625750614a	Update el.coffee ... Added some tranlations with minor corrections	2014-06-20 01:14:30 +03:00
Nick Winter	1e9b403ce5	More zazz for home page code language selection.	2014-06-19 14:55:16 -07:00
Nick Winter	cf57411b5c	Added another logging message for more easily seeing when transpiled code might be misfiring.	2014-06-19 13:42:38 -07:00
Nick Winter	666c020389	Switching code language based on selection now.	2014-06-19 13:42:25 -07:00
Scott Erickson	20589db6be	Fixed a bug with logging missing documentation.	2014-06-19 16:15:38 -04:00
Nick Winter	a58f3e0fb6	More styling work on code language selector.	2014-06-19 12:31:56 -07:00
Michael Schmatz	51923459e0	Changed autocomplete to on by default	2014-06-19 10:44:44 -07:00
Michael Schmatz	2559a73244	Merge pull request #1186 from dkundel/master ... Initial Autocomplete Version	2014-06-19 10:10:26 -07:00
Michael Schmatz	a1b7025730	Emergency linkedin hot fix	2014-06-19 08:36:22 -07:00
Nick Winter	2e850dba78	Working on home language selection.	2014-06-19 08:06:34 -07:00
Philippe Rigovanov	ebaeac7e80	Some translations	2014-06-19 05:42:15 +04:00
Dominik Kundel	7e8845332e	updated Ace minified	2014-06-18 23:27:05 +02:00
Dominik Kundel	69959b6b05	updated Ace	2014-06-18 23:18:58 +02:00
Michael Schmatz	548eaefae1	Add debug variable inspection progress bar	2014-06-18 13:43:04 -07:00
Dominik Kundel	33d68fab6e	Merge remote-tracking branch 'upstream/master'	2014-06-18 21:50:55 +02:00
Nick Winter	ac6c7292c8	Fixed Gridmancer session linking on profile view.	2014-06-18 12:05:40 -07:00
Scott Erickson	50fea7e937	Added a method for returning all requests in mock-ajax.	2014-06-18 12:04:39 -04:00
Scott Erickson	d651885524	Maybe fixing the toggleModal system once and for all.	2014-06-18 12:04:38 -04:00
Dominik Kundel	d3e0299465	merge conflict solved	2014-06-18 17:59:26 +02:00
Dominik Kundel	f6355b034b	integrated autocomplete	2014-06-18 17:57:42 +02:00
greyhusky	6fe9623244	Update de-CH.coffee ... Hoi zeme, i übersetze mega gern und wieni gseh ha isches no es reechts Stück wo z übersetze isch. Ha mol agfange, i hoff ihr findeds guet. :)	2014-06-18 11:09:10 +02:00
Nick Winter	59654da24b	Starting more work on integrating additional languages. Improved Component code editing performance with a trusty debounce.	2014-06-17 22:17:44 -07:00
Nick Winter	4bd02ba6dc	ModelModal now grants real ultimate power.	2014-06-17 15:17:25 -07:00
djsmith85	2fff271200	Update de-DE.coffee ... Updated a few translations in the German locale file.	2014-06-17 23:52:57 +02:00
djsmith85	5a90a7c880	Update de.coffee ... Updated a few translations in the German locale file and merged the translations from de-DE.coffee	2014-06-17 23:52:54 +02:00
Nick Winter	0b8a0c8f6f	Added UserRemarks.	2014-06-17 13:03:13 -07:00
Scott Erickson	3e24b2f86e	Fixed tests running in karma.	2014-06-16 11:40:09 -07:00
Scott Erickson	d6bb7ffe81	Fixing tests. Somehow segmentio loading was making the jasmine test runner load properly in WebKit browsers. No idea why.	2014-06-16 11:40:09 -07:00
Scott Erickson	ee791da34c	Moved services into their own folder, and made no services run for both testing and demo pages.	2014-06-16 11:40:09 -07:00
Ruben Vereecken	1c671a3c25	Refactored vendor loading	2014-06-16 11:40:09 -07:00
Ruben Vereecken	2e40a53674	Extracting third party scripts out of main	2014-06-16 11:40:08 -07:00
Scott Erickson	4932317982	Finally got the demo view working (mostly). Need to turn off third party ajax requests.	2014-06-16 11:40:08 -07:00
Scott Erickson	1786eab09d	Initial work on a demo view. But brunch won't build demo-app.js for some reason.	2014-06-16 11:40:08 -07:00
Nick Winter	9a64ca5973	A few misc fixes.	2014-06-16 10:49:20 -07:00
Nick Winter	3d2bee3256	Merge pull request #1168 from kinez/patch-9 ... Update hu.coffee	2014-06-16 08:22:21 -07:00
Nick Winter	7198a8fc42	Merge pull request #1166 from ChrisLightman/patch-6 ... Upsate /// Translate	2014-06-16 08:21:56 -07:00
Nick Winter	0418d80c6d	Merged.	2014-06-16 08:12:52 -07:00
Inez KEMENES	c611cafa25	Update hu.coffee	2014-06-16 16:39:02 +02:00
Dominik Kundel	9a3ba70ea2	Merge remote-tracking branch 'upstream/master'	2014-06-16 14:30:22 +01:00
Dominik Kundel	25a0447d77	autocomplete	2014-06-16 14:29:01 +01:00
Clement	931f3ea330	Upsate /// Translate ... Enjoy	2014-06-16 11:38:25 +02:00
barbuddha	ff5f46e5fb	Update ru.coffee	2014-06-16 08:43:27 +04:00
Nick Winter	66e2805a9a	Added StackLead integration. Employerified profile backgrounds.	2014-06-14 20:59:28 -07:00
Nick Winter	babfa04a9e	Fixed a tiny typo.	2014-06-14 18:02:22 -07:00
djsmith85	a22a098fdc	Update de-DE.coffee	2014-06-14 14:02:42 +02:00
Nick Winter	ff0d842871	Better employer contact message.	2014-06-13 16:04:11 -07:00
Michael Schmatz	84601d2927	Added more info email field to employer signup	2014-06-13 15:38:47 -07:00
Nick Winter	21e7487132	Showing more skills in employer table for better searching. Hid employer selling copy after sold.	2014-06-13 14:52:50 -07:00
Scott Erickson	a1dd9a714e	Fixed #1153.	2014-06-13 13:35:57 -07:00
Scott Erickson	8f4e1b4bf0	Making the ModelModal look better.	2014-06-13 10:11:01 -07:00
Scott Erickson	6c87d5792d	One last fix to the search url.	2014-06-13 09:52:34 -07:00
Nick Winter	79cbc4bb25	Propagated i18n.	2014-06-13 08:50:52 -07:00
Nick Winter	4c57ff7501	Fixed LevelComponent search collection in level editor.	2014-06-13 08:48:29 -07:00
Nick Winter	1502cdc64b	Merge branch 'jayant1992-master'	2014-06-13 08:17:12 -07:00
Dominik Kundel	e756c83d9e	preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES	2014-06-13 16:14:31 +01:00
Dominik Kundel	603766b8c5	preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES	2014-06-13 16:12:55 +01:00
Nick Winter	27f2b9acb1	Merge pull request #1151 from kumabotz/remove-unicode ... Remove unicode from url regex pattern	2014-06-13 08:11:59 -07:00
Nick Winter	2bda60796a	Copy / i18n tweaks for tournament ending and employers blurb.	2014-06-13 08:08:13 -07:00
Tery Lim	c3b72e025a	Remove unicode from url regex pattern	2014-06-13 10:30:29 +08:00
Nick Winter	1b2c4e078c	Fixed candidates viewing their own code and resetting it.	2014-06-12 17:52:08 -07:00
Nick Winter	28264d5ace	Added tournament results and a way to email them out.	2014-06-12 17:52:08 -07:00
George Saines	03aa0783b1	a few copy edits	2014-06-12 16:13:48 -07:00
George Saines	3415b62663	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-06-12 16:01:39 -07:00
George Saines	fb7b3f8580	adding a top info arena on top of the employers page	2014-06-12 16:01:34 -07:00
Michael Schmatz	32a041a5a7	Made max size of canvas much bigger for spectate view	2014-06-12 15:48:11 -07:00
Scott Erickson	152b860a23	Hotfix for the profile view.	2014-06-12 14:44:55 -07:00
Scott Erickson	994e4773ca	Reverting the objectId schema.	2014-06-12 13:19:06 -07:00
Scott Erickson	8ab69cf833	Merge pull request #1138 from rubenvereecken/search-endpoint ... Search endpoint is now without the /search prefix	2014-06-12 11:33:28 -07:00
Scott Erickson	c855327cef	Merge pull request #1150 from rubenvereecken/achievements ... Achievements - Update with some tests and admin endpoint	2014-06-12 11:28:25 -07:00
Ruben Vereecken	dcdcca751f	Fiddled with creating xp functions	2014-06-12 19:44:56 +02:00
Ruben Vereecken	aecf937722	Cleaned up achievement testing environment ... Made sure server sided tests work completely	2014-06-12 19:41:07 +02:00
Ruben Vereecken	2a5c2020ca	Added recalculation button to the achievement editor	2014-06-12 19:41:07 +02:00
Ruben Vereecken	509be067c3	Added support for the operator in LocalMongo	2014-06-12 19:41:00 +02:00
Ruben Vereecken	bd2b289943	Recalculate script mainly finished	2014-06-12 19:40:59 +02:00
Ruben Vereecken	a61d0e5569	Added support for diminished exp for repeatables. Needs tweaking though.	2014-06-12 19:40:59 +02:00
Ruben Vereecken	7096a07ce8	Improved logging (winston) and admin-only'd the achievement editor	2014-06-12 19:40:59 +02:00
Ruben Vereecken	5aa211cabd	Got repeatables working flawlessly and improved the achievement popup by a great deal	2014-06-12 19:40:59 +02:00
Ruben Vereecken	2c04025a5a	Created a test environment for repeatables	2014-06-12 19:40:59 +02:00
Ruben Vereecken	b0666ace0d	Refactorings performed necessary to have searchable for more uses	2014-06-12 19:40:59 +02:00
Ruben Vereecken	0751581113	Search endpoint is now without the /search prefix ... Intermediate commit for search refactoring	2014-06-12 19:19:30 +02:00
Lucas Castro	ebf0cba45d	Update pt-BR.coffee	2014-06-12 10:11:49 -03:00
oaugereau	f7ee40a3a2	Update fr.coffee	2014-06-12 14:39:41 +02:00
oaugereau	0d5e213daa	Update fr.coffee	2014-06-12 14:17:36 +02:00
oaugereau	028feaafc6	Update fr.coffee	2014-06-12 09:42:57 +02:00
Nick Winter	77920b5416	Improvements to profile views. Added links to players' code.	2014-06-11 19:38:47 -07:00
Scott Erickson	8a728cbb64	More switching of user objects from save to patch.	2014-06-11 14:17:31 -07:00
Scott Erickson	4ecbc73c1c	Fixed client side testing on karma/travis with the new FacebookHandler tests.	2014-06-11 13:43:07 -07:00
Jayant Jain	ed95206868	Enables moving around the map while an addThang is selected	2014-06-12 01:50:24 +05:30
Scott Erickson	6d15b5e631	Working on User patching.	2014-06-11 13:16:17 -07:00
Scott Erickson	e6dc896bab	Reworking some code to use the new CocoModel.patch method.	2014-06-11 11:34:52 -07:00
Lucas Castro	60a0a6ee80	Update pt-BR.coffee	2014-06-11 14:04:19 -03:00
Lucas Castro	fe9e584767	Update pt-BR.coffee	2014-06-11 14:00:52 -03:00
Nick Winter	cb378c13e2	Fixed employer list template typo.	2014-06-11 09:15:41 -07:00
Nick Winter	a9356fdc93	Merge pull request #1142 from Xercoy/patch-1 ... Added more names for #53	2014-06-11 07:24:55 -07:00
Jayant Jain	d5d20377a2	Removes panning upon right click in editor	2014-06-11 15:05:59 +05:30
barbuddha	d361ab5809	Update ru.coffee	2014-06-11 09:56:15 +04:00
Scott Erickson	389d530eaa	Built a new 'patch' method for CocoModel, which saves only changed values to the server.	2014-06-10 20:59:37 -07:00
Nick Winter	69fc378930	Final tournament update blurb.	2014-06-10 16:51:36 -07:00
Nick Winter	f3d18efa90	Added employer_list and activity tracking.	2014-06-10 16:30:13 -07:00
Scott Erickson	f0ff8c242e	Migrating language to codeLanguage on systems and components because they conflict with the search system.	2014-06-10 13:20:14 -07:00
Corey Prak	8448061f7b	Added more names for #53	2014-06-10 12:52:06 -04:00
Nick Winter	86223167af	Re-added significant trailing whitespace.	2014-06-10 07:46:43 -07:00
Lucas Castro	132a7b62f1	Update pt-BR.coffee	2014-06-10 11:04:02 -03:00
Nick Winter	22ca9507d0	Upgrades to employer's candidate indexing.	2014-06-09 22:17:53 -07:00
Nick Winter	dd2c7fab60	Updated Danger Minefield icon.	2014-06-09 21:11:59 -07:00
Darredevil	82f33a35de	Fixed id	2014-06-09 22:37:34 +03:00
Darredevil	da1d0e5361	Added new level ... Added a new prime-sieve level	2014-06-09 22:29:02 +03:00
Michael Schmatz	693da57f13	Merge branch 'feature/linkedin-profile-import' ... Conflicts: app/templates/account/profile.jade app/views/account/profile_view.coffee	2014-06-08 18:37:33 -07:00
Michael Schmatz	ad80fcf229	Removed linkedIn callback, disabled autosave	2014-06-08 18:21:56 -07:00
Michael Schmatz	f29a41f108	Add linkedIn link, field of study support to LinkedIn import	2014-06-08 18:15:18 -07:00
Nick Winter	bb5d23e6ba	Wrapped LinkedIn button in a .btn.	2014-06-08 18:51:45 -06:00
Michael Schmatz	7ec3910e36	Make LinkedIn import more robust	2014-06-08 17:38:02 -07:00
Nick Winter	6597b687eb	Only start profiles in edit mode if they are yours.	2014-06-08 11:52:16 -06:00
Scott Erickson	1b166028c6	Turned off Backbone.Mediator validation for tests.	2014-06-07 19:08:38 -07:00
Nick Winter	cefeb1df14	Fixed backwards Approved button and candidate time sort.	2014-06-07 19:58:33 -06:00
Scott Erickson	01c20f4065	Fixed karma tests.	2014-06-07 18:15:57 -07:00
Scott Erickson	5104f0a1e7	Fixed source maps for when test files error out. See https://github.com/brunch/brunch/issues/842	2014-06-07 16:41:19 -07:00
Scott Erickson	2cbc33d66d	Fixed jasmine-ajax setup/reset.	2014-06-07 16:41:19 -07:00
Nick Winter	63a3aa9074	Fixes for browsing profiles by username.	2014-06-07 17:33:14 -06:00
Michael Schmatz	4072c1b969	Basic functionality done, needs validation error handling ... As well as formatting	2014-06-07 11:45:49 -07:00
Nick Winter	67b10474e8	Suggested improvements to profile pages.	2014-06-07 00:33:18 -06:00
Scott Erickson	f0cdf6b2e2	Fixed #1111.	2014-06-06 16:47:48 -07:00
Nick Winter	d00c4c2af3	Propagate i18n. Merged in good stuff from 6b675f from kinez for hu.coffee.	2014-06-06 15:39:03 -06:00
Michael Schmatz	0c0084dd4b	Make single game simulate another task if error	2014-06-06 13:26:15 -07:00
Michael Schmatz	31bb9c8807	Fixed error handling for results with no taskID	2014-06-06 12:47:10 -07:00
Michael Schmatz	1486f31c37	Stop headless simulator from exiting if error	2014-06-06 12:26:28 -07:00
Michael Schmatz	24452026d1	Minor fix for simulator logic	2014-06-06 12:18:02 -07:00
Nick Winter	51f7aa1743	Merge pull request #1130 from Nichiatu/patch-1 ... Updates to norwegian translation	2014-06-06 10:17:19 -06:00
Scott Erickson	49c9c6bfc9	Built the client test view (rebased from feature/testclient).	2014-06-05 16:56:29 -07:00
Nichlas Torgersen	657182c8c0	Updates to norwegian translation ... I noticed there were some misspellings and grammar errors which I corrected. Especially the sign in-message, it went along the lines in norwegian as: "Draw yourself in", that doesn't make sense now does it. Also removed some unneeded capitalizations, norwegian grammar is all about that and how you build a word. Most words can be combined into one, like in english: "Door handle" would be "Doorhandle" if english was using norwegian grammar rules.	2014-06-06 01:44:05 +02:00
Nick Winter	47b99adddf	Uncommented some fr.coffee section headers to go with the new translations.	2014-06-05 10:28:40 -06:00
Clement	9895432dd2	Syntax Update and Traduction Update	2014-06-05 18:03:33 +02:00
Clement	a7d0b540cd	Big Update /// Syntax Correction and Traduction	2014-06-05 13:35:03 +02:00
Nick Winter	0b2d5c251d	A bit more Worker hardening.	2014-06-04 15:47:09 -06:00
Nick Winter	f493f407c2	Fixed some bugs on job profile initialization.	2014-06-04 15:38:57 -06:00
Scott Erickson	8f6187125d	Fixed saving new settings for a level.	2014-06-03 12:27:53 -07:00
Nick Winter	143597dc0f	Merge pull request #1124 from ChrisLightman/patch-2 ... Update Line 723-734 : Full Traduction	2014-06-03 08:26:54 -07:00
Nick Winter	bebb200090	Merge pull request #1122 from ChrisLightman/patch-1 ... Update fr.coffee	2014-06-03 08:26:44 -07:00
Ruben Vereecken	ed44ab5f7d	Improved logging (winston) and admin-only'd the achievement editor	2014-06-02 21:07:23 +02:00
ChrisLightman	12da959550	Update Line 723-734 : Full Traduction	2014-06-02 20:52:49 +02:00
Ruben Vereecken	8d2c62ba84	Got repeatables working flawlessly and improved the achievement popup by a great deal	2014-06-02 20:34:05 +02:00
Ruben Vereecken	bb57756cd9	Processed Scott's feedback. Db endpoint slightly safer, some refactorings.	2014-06-02 20:33:01 +02:00
Ruben Vereecken	8607162cd7	Finished designing achievement notify, for now.	2014-06-02 20:33:01 +02:00
Ruben Vereecken	d8bb802468	Designing the Notify to show level progress	2014-06-02 20:33:01 +02:00
Ruben Vereecken	d766a24e11	Achievements now popup when polled for by the client	2014-06-02 20:33:01 +02:00
Ruben Vereecken	aa3fedeb02	Achievements can have icons. Users now have their scores denormalized	2014-06-02 20:32:00 +02:00
Ruben Vereecken	287019242f	Achievement queries are now strings server sided but remain objects for the client	2014-06-02 20:32:00 +02:00
Ruben Vereecken	c26f96f33e	Added achievement model and some missing pieces	2014-06-02 20:32:00 +02:00
Ruben Vereecken	1b2a251c58	Achievement editor in place and looking mighty fine	2014-06-02 20:31:09 +02:00
Ruben Vereecken	c2d2f2a2b8	Refactorings performed necessary to have searchable for more uses	2014-06-02 20:31:09 +02:00
Ruben Vereecken	a3ca382dcd	Used the feedback from Scott to improve endpoints	2014-06-02 20:29:12 +02:00
Ruben Vereecken	df60402d00	Added test	2014-06-02 20:29:12 +02:00
Ruben Vereecken	37b47d35de	Got work done on detecting achievements	2014-06-02 20:29:12 +02:00
Ruben Vereecken	699aa506f2	Added Local Mongo support for nested documents. Totally forgot those	2014-06-02 20:29:11 +02:00
Ruben Vereecken	e177912a5a	Added '$or' and '$and' to Local Mongo	2014-06-02 20:29:11 +02:00
Ruben Vereecken	b3bddbd785	Finished regular query selectors of Local Mongo	2014-06-02 20:29:11 +02:00
Ruben Vereecken	20af7b090a	Worked on getting the tests to work	2014-06-02 20:29:11 +02:00
Ruben Vereecken	f2f4fef1e0	Wrote tests for the local mongo querier	2014-06-02 20:29:11 +02:00
Ruben Vereecken	99927d1345	Started on the local mongo querier	2014-06-02 20:29:11 +02:00
Ruben Vereecken	2f5090df8f	Added schema objectIds and bettered the repeatable achievements	2014-06-02 20:29:11 +02:00
Ruben Vereecken	f5389fef99	Got the basic achievement schemas up. Still need proper references	2014-06-02 20:29:11 +02:00
Nick Winter	51891887e5	Fixed merge conflict	2014-06-02 10:43:31 -07:00
Nick Winter	257fe4cec3	Fixed merge conflict	2014-06-02 10:42:34 -07:00
Gutierri Barboza	8a8b80bcf5	More translations pt-br	2014-06-02 14:34:30 -03:00
ChrisLightman	cfcaece743	Update fr.coffee ... Modification mineures de syntaxe ( Majuscules )	2014-06-02 11:36:05 +02:00
Nick Winter	f3d5b724de	Merge branch 'inline-profile'	2014-06-01 16:45:49 -07:00
Nick Winter	10754e6825	Added i18n, error handling, autocomplete, highlighting the next section, animation for completing sections, and complete example skeleton.	2014-06-01 16:45:19 -07:00
Nick Winter	d19b6760da	More flourishes for inline profile editor.	2014-06-01 11:45:01 -07:00
Nick Winter	400fddc294	Jade, you're supposed to be so minimalist. But today... Today, I did this. I am sorry.	2014-05-31 22:09:41 -07:00
Inez KEMENES	a97d243100	Update hu.coffee	2014-05-31 16:16:28 +02:00
Nick Winter	852053022a	Started the horrifying migration to an inline jobs profile editor.	2014-05-30 22:12:44 -07:00
Scott Erickson	29011fab2a	Reworked validation error handling a little, putting better debugging logs in and making level save modal show when there are some.	2014-05-30 17:26:49 -07:00
Scott Erickson	22c4ddc064	Fixed the settings view putting undefineds in the level documents and causing validation errors.	2014-05-30 17:24:13 -07:00
Scott Erickson	f82ca5c1b6	Fixed #1099	2014-05-30 16:43:55 -07:00
Scott Erickson	47f28d26d1	Fixed up my refactoring of markToRevert so now _revertAttributes is only populated the first time set is called.	2014-05-30 16:20:20 -07:00
Scott Erickson	bba0e4939d	Fixed #1039	2014-05-30 15:06:33 -07:00
Scott Erickson	3602f67c24	Tweaked how editPath is passed to the server so it doesn't foul up validation.	2014-05-30 14:41:41 -07:00
Scott Erickson	7a9928b0c5	Fixed #1102	2014-05-30 13:57:21 -07:00
Scott Erickson	254c6ff7ba	Fixed #1106 a bunch. Patches show up correctly, don't include skipped paths when patching, and skipped paths are now used in the patch modal too.	2014-05-30 13:40:38 -07:00
Ruben Vereecken	84e6b8cd6d	Script event triggers are now fetched from the mediator, resolving issue #1061	2014-05-30 12:38:43 +02:00
Nick Winter	1f32c1c8a1	Merge pull request #1113 from rubenvereecken/issue1110 ... One line fix for issue #1110. Thang search bar works again.	2014-05-29 15:31:28 -07:00
Ruben Vereecken	ba57899f9f	One line fix for issue #1110. Thang search bar works again.	2014-05-30 00:16:11 +02:00
Nick Winter	df13bbfaa6	Made right-click duplicate Thang menu actually clone modified Thang.	2014-05-29 12:33:21 -07:00
Nick Winter	f3adc216ed	Protecting our replacement of Math.random via Aether.	2014-05-29 12:26:08 -07:00
Scott Erickson	afc14e593d	Fixed models thinking they've got changes when they don't.	2014-05-29 10:48:48 -07:00
Nick Winter	90c97008ae	Merge pull request #1098 from rubenvereecken/view-refactoring ... Refactored getRenderData from SearchView to children	2014-05-28 18:59:02 -07:00
dpen2000	bd444fa547	Fixes #1096 by ensuring progress is reset back to zero so render gets called correctly after ajax call to load patches completes	2014-05-29 02:16:07 +01:00
Ruben Vereecken	5909f15678	Refactored getRenderData from SearchView to children	2014-05-28 17:32:18 +02:00
Scott Erickson	93f7d8c0a4	Made sure sprites are idle and properly positioned when they load.	2014-05-27 16:41:56 -07:00
Scott Erickson	3b87c9c360	Fixed some remaining jqxhr objects hanging around.	2014-05-27 16:33:57 -07:00
Nick Winter	a481af08d3	Fixed a couple typos with failed resource loading handling.	2014-05-26 20:51:05 -07:00
Nick Winter	c01bd69625	Better recoverability for non-UserCodeProblem errors during world generation.	2014-05-26 18:45:00 -07:00
Nick Winter	ec0027043b	Added experimental Io language from Aether.	2014-05-26 08:59:48 -07:00
Nick Winter	ed36dba3f5	Merge pull request #1041 from Shpionus/patch-1 ... Update ru.coffee	2014-05-25 12:17:12 -07:00
Nick Winter	3dd362c01e	Added support for blaming infinite loops.	2014-05-25 12:15:32 -07:00
Nick Winter	6b554e03ef	Merge pull request #1084 from domenukk/feature/step-single-frame ... Added shortcut for frame single-stepping	2014-05-25 09:37:13 -07:00
Nick Winter	16e1ef760a	Merge branch 'master' of git://github.com/jayant1992/codecombat	2014-05-25 08:51:13 -07:00
Nick Winter	1a6fd75103	Trying to fix some Simulator loading errors.	2014-05-25 08:29:33 -07:00
Nick Winter	33408020f1	Merge pull request #1054 from dpen2000/patch-2 ... Update simulate_tab.coffee	2014-05-25 08:27:54 -07:00
z3t1	d8b448ab60	Update zh.coffee ... Update some phrases.	2014-05-25 16:05:35 +08:00
Dominik Maier	f62cd7f38b	+ added shortcut for frame single-stepping ... + fixed single stepping for frames	2014-05-24 17:31:59 +02:00
Jayant Jain	55569ccf2f	Resolves an issue with nanoscroller and initially hidden content	2014-05-24 12:02:26 +05:30
Jayant Jain	241adafad8	Adds nanoscroll for other tabs in editor	2014-05-24 12:02:26 +05:30
Jayant Jain	f17c5cfb51	Adds nanoscroll to thang tab in level editor	2014-05-24 12:02:26 +05:30
Jayant Jain	a84049cf16	Fixes issues with dragging thangs onto the map	2014-05-24 12:02:26 +05:30
Jayant Jain	cbe5f3a011	Fixes issue with esc key not deselecting the current thang	2014-05-24 12:02:26 +05:30
Jayant Jain	94f70ca9f4	Fixes #1079	2014-05-24 12:02:26 +05:30
Nick Winter	35fc5a5197	Fixed infinite loop detection, I hope.	2014-05-23 21:24:50 -07:00
Nick Winter	690fbc6919	Fixed a bug with Tome trying to retranspile transpiled code on clone spells when remagicking.	2014-05-23 12:04:42 -07:00
Nick Winter	ff171588d9	Trying out text shadow coloring based on team for text event labels.	2014-05-23 09:56:39 -07:00
Nick Winter	bda8f10508	Fixed a couple typos in the hu merge.	2014-05-23 09:27:02 -07:00
Inez KEMENES	1d595e9a0d	Update hu.coffee ... The line no. 123 disappeared. I may have accidentally deleted it while working on 122. Sorry. Please correct.	2014-05-23 16:21:46 +02:00
Nick Winter	26d2816071	Fixed some more memory leaks.	2014-05-22 19:05:11 -07:00
Scott Erickson	bd575ad667	Fixed the placement of wall sprites in the level editor to wait until the sprite sheet is finished being built.	2014-05-22 14:16:39 -07:00
Scott Erickson	5a407492db	Got rid of a bunch of magic numbers in mark scaling. Now assumed all target marks have a width of 10m by default.	2014-05-22 13:48:48 -07:00
Scott Erickson	681adc1dcd	Got rid of a log.	2014-05-22 13:37:08 -07:00
Nick Winter	4c7d7fce03	Fixed some memory leaks.	2014-05-22 12:05:36 -07:00
Scott Erickson	4b88296265	Set up the supermodel to clear out jqxhrs once they're done, since they take a lot of memory.	2014-05-22 11:47:38 -07:00
Scott Erickson	bfa90f671d	Fixes #940, merging the signup and login modal into a single modal. Created a couple A/B tests for amount of text in the signup modal.	2014-05-22 11:26:08 -07:00
Scott Erickson	d613c230ef	Fixed some text in the victory modal that wasn't showing up because of indentation.	2014-05-22 11:26:08 -07:00
Scott Erickson	104deb2ab8	Disabled CocoModel noty errors for form submissions that handle these errors.	2014-05-22 11:26:08 -07:00
Michael Schmatz	8604a0ed3c	Update rules about location restrictions ... Just to clarify, people from regions that we can't send prizes to can play, just not receive prizes.	2014-05-22 10:34:46 -07:00
George Saines	a2fbe5865a	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-22 09:55:34 -07:00
George Saines	4ffbdf004c	modifying oreilly logo size	2014-05-22 09:55:30 -07:00
Nick Winter	48f5347075	Fixed gigantor server scoring bug. Cleaned up a bit of logging and error handling. Finished not resetting scores on resubmitting.	2014-05-21 21:56:11 -07:00
Nick Winter	4fc1341a64	Added a way to remove SuperModel resources to fix ladder tab refreshing.	2014-05-21 15:33:28 -07:00
Scott Erickson	037dbe97c6	Some remaining work to get the delayed show guide script set up.	2014-05-21 14:50:27 -07:00
Scott Erickson	4929f81fcc	Fixed the level editor preview window not loading on repeated opens.	2014-05-21 14:28:52 -07:00
Scott Erickson	18f694b010	Fixed up the level loader to include session objects as world necessities.	2014-05-21 12:53:28 -07:00
Scott Erickson	c43081636f	Fixed the facebook event schema.	2014-05-21 12:35:37 -07:00
Nick Winter	06866e48de	Merge pull request #1059 from rafagomes/patch-1 ... Updated some words and phrases	2014-05-21 11:27:54 -07:00
Rafael Gomes	09db5cb9ee	Updated some words and phrases ... Just a few words and phares until have more experience in the project.	2014-05-21 14:38:08 -03:00
Nick Winter	511dcef313	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-21 10:30:03 -07:00
Michael Schmatz	585b907f4e	More temp fixes for 422s	2014-05-21 10:29:16 -07:00
Nick Winter	8fb1237810	Added noty error messages when unable to save CocoModels.	2014-05-21 10:27:47 -07:00
Jayant Jain	8f1f378bcb	Fixes issue with thang being added twice upon click	2014-05-21 10:27:47 -07:00
Jayant Jain	c05780de4c	Resolves #170, thang can be directly placed by dragging onto the map	2014-05-21 10:27:46 -07:00
Michael Schmatz	02f8458dfe	Temp fix for occasional 422	2014-05-21 10:16:01 -07:00
dpen2000	ce661a5493	Update simulate_tab.coffee ... Add back in current user to nearby simulators	2014-05-21 15:06:52 +01:00
Burlutskiy Ivan	70403409f3	Update ru.coffee ... reverted team translation by @M-r-A request.	2014-05-21 12:18:44 +04:00
Scott Erickson	a8b54f3cdc	Made backbone mediator validate only on development.	2014-05-20 15:58:57 -07:00
Scott Erickson	a7f24ab04f	Some work on subscription definitions for the validated Backbone Mediator. Added 'script-manager:tick' channel.	2014-05-20 15:36:15 -07:00
Nick Winter	88ef5ffe93	Prevent default ACE go-to-line alert when pressing Ctrl/Cmd+L.	2014-05-20 15:24:57 -07:00
Nick Winter	de9f1fab0d	Merged.	2014-05-20 15:09:48 -07:00
Burlutskiy Ivan	a8a50df025	Update ru.coffee ... Fixed previous typos; uncommented translations.	2014-05-21 01:32:15 +04:00
Scott Erickson	70525ec57a	Fixed the music starting when you restart the level, even if music is off.	2014-05-20 13:43:52 -07:00
Burlutskiy Ivan	65a364d3f7	Update ru.coffee	2014-05-21 00:21:10 +04:00
Nick Winter	88a5685c37	Fix for WizardSprite scale thing.	2014-05-20 12:32:26 -07:00
Scott Erickson	86736d8f4a	Fixed a bug.	2014-05-20 12:22:24 -07:00
Scott Erickson	2b56dffcb0	Fixed a bug where sometimes scripts setting playback would be overridden by the surface resetting playback after casting is done.	2014-05-20 12:21:43 -07:00
Scott Erickson	3f884e71e5	Fixed the LevelLoader in headless settings.	2014-05-20 11:25:32 -07:00
Scott Erickson	93c6f72f07	Asynchronously building things again.	2014-05-20 10:49:19 -07:00
Nick Winter	a04130f26a	Fixed a bug with ladder tab not reloading.	2014-05-20 10:40:15 -07:00
Michael Schmatz	b31e6312ac	Updated rules to be subject to change	2014-05-20 10:10:40 -07:00
Nick Winter	022722a19f	Fixed cosmetic GoalManager destruction error.	2014-05-20 09:19:31 -07:00
Nick Winter	248cec1e6e	Transpile code properly.	2014-05-20 08:23:25 -07:00
Nick Winter	d058b16283	Fixed some memory leaks.	2014-05-20 08:00:49 -07:00
Scott Erickson	04da5b4714	Fixed thang avatar view thang loading some more.	2014-05-19 23:02:02 -07:00
Scott Erickson	a8abe8c887	Fixed mark sprite scaling some more.	2014-05-19 23:01:48 -07:00
Scott Erickson	042fd7ac0d	Made the guide, when it shows up the first time, only show the first doc.	2014-05-19 22:25:40 -07:00
Scott Erickson	f24ee98295	More work on mark sizing.	2014-05-19 22:17:23 -07:00
George Saines	5d8e199c2d	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-19 22:14:09 -07:00
George Saines	5d603f625e	removing China	2014-05-19 22:14:05 -07:00
Nick Winter	513a73c62e	Added grayscale filter until hover for tournament sponsor logos.	2014-05-19 22:07:36 -07:00
Nick Winter	b6406b9b0e	Put some tournament details in there. Muted some extra casting sounds during level load.	2014-05-19 21:56:20 -07:00
Scott Erickson	f463966a22	Fixed a bug with thangs not being properly scaled when first created sometimes.	2014-05-19 21:55:41 -07:00
Scott Erickson	6c3ff16bed	Fixed setting registration points for thangs that match world dimensions.	2014-05-19 21:55:31 -07:00
Scott Erickson	ae8d28182c	Fixed a bug where sometimes thang avatar views wouldn't render the portrait, because 'loading' wouldn't be set to false properly.	2014-05-19 21:55:30 -07:00
Scott Erickson	b816055f9e	Fixed goal states to handle teams.	2014-05-19 21:55:30 -07:00
George Saines	8b5014a053	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-19 21:39:45 -07:00
George Saines	5b6b26415b	making the Firebase logo look good	2014-05-19 21:39:41 -07:00
Nick Winter	39178daff6	Trying to show loading ready and initialize the Surface earlier.	2014-05-19 20:49:17 -07:00
Nick Winter	b2cc3d0692	Fixed bug with preloading the world replacing casting the same world if timing was wrong.	2014-05-19 20:12:16 -07:00
Scott Erickson	9ad4602e0f	Fixed a bug with the new goal view.	2014-05-19 20:11:33 -07:00
Nick Winter	341097c5ca	A couple improvements for the LadderSubmissionView.	2014-05-19 19:51:24 -07:00
Michael Schmatz	d8df61f94b	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/templates/play/ladder/ladder.jade	2014-05-19 19:43:47 -07:00
Michael Schmatz	ca2e48b491	Edited judging criteria	2014-05-19 19:37:25 -07:00
Nick Winter	116965fcdc	Rules wording tweaks; highlighting new matches and end of ranking with sounds.	2014-05-19 19:13:36 -07:00
Michael Schmatz	aba0120e88	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: server/queues/scoring.coffee	2014-05-19 19:04:47 -07:00
Michael Schmatz	97cbf55695	Simulator fetch random Greed games when queue empty	2014-05-19 18:58:45 -07:00
George Saines	8277472fda	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-19 17:59:48 -07:00
George Saines	4f763d0203	added the rules section	2014-05-19 17:59:43 -07:00
Nick Winter	af31bcf008	Fleshed out tournament prizes tab.	2014-05-19 17:40:06 -07:00
Scott Erickson	b410d91203	Cleaned up the LevelView, organizing it so that initialization code roughly runs in order, and set it up so that the ScriptManager is created earlier.	2014-05-19 17:10:41 -07:00
Scott Erickson	62ad8dd26a	Added a status message to the goals view.	2014-05-19 16:36:45 -07:00
Scott Erickson	9ace31d391	Fixed the target mark.	2014-05-19 16:36:45 -07:00
Scott Erickson	8ae14e21ae	Fixed #1029. Refactored scaling for sprites a bit.	2014-05-19 16:36:44 -07:00
dpen2000	10d0ef0606	Fix admin checkbox label for attribute so clicking on it toggles checkbox correctly	2014-05-19 23:28:53 +01:00
George Saines	7c0d73e779	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-19 15:19:59 -07:00
George Saines	07177e1a89	putting together the prizes page	2014-05-19 15:19:56 -07:00
Nick Winter	8a5a45950f	Simulator now pleads for you to help simulate when your match is being ranked.	2014-05-19 14:59:47 -07:00
Michael Schmatz	b8dc4ed939	Stopgap solution for totalScore being string	2014-05-19 14:58:08 -07:00
Nick Winter	68a4483e91	Moved views/play/ladder_view to views/play/ladder/ladder_view and made a new views/play/ladder_home_view.	2014-05-19 11:58:53 -07:00
Scott Erickson	179702b0eb	Set up the goals view to be more hidden by default, and shows up on mouse hover.	2014-05-19 11:31:18 -07:00
Nick Winter	5dd8bec393	Fixed issues with initial sprite scaling.	2014-05-19 10:39:24 -07:00
Michael Schmatz	6f2fd8e293	Verification simulator changes	2014-05-19 10:11:23 -07:00
Nick Winter	5dffca7a9c	Propagated i18n tags.	2014-05-19 10:11:18 -07:00
Nick Winter	b89615cea4	Added helpful keyboard shortcuts modal.	2014-05-19 10:08:34 -07:00
Michael Schmatz	38d732d8bc	Disable hover debugger when spell changed	2014-05-18 11:51:31 -07:00
Michael Schmatz	5c72ccdce1	Add support for Aether globals in hover debugger	2014-05-18 11:41:42 -07:00
Nick Winter	9df34875ee	Added tournament rules/prizes placeholders.	2014-05-17 20:43:05 -07:00
Nick Winter	3c9428ffd3	Refactored game ranking buttons into a LadderSubmissionView.	2014-05-17 11:55:51 -07:00
Scott Erickson	5907ca8619	Fixed scaling in the thang type editor.	2014-05-17 11:49:11 -07:00
Scott Erickson	df222461bf	Fixed a bug that was bringing the thang editor down.	2014-05-17 11:38:33 -07:00
Scott Erickson	f99a95768e	Set up CocoSprites to have text appear overhead based on events coming from the ShowsText component.	2014-05-17 11:28:57 -07:00
Scott Erickson	4be67113be	Thang events now only appear once per whole frame, rather than for each interpolated frame.	2014-05-17 11:28:57 -07:00
Nick Winter	736fc8c12f	Remove overeager transpile problem showing for JS again.	2014-05-17 09:58:35 -07:00
Gutierri Barboza	589de9b4b2	correction in "candidate_location"	2014-05-17 13:11:05 -03:00
Gutierri Barboza	ac3c5276b5	update PT-BR	2014-05-17 13:07:51 -03:00
Pablo Lobato	8794921018	Update es-ES.coffee	2014-05-17 11:09:55 +02:00
Nick Winter	418c2f1a2c	Preserve original scripts; don't overwrite with nothing if new world finishes before script initialization.	2014-05-16 17:38:33 -07:00
Nick Winter	a36a7792ec	Fixed problem with IndieSprites not loading, breaking scripts.	2014-05-16 17:18:56 -07:00
Nick Winter	f64e50f85b	Recording flow only for frame of interest.	2014-05-16 16:52:55 -07:00
Michael Schmatz	891471b80a	Add time to hover debugger	2014-05-16 16:04:10 -07:00
Scott Erickson	ae64032739	Refactored the Camera to only listen to events that use the same canvas. Fixed the level editor map selection modals.	2014-05-16 15:34:14 -07:00
Michael Schmatz	e631bae248	Level session playtime logging	2014-05-16 15:27:46 -07:00
Michael Schmatz	5b93414862	Add playtime, opponent name, totalScore to match	2014-05-16 14:52:49 -07:00
Michael Schmatz	2e36a3352e	Modified level session schema to log playtime, renormalize score and name in matches	2014-05-16 14:13:59 -07:00
Michael Schmatz	21ccaa2d8a	Adjust histogram height downwards ... Make room for ranking text	2014-05-16 13:33:41 -07:00
Michael Schmatz	ab1b0cac42	Added "Rank your session" message	2014-05-16 13:30:55 -07:00
Michael Schmatz	bd1261802d	Fix rank for unranked sessions on ladder histogram	2014-05-16 13:27:42 -07:00
Michael Schmatz	934c853789	Live simulation count and fixed double simulator leaderboard session	2014-05-16 13:16:35 -07:00
Michael Schmatz	60342cc40e	Hover debugger optimization for "this"	2014-05-16 10:19:36 -07:00
Nick Winter	5d30cc7eab	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-16 10:04:03 -07:00
Nick Winter	c1052d8d7e	Fixed bug with trying to play selection sound for nonexistent sprites.	2014-05-16 10:03:45 -07:00
Michael Schmatz	206d63231e	Fixed teamSpells instantiation	2014-05-16 09:47:15 -07:00
Nick Winter	7811bda6c3	Use ace/mdoe/python for Python instead of ace/mode/lua.	2014-05-16 08:55:59 -07:00
Nick Winter	cff00f90b5	Stopped bug with useTranspiledCode; it will need more work later to get right.	2014-05-15 21:53:23 -07:00
Nick Winter	fabf607b6a	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-15 20:49:15 -07:00
Nick Winter	ca6ea474bf	Fixed some bugs with sprite sound loading and playback.	2014-05-15 20:49:10 -07:00
Scott Erickson	eebbae9b13	Added a global SPRITE_RESOLUTION_FACTOR property.	2014-05-15 17:09:35 -07:00
Michael Schmatz	65aae86dcc	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/lib/simulator/Simulator.coffee	2014-05-15 16:44:16 -07:00
Michael Schmatz	a21d17a168	Have simulator use transpiledCode	2014-05-15 16:43:16 -07:00
Nick Winter	c7ca081df9	Merged ProblemAlertView fixes.	2014-05-15 15:36:06 -07:00
Nick Winter	c2a7530b62	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-15 15:35:08 -07:00
Michael Schmatz	0bb1422d6c	Switch spectate and level view to use transpiled code	2014-05-15 15:18:17 -07:00
Nick Winter	763e0500b2	Tracking simulator clicks.	2014-05-15 15:10:50 -07:00
Nick Winter	b973b749c0	Merged.	2014-05-15 14:57:24 -07:00
Nick Winter	8909d218bc	Moved random seed initialization to Existence System, where it can be configured.	2014-05-15 14:54:31 -07:00
Scott Erickson	2a1d9a3c6c	Turned shadow caching back on, with a little buffer. Makes a bigger diff for maps like Greed on Firefox where they're all over the place.	2014-05-15 13:19:10 -07:00
Vicky Chijwani	0a14681e7b	Correctly parse multi-line error messages in the editor.	2014-05-16 01:41:26 +05:30
Scott Erickson	3a1afbb7ca	Turned shadow caching back on. Makes a bigger diff for maps like Greed on Firefox where they're all over the place.	2014-05-15 13:06:42 -07:00
Scott Erickson	c03004166c	Set up the save version modal/patch modal to submit on submit form (like pressing enter in an input).	2014-05-15 12:37:39 -07:00
Nick Winter	c1f9d51b37	Added times to runtime errors. Don't load ThangTypes for Thangs that don't exist on the first frame of the world.	2014-05-15 11:27:51 -07:00
Scott Erickson	f653aa3375	Fixed #1008	2014-05-15 10:51:38 -07:00
Michael Schmatz	338b613074	Added transpiledCode to victory modal	2014-05-15 09:30:59 -07:00
Nick Winter	dbcafbb29b	Working on level-specific coding languages, with non-writable code in JavaScript.	2014-05-14 21:54:36 -07:00
Scott Erickson	2a17ec5cb9	Refactored out displayObject from CocoSprites.	2014-05-14 17:05:13 -07:00
Michael Schmatz	4e268d8dc6	Add codeLanguage to level session	2014-05-14 16:41:02 -07:00
Nick Winter	dd1acb94ed	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-14 16:06:09 -07:00
Nick Winter	c420209a6b	Improved GoldView tooltip.	2014-05-14 16:06:00 -07:00
Michael Schmatz	f32a0ca963	Added transpile to in-game rank button	2014-05-14 15:45:38 -07:00
Nick Winter	d61922ae42	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-14 15:31:19 -07:00
Nick Winter	cc7808251f	Zoom/scroll, ModelModal, and coordinate grabber fixes.	2014-05-14 15:29:55 -07:00
George Saines	75ab5d6435	making our recruitment % consistent	2014-05-14 14:55:04 -07:00
Scott Erickson	a1474652f6	Merge branch 'feature/thangload'	2014-05-14 14:21:40 -07:00
Scott Erickson	00fdaa1d0f	Fixed raster image sprites to update their scales when they load, and to properly place themselves if matching world dimensions.	2014-05-14 12:28:47 -07:00
Nick Winter	698207f533	Merge pull request #996 from gosnat/patch-8 ... Update world.coffee	2014-05-14 11:55:01 -07:00
Nick Winter	7f3e769cbd	Merge pull request #997 from gosnat/patch-6 ... Update GoalManager.coffee	2014-05-14 11:54:50 -07:00
Nick Winter	57f3846abb	Merge pull request #998 from gosnat/patch-7 ... Update thang.coffee	2014-05-14 11:54:46 -07:00
Scott Erickson	7a381df348	Merge branch 'feature/thangload'	2014-05-14 11:48:19 -07:00
Michael Schmatz	b11112c0aa	Merge pull request #1001 from codecombat/transpiledCode ... Include transpiled code in submission process	2014-05-14 11:43:53 -07:00
Michael Schmatz	a1360d6cb8	Include transpiled code in submission process	2014-05-14 11:42:15 -07:00
Scott Erickson	09fbfdb360	Fixed a bug with the simulator due to the changes made to the supermodel.	2014-05-14 11:13:36 -07:00
Michael Schmatz	19a637aaa4	Open candidates in new tab	2014-05-14 10:37:16 -07:00
Scott Erickson	0be813e424	Figured out how to get the world to properly get shown if the world is created before the level loader is completely finished.	2014-05-14 10:35:16 -07:00
Michael Schmatz	9f9d651b3b	Updates to transpile script and updated aetherOptions	2014-05-14 10:14:18 -07:00
Scott Erickson	cab1adf8fc	Merge branch 'master' into feature/thangload	2014-05-14 09:31:59 -07:00
Scott Erickson	54af58baee	SuperModel no longer emits progress going backward ever, and added a way to prevent it from getting to high in the middle of a chain of loading.	2014-05-14 09:24:52 -07:00
Scott Erickson	4b404ae124	Finished tuning the supermodel loading and progress.	2014-05-13 14:39:45 -07:00
Nick Winter	ab37646cb6	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-13 11:04:20 -07:00
Nick Winter	53870a89a5	Python allowed, and better support for transpile errors.	2014-05-13 11:04:04 -07:00
Scott Erickson	b4ad34eb8f	LevelLoader only builds and loads thang types in the world on the first frame, letting everything else happen lazily.	2014-05-13 10:51:55 -07:00
Michael Schmatz	961fea7d5c	Update level session schema	2014-05-13 10:49:02 -07:00
gosnat	12f351197d	Update world.coffee ... add getGoalState	2014-05-13 12:43:39 -05:00
gosnat	72b2c84705	Update thang.coffee ... add getGoalState	2014-05-13 12:42:48 -05:00
gosnat	25287e0298	Update GoalManager.coffee ... add getGoalState	2014-05-13 12:41:39 -05:00
Scott Erickson	66af855497	Merge branch 'master' into feature/thangload	2014-05-13 10:27:10 -07:00
Scott Erickson	1d88b6eefe	Most of the way there getting it to work with loading thang types dynamically throughout the play view.	2014-05-13 10:26:33 -07:00
Nick Winter	69dc96c7c8	Fixed Rank My Game on my matches.	2014-05-12 19:56:12 -07:00
Dominik Maier	bb562aba32	+ Overly lengtly comment changed.	2014-05-13 04:40:15 +02:00
Nick Winter	09bdc9bad9	Fixed initial team setting.	2014-05-12 19:39:16 -07:00
Dominik Maier	521bc31fa5	+ Created function for generating a reproducable seed out of user code - as using JSON.stringify is not garanteed to be the same on every browser for objects.	2014-05-13 04:32:29 +02:00
Dominik Maier	efa39ffcd9	+ Created function for generating a reproducable seed out of user code but it fails inside the web-worker	2014-05-13 04:18:56 +02:00
Dominik Maier	2807e83672	+ "Real" predictable random. Seed depends on usercode map.	2014-05-13 03:34:11 +02:00
Nick Winter	4a151d3b72	Improving #671.	2014-05-12 16:45:12 -07:00
Nick Winter	2eefdef191	Working on matching Surface paused state to the pause screen.	2014-05-12 15:54:07 -07:00
Nick Winter	78a0efac78	Fixed long words in Labels and empty GoldView.	2014-05-12 15:03:53 -07:00
Nick Winter	802889d115	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-12 13:28:51 -07:00
Nick Winter	1a5e30d5b5	Dynamic Canvas sizing.	2014-05-12 13:28:46 -07:00
Michael Schmatz	687872a97b	Moved debug cache onto main thread ... UI responsiveness greatly improved	2014-05-12 11:16:02 -07:00
Nick Winter	1aa72541ff	Merged master into feature/thangload.	2014-05-12 09:57:31 -07:00
Nick Winter	e1b35251a3	Fixed bug with playback ending early.	2014-05-12 08:35:46 -07:00
Nick Winter	714d17fd7f	Adding Clojure and Lua worker modes.	2014-05-11 22:52:43 -07:00
Nick Winter	0b5854765a	Adding Clojure and Lua as choosable languages.	2014-05-11 22:51:44 -07:00
Nick Winter	74ef9bc987	Experimental support for preloading worlds when we would have autocast if manual cast is on.	2014-05-11 17:42:32 -07:00
Nick Winter	8df3b01f9e	Merged world/lodash/aether breakup for world workers.	2014-05-10 18:52:55 -07:00
Nick Winter	1e18f0b42f	Merged God and Buddha, split out Angels, did a huge refactoring, fixed many bugs, and laid groundwork for preloading Worlds.	2014-05-10 18:24:50 -07:00
Scott Erickson	f1de2ca8d9	Brought the canvas size down again because it halves the FPS in Firefox at least.	2014-05-09 16:35:10 -07:00
Scott Erickson	504a904841	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-09 15:22:39 -07:00
Scott Erickson	7815951073	Split out aether from vendor.js. Should help #826.	2014-05-09 15:22:23 -07:00
Nick Winter	df88be1ab1	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-09 15:07:55 -07:00
Nick Winter	6040d3b225	Shouldn't use much CPU when totally paused on Surface.	2014-05-09 15:07:30 -07:00
Michael Schmatz	1bbd4e6c68	Fixed frame-related bug	2014-05-09 15:05:50 -07:00
Michael Schmatz	f05af0fbe7	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/assets/javascripts/workers/worker_world.js	2014-05-09 14:50:08 -07:00
Michael Schmatz	66cc427417	Forward simulation optimization	2014-05-09 14:48:43 -07:00
Nick Winter	a74d015d18	Fixed a couple minor bugs.	2014-05-09 14:30:33 -07:00
Nick Winter	589410ed8e	Merged master into feature/thangload.	2014-05-09 12:56:58 -07:00
Nick Winter	c4819c647c	Removed includeeFlow, since we're going to do it lazily with the debug worker.	2014-05-09 09:29:50 -07:00
Scott Erickson	0292be054e	I think this fixes #976. I believe the client was attempting to save components and systems it didn't have write access to, and that was gumming up the works. Not 100% sure though; reopen if it rears its ugly head once more.	2014-05-08 14:56:02 -07:00
Scott Erickson	3d51969757	Fixed the patch view loading.	2014-05-08 14:54:47 -07:00
Scott Erickson	9c3cefa457	Removed a couple logs I forgot about.	2014-05-08 14:28:18 -07:00
Scott Erickson	8072629534	Merged the bug fix which I did too.	2014-05-08 13:43:15 -07:00
Scott Erickson	57f11ff3ea	Fixed some bugs with the components tab.	2014-05-08 13:40:42 -07:00
Michael Schmatz	cb5ae5f2f6	Fix #983 ... We need a generic scrolling solution	2014-05-08 11:58:45 -07:00
Nick Winter	3819778bee	Updating everything to Aether 0.2.0.	2014-05-08 11:43:00 -07:00
Nick Winter	775a2a87e2	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-08 11:36:26 -07:00
Michael Schmatz	f0a873cf02	Fix #985 ... I can’t wait until Chrome has majority market share	2014-05-08 11:17:27 -07:00
Scott Erickson	1e938910ed	Couple bug fixes.	2014-05-08 11:10:22 -07:00
Scott Erickson	9a5c4b6ced	Merge remote-tracking branch 'origin/master'	2014-05-08 10:54:43 -07:00
Scott Erickson	e9fc3df7c1	Set up the versions modal to display changes between versions when you select two of them.	2014-05-08 10:54:39 -07:00
Michael Schmatz	9c58aef32b	Merged worker_debug and worker_world	2014-05-08 09:47:02 -07:00
Scott Erickson	ed222338e7	Fixed #892 by having the components tab reload whenever it's opened.	2014-05-07 16:24:13 -07:00
Nick Winter	f3c6745b29	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-07 15:37:49 -07:00
Michael Schmatz	4221fd55cb	Fixed #979	2014-05-07 13:56:10 -07:00
Michael Schmatz	ae213cc330	Fixed #982	2014-05-07 13:33:17 -07:00
Scott Erickson	c037ce14f2	Fixed #958. LevelLoader wasn't handling cached session objects passed in with the supermodel.	2014-05-07 13:28:42 -07:00
Michael Schmatz	7432112cba	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-07 11:37:04 -07:00
Michael Schmatz	7110f023f2	Merge branch 'feature/hover-debugger-performance' ... Conflicts: app/lib/God.coffee app/views/play/level/tome/spell_debug_view.coffee	2014-05-07 11:37:03 -07:00
Scott Erickson	09a47cc5d8	Fixed #951. The parser was removing the shadow shape but not the tween of the shadow.	2014-05-07 11:11:22 -07:00
Michael Schmatz	806b159aab	Fixed another off-by-one error	2014-05-07 10:20:22 -07:00
Michael Schmatz	6fd89f10b9	Fixed various debugger UI bugs	2014-05-07 10:03:49 -07:00
Michael Schmatz	4ef6548dad	Fixed array prototype alteration conflict	2014-05-07 09:34:37 -07:00
Nick Winter	0c30ec0c12	Some weird bugs I noticed with {me}.	2014-05-06 16:58:08 -07:00
Michael Schmatz	da575f8945	Refactored hover debugger is functional ... Still needs optimizations and a few bug fixes, but it’s better than the existing code existing to Nick	2014-05-06 15:07:06 -07:00
Scott Erickson	d62f04cf88	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-06 14:52:28 -07:00
Scott Erickson	c345a31d14	Merge branch 'PatchesLayoutInconsistency' of https://github.com/dpen2000/codecombat into dpen2000-PatchesLayoutInconsistency	2014-05-06 14:50:01 -07:00
dpen2000	4ff1e9a3a3	Make components' patches tab and systems' patches tab look consistent ... Mix of previous stylings with spacing at top and white background	2014-05-06 17:34:13 -04:00
Nick Winter	1f166406ac	Some new names.	2014-05-06 12:47:38 -07:00
Michael Schmatz	e8d26af985	Implemented caching and fixed off by one error	2014-05-06 11:36:46 -07:00
Scott Erickson	c58a27fcbf	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-06 11:21:15 -07:00
Scott Erickson	ffdf11133e	Merge branch 'SetReadOnlyChanges' of https://github.com/dpen2000/codecombat into dpen2000-SetReadOnlyChanges	2014-05-06 11:19:11 -07:00
Nick Winter	ca8d5c1f3b	Stop bobbing and more marks when world ended.	2014-05-06 11:02:53 -07:00
Michael Schmatz	dddd617a08	userCodeMap issues fixed ... Now beginning hooking up the UI	2014-05-06 10:06:32 -07:00
Nick Winter	2e6bec5454	Some fixes for my accidental merge of #970.	2014-05-06 09:49:04 -07:00
Nick Winter	1f3cc8a004	Merge branch 'master' of git://github.com/domenukk/codecombat	2014-05-06 08:00:39 -07:00
Nick Winter	09c8a99a9b	Merge branch 'patch-5' of git://github.com/gosnat/codecombat into gosnat-patch-5	2014-05-06 07:23:51 -07:00
Nick Winter	acccee33a3	Cleaner conditional init syntax.	2014-05-06 07:22:09 -07:00
Nick Winter	3e7edd8c61	Merge branch 'patch-4' of git://github.com/gosnat/codecombat into gosnat-patch-4	2014-05-06 07:18:26 -07:00
Nick Winter	9e40dcd2e3	Added a couple i18n tags.	2014-05-06 06:58:20 -07:00
Nick Winter	af5b878166	Fixed wizard setting things.	2014-05-06 06:56:14 -07:00
Roy Xue	03e5d1ca50	Merge pull request #1 from codecombat/master ... Update CodeCombat	2014-05-06 14:09:42 +08:00
Dominik Maier	6d244e8560	+ Merged Simulators	2014-05-06 05:07:34 +02:00
Nick Winter	81634190ef	Added i18n for translating specific articles now, too.	2014-05-05 19:14:38 -07:00
Dominik Maier	ad85bf5b77	Merge remote-tracking branch 'upstream/master'	2014-05-06 03:12:24 +02:00
Nick Winter	0f5ee67fe1	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-05 17:59:32 -07:00
Dominik Maier	c9bb488794	Created headless-client and an alternative implementation of god	2014-05-06 02:37:14 +02:00
Nick Winter	0e0ca785d9	Moved ready-to-rank logic to LevelSession where it can be shared across victory and multiplayer modals and My Matches tab.	2014-05-05 16:59:12 -07:00
Scott Erickson	056f081cdb	Merge branch 'anonNameCollide' of https://github.com/adi2412/codecombat into adi2412-anonNameCollide ... Conflicts: app/views/modal/signup_modal.coffee	2014-05-05 16:48:35 -07:00
Scott Erickson	8d67e28977	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-05 16:35:45 -07:00
Scott Erickson	684e61532a	Fixed a bug with the deltas library identifying conflicts between patches.	2014-05-05 16:35:26 -07:00
Nick Winter	82529c781b	Fixed some ladder home links.	2014-05-05 15:33:08 -07:00
Scott Erickson	8f9aea1b9b	Fixed the patches view.	2014-05-05 15:19:35 -07:00
Michael Schmatz	97f3694dbf	Basic backend functionality is there	2014-05-05 13:26:37 -07:00
gosnat	939509849c	Update GoalManager.coffee ... Justification: For a negative goal like saveThangs, let's say you have 5 thangs on the save list. As things stand, if you don't have a HowMany defined, then the number of needed deaths to fail is numNeeded = _.size(stateThangs) - Math.min((goal.howMany ? 1), _.size stateThangs) + 1 numNeeded = 5 - Math.min(1, 5) + 1 numNeeded = 5 So you would only fail the goal if all 5 thangs you were supposed to save died. This is contrary to the comment right above this line: # saveThangs: by default we would want to save all the Thangs, which means that we would want none of them to be "done" Therefore, I think it should be Math.max rather than Math.min. numNeeded = _.size(stateThangs) - Math.max((goal.howMany ? 1), _.size stateThangs) + 1 numNeeded = 5 - Math.max(1, 5) + 1 numNeeded = 1 So any of the Thangs on the save list dying is enough to fail the goal. As a double check, what if the level designer designated a HowMany of 5? numNeeded = _.size(stateThangs) - Math.max((goal.howMany ? 1), _.size stateThangs) + 1 numNeeded = 5 - Math.max(5, 5) + 1 numNeeded = 1 So this is consistent.	2014-05-05 14:08:41 -05:00
gosnat	93d117100a	Update GoalManager.coffee ... For compound goals like GetAllToLocation, you should continue adding to the existing list of thang states.	2014-05-05 13:22:57 -05:00
Roy Xue	2b2fea3092	Update zh.coffee	2014-05-05 21:33:01 +08:00
Vic___	e64ba30d33	Update zh-HANS.coffee	2014-05-05 20:05:57 +08:00
Nick Winter	b84a73cb8e	Don't need huge raster images full-size in the Treema.	2014-05-04 21:29:50 -07:00
Nick Winter	3b891e6628	Merge pull request #954 from marc-portier/master ... first translation contribution	2014-05-04 21:25:05 -07:00
Nick Winter	9dc66c1568	Merge pull request #961 from gosnat/patch-3 ... Update GoalManager.coffee	2014-05-04 21:12:50 -07:00
Roy Xue	fd3c008ca7	Update zh-HANS.coffee	2014-05-04 11:03:43 +08:00
gosnat	39b21da035	Update GoalManager.coffee ... I'd like to temporarily turn on console logging (lines 240 and 245) to take a peek at why numNeeded doesn't seem to be correct if howMany isn't defined.	2014-05-03 21:36:24 -05:00
Nick Winter	b6a53a83e7	Fixed issue with play button not turning into rewind.	2014-05-03 13:26:37 -07:00
Nick Winter	73222a1a98	Don't start drawing Surface until needed.	2014-05-03 09:13:26 -07:00
Nick Winter	fbf5f52228	Merge pull request #955 from benojan/patch-3 ... Update zh-WUU-HANT.coffee	2014-05-03 07:22:57 -07:00
Nick Winter	8fbe2dedfc	Propagated Wu name update.	2014-05-03 07:21:18 -07:00
Marc Portier	5212eca404	fixing typox - thx to @JasperDhaene	2014-05-03 16:04:08 +02:00
Marc Portier	f7b746c3ea	making case consistent - thx to @JasperDhaene	2014-05-03 16:01:17 +02:00
Marc Portier	add2944a28	ogre ==> ork and a serious spelling error	2014-05-03 15:59:16 +02:00
Benojan	8a11990e89	Update locale.coffee ... 巫师吴语->吴语 巫師吳語->吳語	2014-05-03 17:55:36 +08:00
Benojan	50d4078ade	Update zh-WUU-HANT.coffee ... translate others that was not translated.	2014-05-03 17:14:11 +08:00
Marc Portier	d348c6f333	translate space	2014-05-03 11:06:39 +02:00
Marc Portier	e1482280c3	first translation contribution	2014-05-03 08:23:36 +02:00
Nick Winter	90bbe0bf55	Moved modals down a bit; watch out, not sure why they were !important before.	2014-05-02 19:28:08 -07:00
Nick Winter	77adebe181	Fixed #893.	2014-05-02 18:53:18 -07:00
Scott Erickson	db9a82d58a	Merge branch 'feature/thangload' of https://github.com/codecombat/codecombat into feature/thangload	2014-05-02 17:03:53 -07:00
Scott Erickson	aee90c72bb	Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel.	2014-05-02 17:03:30 -07:00
Nick Winter	afbe5b063b	Fix HTML icon syntax in the Markdown.	2014-05-02 15:51:07 -07:00
Nick Winter	a04f74de8b	Implemented George's gold design.	2014-05-02 15:12:30 -07:00
Nick Winter	d54149d0f3	Reworked LevelView loading priorities to try to get world simulating earlier.	2014-05-02 12:32:41 -07:00
Nick Winter	e610ecb476	Propagated new i18n tags.	2014-05-02 11:02:48 -07:00
Nick Winter	9d45b22057	Added some i18n tags.	2014-05-02 11:00:30 -07:00
Scott Erickson	eacbf571c6	Merge branch 'master' into feature/thangload	2014-05-02 10:32:05 -07:00
Scott Erickson	06bc96d7d0	Set up the level loader to get thangtype names first, then load the thang types themselves so the world can be generated in parallel with thang type loading and rendering.	2014-05-02 10:31:20 -07:00
Nick Winter	ef036b409b	Merge pull request #930 from M-r-A/patch-1 ... Update ru.coffee	2014-05-02 09:58:55 -07:00
Nick Winter	3ac052a4a6	Merge branch 'benojan-patch-2'	2014-05-02 09:49:35 -07:00
Nick Winter	082a9d141a	Keeping Wu English stub.	2014-05-02 09:49:02 -07:00
Nick Winter	302cb78095	Added zh-WUU-HANS stubs.	2014-05-02 09:48:40 -07:00
Nick Winter	f92fd122c6	Integrating Wu as zh-WUU-HANS and zh-WUU-HANT; hacking on a fork of i18next to do so.	2014-05-02 09:46:00 -07:00
Scott Erickson	2952d7702c	Merge branch 'master' into feature/thangload ... Conflicts: app/lib/LevelLoader.coffee app/views/play/level_view.coffee	2014-05-02 08:20:03 -07:00
Scott Erickson	92687b17de	Merge branch 'master' into feature/thangload ... Conflicts: app/lib/LevelLoader.coffee app/views/play/level_view.coffee	2014-05-02 08:19:47 -07:00
Benojan	28a56c1c83	Create new language--the wuu-chinese ... Just for Wuu Chinese, including Shanghainese and such language in Zhejiang Province, China.	2014-05-02 19:19:21 +08:00
Benojan	770345f84d	Update zh.coffee	2014-05-02 16:09:13 +08:00
Nick Winter	ae31f90a25	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-01 17:41:10 -07:00
Nick Winter	9f18811701	Fixed logic for displaying runtime errors from last run based on code being the same as last cast.	2014-05-01 17:41:06 -07:00
Michael Schmatz	347292c985	Implemented save notes button	2014-05-01 17:36:49 -07:00
Michael Schmatz	9fb5826593	Scroll to candidate position while going back	2014-05-01 16:56:41 -07:00
Scott Erickson	26cafd2f19	Fixed #941. Actually it was no longer crashing probably because of the fix for #934, but there were still other bugs. Fixed it, and other bugs like it, particularly in the spectate view. Cleaned up a bit, too.	2014-05-01 16:38:27 -07:00
Michael Schmatz	717651d6ff	Progress on thang property serialization ... There is a bug where thang properties aren’t updated when simulating forward	2014-05-01 16:08:46 -07:00
Scott Erickson	3bc0c1710e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-05-01 15:45:00 -07:00
Scott Erickson	31c5890288	Fixed #934	2014-05-01 15:44:50 -07:00
Nick Winter	0f33bae1f1	Hid level done button better. Avoiding building wizard sprite when not needed.	2014-05-01 14:36:26 -07:00
Nick Winter	5376a42f94	Fixed serialization of tracked property arrays.	2014-05-01 13:23:14 -07:00
Nick Winter	bebe5a0620	Improved hover debugger tokenization specificity to not extend past end of line.	2014-05-01 11:18:20 -07:00
Michael Schmatz	c9ea301b29	Fixed various bugs with debug worker	2014-05-01 11:12:44 -07:00
Nick Winter	f7bdb7e840	Upgrades for teleportation imnterpolation performance, ACE search box styling.	2014-05-01 10:44:17 -07:00
Nick Winter	541a2756fd	Simulate properly even if Simulator Supermodel starts fully loaded.	2014-04-29 16:54:57 -07:00
Nick Winter	2f174691c5	Fixed #939.	2014-04-29 16:44:38 -07:00
Nick Winter	04d74fb76f	Fixed bug with scale not updating properly when paused.	2014-04-29 16:04:30 -07:00
Nick Winter	4ad7ebc95d	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-29 15:31:23 -07:00
Nick Winter	bea0589fad	Fixed #935.	2014-04-29 15:31:18 -07:00
Michael Schmatz	294570cb1b	Made it so that modal doesn't show if you've signed the contract	2014-04-29 15:30:28 -07:00
Nick Winter	eca35ce371	Several minor bugfixes, and enabled API protection on all levels by default.	2014-04-29 15:25:59 -07:00
Nick Winter	8a6bec9d40	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-29 15:25:39 -07:00
Michael Schmatz	546bd26328	Fixed login flow and user profile issue	2014-04-29 15:12:50 -07:00
Nick Winter	d3a21f4959	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-29 09:43:08 -07:00
gosnat	d0900870b2	Update play_view.coffee ... Fixed ID for harvest-time level (was pointing to find-the-spy)	2014-04-29 10:53:55 -05:00
Nick Winter	9fb549a394	Fixed Guide tabs cursor.	2014-04-29 08:46:57 -07:00
Nick Winter	2d057fa81f	Cursor: pointer on docs modal tabs.	2014-04-28 19:57:59 -07:00
Nick Winter	369ea8a00f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-28 19:09:04 -07:00
Nick Winter	aea49cc27f	Fixed bobbing.	2014-04-28 18:36:46 -07:00
Scott Erickson	bcad939eae	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-28 18:31:04 -07:00
Scott Erickson	57beb94b5c	Fixed a bug with the levelloader loading articles.	2014-04-28 18:30:47 -07:00
Nick Winter	40fbf336c2	Using new level loading sound.	2014-04-28 17:59:02 -07:00
Nick Winter	b954e70d85	Let's try 30 FPS. Fixed Surface destruction bug.	2014-04-28 17:06:43 -07:00
Nick Winter	0b947dbeee	Let's try 30 FPS for a while now.	2014-04-28 16:41:18 -07:00
Nick Winter	bd3c059c2a	Several performance improvements based on profiling.	2014-04-28 16:31:51 -07:00
Michael Schmatz	544cc62cdb	First steps towards hover debugger improvements	2014-04-28 15:05:54 -07:00
Scott Erickson	e5e146c3c1	Got rid of an extraneous log.	2014-04-28 14:59:51 -07:00
Scott Erickson	b9f4093b08	Set up the LevelLoader to load names instead of whole ThangTypes.	2014-04-28 14:58:58 -07:00
Nick Winter	7e16fa5bd6	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-28 14:01:43 -07:00
Nick Winter	6d75b5593a	Fixed bug with pointer animation.	2014-04-28 14:01:33 -07:00
Scott Erickson	3a28f190a1	Merge branch 'master' into feature/loading-views	2014-04-28 11:55:17 -07:00
Scott Erickson	6f2e309d6d	Added one last resource name.	2014-04-28 11:53:57 -07:00
Scott Erickson	02a74ae40c	Migrated and fixed the rest of the views using the new loading system.	2014-04-28 11:52:04 -07:00
Scott Erickson	8164c6881c	Fixed a patches resource name.	2014-04-28 11:10:27 -07:00
Scott Erickson	01f2a556f9	Set up the patches view with the new loading system, fixing a few things in the meanwhile.	2014-04-28 11:09:21 -07:00
Nick Winter	4a2f2700bc	Don't show tutorial level link if tutorial level doesn't exist for a ladder level.	2014-04-28 10:54:03 -07:00
Scott Erickson	17a0bf54c6	Merge branch 'master' into feature/loading-views	2014-04-28 10:10:57 -07:00
Alexei Nikitin	d82c62f4e6	Update ru.coffee ... I am extremely dissatisfied the support of CodeCombat internationalization by programmers. Make changes to the requirements of the new code; it must be completely covered by the i18n tags reflected in en.coffee.	2014-04-28 09:23:56 -07:00
dpen2000	0a8ec096f7	Make components read only for anonymous users	2014-04-28 02:03:08 -04:00
dpen2000	3165a2b654	Change all lines setting readonly from being admin only to being authenticated only	2014-04-28 02:03:08 -04:00
Nick Winter	0de5e715c7	Double-checked i18n propagation.	2014-04-27 20:28:53 -07:00
Nick Winter	d245dfd34c	Merge pull request #915 from dpen2000/HideCreateComponentsSystems ... Hide Create New System/Component links in menus from non-admins	2014-04-27 20:25:06 -07:00
Nick Winter	8cb8c63f21	Fixed merge conflicts in uk.coffee.	2014-04-27 20:23:13 -07:00
Nick Winter	c1637fe37a	Fixed merge conflicts in es-419.coffee.	2014-04-27 20:19:05 -07:00
Nick Winter	3e3611e57d	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-27 20:14:12 -07:00
Nick Winter	938a2bca1d	Merge pull request #900 from julycoolwind/patch4 ... Translate items under multiplayer_launch	2014-04-27 20:13:27 -07:00
Nick Winter	e65202434b	Merge pull request #890 from treby/update_ja_resource ... Update ja resource.	2014-04-27 20:12:14 -07:00
Nick Winter	fc6ad1dd01	Properly tracking first-frame team gold. Slightly more visible team gold on hover.	2014-04-27 20:11:11 -07:00
Nick Winter	a7179ae3b2	Fixed some more gold view stuff.	2014-04-27 15:33:16 -07:00
Nick Winter	2ec225b0d0	Enabled API protection for Find the Spy.	2014-04-27 14:30:32 -07:00
Nick Winter	dac4f05fd9	Improved legibility of gold font. Moved Done button to not conflict with gold display.	2014-04-27 14:19:39 -07:00
Nick Winter	d542898663	Fixed indentation / commenting on a few lines from #924.	2014-04-27 09:40:43 -07:00
belian	75f37864da	Update fr.coffee ... New update for "fr.coffee"	2014-04-27 11:52:55 +02:00
Nick Winter	fa0e7f04f7	Fixed a thing.	2014-04-26 14:21:26 -07:00
Scott Erickson	fed5d681f2	Merge branch 'master' into feature/loading-views	2014-04-26 12:54:37 -07:00
Scott Erickson	14cffc5875	Did some refactoring to simplify using SuperModel and registering models and collections.	2014-04-26 12:54:03 -07:00
Scott Erickson	d5bcec5ad0	Fixed the level editor with the new loading system.	2014-04-25 19:11:32 -07:00
Nick Winter	834c27bbd7	Show spell palette for Thangs with apiProperties that aren't programmable.	2014-04-25 16:57:42 -07:00
Scott Erickson	14d62915f4	Got projection and backups set back up, partially fixed the level editor.	2014-04-25 16:14:05 -07:00
Scott Erickson	9a2311e792	Removed logic for dynamically finding referenced models.	2014-04-25 15:33:57 -07:00
Scott Erickson	6cd7c723d8	Fixed up showing errors, made sure they work with the play view.	2014-04-25 15:31:38 -07:00
Nick Winter	d8d2a57c38	Listed a few new levels.	2014-04-25 15:00:46 -07:00
Scott Erickson	7640a6365b	Removed some logs.	2014-04-25 14:59:17 -07:00
Scott Erickson	3dc3f62473	Merge branch 'master' into feature/loading-views ... Conflicts: app/views/editor/components/main.coffee	2014-04-25 14:31:58 -07:00
Scott Erickson	278d6752c3	Refactored SuperModel, CocoModel and LevelLoader. ... Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader. Simplified SuperModel.	2014-04-25 14:30:06 -07:00
Nick Winter	2ff97c3bcd	I guess emails might not be there.	2014-04-25 10:55:37 -07:00
Nick Winter	183fe9c496	Code review of 97d3b6.	2014-04-25 10:46:43 -07:00
Michael Schmatz	abe07e6395	Potential popup blocker fix	2014-04-25 09:17:04 -07:00
Michael Schmatz	97d3b6107d	Merge feature/linkedin into master	2014-04-25 08:47:31 -07:00
Michael Schmatz	61458c97d6	Fixed jqxhr error display	2014-04-25 07:50:29 -07:00
Michael Schmatz	0dbcc861bf	Various tweaks to employer signup	2014-04-25 07:48:59 -07:00
Michael Schmatz	4f6f845c2d	Employer signup works	2014-04-24 17:36:07 -07:00
dpen2000	69b3fe4b8c	Hide Create New System/Create New Component links in menus from non-admins	2014-04-24 19:24:08 -04:00
Michael Schmatz	6644c6a9ee	Push for george	2014-04-24 15:27:37 -07:00
Nick Winter	0975a86345	Propagated i18n.	2014-04-24 14:32:56 -07:00
Nick Winter	8a42521cd0	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-24 14:31:54 -07:00
Nick Winter	2a2ddd068e	Separate isSelectable from inThangList. Mouse wheel all the way in/out. bountyGold shows up as gold. Moved say Labels to mouth offset from aboveHead offset and obey sprite rotation. Don't link projects to example.com.	2014-04-24 14:23:15 -07:00
Scott Erickson	b7cb4696f0	Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection	2014-04-24 13:31:29 -07:00
Scott Erickson	2d43b36022	Merge branch 'FixGenericText' of https://github.com/dpen2000/codecombat into dpen2000-FixGenericText	2014-04-24 13:29:24 -07:00
Scott Erickson	e2c2657f34	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-24 13:23:40 -07:00
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	cfbd7b9b12	Fixed #911	2014-04-24 11:51:00 -07:00
Scott Erickson	8ab50205aa	Fixed more buttons in treema.	2014-04-24 11:50:49 -07:00
Scott Erickson	84d21490ab	Fixed some treema styling.	2014-04-24 11:38:30 -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
lordbam	8b9bc0c504	Update uk.coffee ... I have translated part of it. please check it for mistakes and add it to your page if all is alright. in few days i‘ll try to translate to the end	2014-04-24 17:25:11 +03: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
Nick Winter	d1ceec16bb	Propagated i18n tags, as reminded by #884.	2014-04-23 10:48:31 -07:00
Nick Winter	d4cf31c8fe	Improved admin view of pending candidates.	2014-04-23 10:21:58 -07:00
marianoluzza	0db33213f3	Update es-419.coffee ... Various sections translated	2014-04-23 13:44:13 -03:00
林鑫	de1eb3860a	Translate items under multiplayer_launch	2014-04-23 17:26:39 +08: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
Glen De Cauwsemaecker	afc447e596	Removed double got_questions i18n tag in en.coffee from commit e439e3f	2014-04-22 23:47:11 +02:00
Glen De Cauwsemaecker	7da89e8b00	Merge branch 'master' of https://github.com/JasperDhaene/codecombat into jasper-master	2014-04-22 23:44:50 +02: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
Scott Erickson	e8da248302	Made the level editor not break when using units that are incomplete.	2014-04-22 10:39:15 -07:00
Michael Schmatz	81809956b8	hasChangedSignificantly async refactor ... Still checking for bugs	2014-04-22 08:54:35 -07:00
treby	6937d656c7	Added translate contributor.	2014-04-22 08:55:00 +09:00
treby	4898ff78a1	Updated ja.coffee	2014-04-22 08:54:10 +09: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
Michael Schmatz	69ef951dba	Merge pull request #874 from dpen2000/FixSystemsListDeltaIssue ... Fix deltas referring to last system saved	2014-04-21 10:56:53 -07:00
JasperDhaene	e439e3fec8	added missing i18n tag	2014-04-21 19:56:38 +02:00
JasperDhaene	c49dc9457d	fixed some lines to fit proper context	2014-04-21 19:54:14 +02:00
JasperDhaene	4d7e6ba849	fixed some lines to fit proper context	2014-04-21 19:52:27 +02:00
JasperDhaene	6a1d43435a	fixed some lines to fit proper context	2014-04-21 19:50:43 +02:00
Michael Schmatz	486d1b75ff	Changed moar to More	2014-04-21 10:40:22 -07:00
Daniel	baff84f0ae	Update es-ES.coffee ... Hi! I have translated the remaining lines. I have not tested all the text yet in order to remove overflowing or cut off texts (I had to modify two lines to avoid a couple of linguistic bugs) but I hope to do it soon. Cheers!	2014-04-21 01:13:34 +02:00
Nick Winter	5e2f3ac7cb	Merge pull request #878 from JasperDhaene/master ... Update Dutch locale	2014-04-20 13:21:07 -07:00
JasperDhaene	ef9ee024e1	update nl-NL.coffee	2014-04-20 21:34:43 +02:00
JasperDhaene	ad212d428c	update nl-BE.coffee	2014-04-20 21:33:19 +02:00
JasperDhaene	6a03ddad74	Update nl.coffee	2014-04-20 21:31:11 +02:00
Nick Winter	6fa3d81fa1	Merged, fixed conflicts, restored rest of file.	2014-04-20 11:44:44 -07:00
Nick Winter	a829f3a537	Merge branch 'patch-2' of git://github.com/kinez/codecombat	2014-04-20 11:42:05 -07:00
Nick Winter	baca3876ca	Merge pull request #869 from treby/improve_ja_resources ... Updated for Japanese(ja).	2014-04-20 11:20:46 -07:00
Inez KEMENES	4a2bcc2030	Update hu.coffee	2014-04-20 19:04:07 +02:00
Nick Winter	f281aa8e2d	Fixed quotes.	2014-04-19 17:43:01 -07:00
Nick Winter	b806436232	Merge branch 'patch-3' of git://github.com/julycoolwind/codecombat into julycoolwind-patch-3	2014-04-19 17:40:58 -07:00
Nick Winter	0787349d32	Merge pull request #873 from dpen2000/patch-1 ... Modify links on community page	2014-04-19 17:38:20 -07:00
Nick Winter	4249ddce15	Merge pull request #868 from M-r-A/i18n ... Update ru	2014-04-19 17:34:34 -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
dpen2000	c241b06f76	Modify links on community page	2014-04-19 20:03:22 +01: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
林鑫	984f2c2cc4	Translate some items under common,account_settions,employers,play_level.	2014-04-19 23:22:03 +08:00
Alexei Nikitin	ac47a88c39	Update ru	2014-04-19 13:54:51 +04:00
treby	fb2bf865cd	Added some translation for Japanese.	2014-04-19 16:42:34 +09: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
Nick Winter	7186b414cf	Merge pull request #861 from onion7878/patch-1 ... Update zh-HANS.coffee	2014-04-18 17:49:55 -07:00
Michael Schmatz	a7867e5e2d	Added background linting ... Background hasChangedSignificantly is soon!	2014-04-18 14:59:08 -07:00
dpen2000	75b759b1dc	Add system names into delta messages	2014-04-18 17:25:25 -04: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	fced3e821a	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-18 13:02:11 -07:00
George Saines	71ee31ef49	styling the community page	2014-04-18 13:02:07 -07:00
Nick Winter	f38d17c64f	Protected candidates from view by employers they work(ed) at.	2014-04-18 12:48:13 -07:00
Nick Winter	a88089b7fc	Sass don't like that.	2014-04-18 09:54:27 -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	8adca4a1da	Added a transactional email for when changes are made, to notify watchers.	2014-04-17 17:30:55 -07: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