10843 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Schmatz	60e0d59a66	Manually specified tv4 version to fix npm checksum error	2014-02-12 15:55:20 -08:00
Michael Schmatz	186a77e827	Merge pull request #366 from codecombat/master ... Merge master into production	2014-02-12 14:59:09 -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	abedd07b04	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-12 12:27:12 -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
Michael Schmatz	dae788905a	Merge pull request #362 from cassiocardoso/patch-1 ... Finished pt-BR translation.	2014-02-12 11:38:14 -08:00
Michael Schmatz	365810d302	Merge pull request #355 from LightAndLight/master ... Updated scripts/devSetup python scripts to natively support python2.7 or python3	2014-02-12 11:21:17 -08:00
Michael Schmatz	762a91e4db	Added check if node exists	2014-02-12 11:05:19 -08:00
Michael Schmatz	ab0ca272d0	Merge pull request #363 from codecombat/master ... Merge master into production	2014-02-12 10:21:25 -08:00
Cassio Cardoso	32db5244b5	Finished pt-BR translation.	2014-02-12 16:15:21 -02:00
Scott Erickson	59f0d8a93e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-12 09:55:35 -08:00
Scott Erickson	533069dba8	Fixed a bug with the goals.	2014-02-12 09:55:19 -08:00
Michael Schmatz	ad8a8e00e8	Merge pull request #354 from justin-/fix/diplomat-template ... Add indentation to fix template engine output	2014-02-12 09:09:24 -08:00
Michael Schmatz	a0b02c41fa	Merge pull request #351 from liyinkan/master ... Update Chinese (simplified)	2014-02-12 08:51:08 -08:00
Michael Schmatz	5c7a471667	Merge pull request #349 from cassiocardoso/patch-1 ... Update pt-BR.coffee	2014-02-12 08:47:30 -08:00
Michael Schmatz	6f91090a42	Merge pull request #359 from codecombat/master ... Merge master into production	2014-02-11 16:35:42 -08:00
Scott Erickson	bdbb1710eb	More memory fixes.	2014-02-11 16:09:44 -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
Nick Winter	6505064fb6	Slightly less aggressively preload workers.	2014-02-11 14:38:47 -08:00
Nick Winter	1097d56d50	Increased maxTranslation in box2d to fix arrow max speed limit problem.	2014-02-11 14:25:35 -08:00
Scott Erickson	b904e1f939	More memory fixes.	2014-02-11 14:24:06 -08:00
Scott Erickson	1b0c3fb236	Upgraded to CoffeeScript 1.7	2014-02-11 14:23:36 -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	47eeda5af4	More memory fixes.	2014-02-11 12:54:08 -08:00
Scott Erickson	7ddb97fa22	More memory fixes.	2014-02-11 12:32:12 -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	7ad6faa0c0	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-11 11:31:13 -08:00
Scott Erickson	8ff38a724d	Fixing some event tearing down.	2014-02-11 11:31:02 -08:00
Scott Erickson	21c93e85ed	Fixed a bug with tearing down angels.	2014-02-11 11:30:47 -08:00
Michael Schmatz	612a374b3f	Progress on simulator	2014-02-11 11:27:39 -08:00
Nick Winter	f9bb6de3ff	Typoooo	2014-02-11 09:33:35 -08:00
Nick Winter	c61e2496d8	Trying a faint gold coin noise when you kill something worth money.	2014-02-11 09:28:26 -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