2429 commits

Author	SHA1	Message	Date
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
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
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
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
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