91 commits

Author	SHA1	Message	Date
Nick Winter	255cef83fb	Fixed #738.	2014-04-03 16:16:53 -07:00
Nick Winter	bfa71d01ff	Merged.	2014-04-01 10:31:22 -07:00
swapnesh	497563bc0a	Added more names for #53	2014-04-01 17:50:33 +05:30
Nick Winter	cb27124285	Fixed #135.	2014-03-30 17:24:07 -07:00
Nick Winter	b0a4a97ff1	Merged	2014-03-30 12:54:48 -07:00
Bia	53c20d3b9d	Added Thang names	2014-03-30 20:43:48 +01:00
Nick Winter	e08265a725	Merge pull request #730 from Darredevil/master ... Added setGoalState	2014-03-29 14:04:33 -07:00
Darredevil	c4de6ef996	Added setGoalState	2014-03-29 03:54:16 +02:00
Darredevil	0a969bb103	Added setGoalState	2014-03-29 03:53:19 +02:00
Darredevil	e060d4b73d	Added setGoalState	2014-03-29 03:52:02 +02:00
therealbond	7d03c2e520	Merge branch 'master' of https://github.com/therealbond/codecombat	2014-03-22 02:05:19 -04:00
therealbond	b2c500369b	Added more names for #53	2014-03-22 01:56:32 -04:00
Scott Erickson	37a9b7f319	Switching from the slow _.cloneDeep to the fast $.extend	2014-03-18 13:08:26 -07:00
Nick Winter	795bd8f63b	Moved Glen from Archmages to About.	2014-03-13 18:27:08 -07:00
Nick Winter	8b572f0647	Using isThang instead of instanceof Thang.	2014-03-13 17:59:17 -07:00
Nick Winter	4f9db0a7f7	Merged in all names.	2014-03-11 18:11:48 -07:00
Darredevil	012c25a817	Added GetALLToLocations and KeepALLFromLocations	2014-03-12 01:57:30 +02:00
Alexandru	5f2587da18	Merge remote-tracking branch 'upstream/master'	2014-03-12 01:38:54 +02:00
Alexandru	4552455284	Merge branch 'master' of https://github.com/Darredevil/codecombat	2014-03-12 01:23:55 +02:00
Sam Epps	11ca60765d	Added some additional names to names.coffee	2014-03-11 17:16:09 +01:00
Darredevil	c9a56048ca	Update GoalManager.coffee	2014-03-09 20:35:33 +02:00
Nick Winter	b6335a30ae	More fixes for empty string array serialization.	2014-03-06 16:32:13 -08:00
Nick Winter	40a32d7b43	Fixed array / string ThangState key serialization conflicts. Fixed #333.	2014-03-06 14:53:37 -08:00
Nick Winter	a03403de94	Started some more name categories.	2014-03-06 09:35:58 -08:00
Nick Winter	fddd210d34	Fixed Archer M names conflict.	2014-03-06 09:27:06 -08:00
iraladson	8d046c31b9	Update names.coffee ... "Added more names for #53	2014-03-05 14:06:29 -06:00
iraladson	7885b21b4b	Update names.coffee	2014-03-05 14:03:57 -06:00
Yos Riady	195b1941ea	Added even more names for #53	2014-03-05 02:53:54 +08:00
Finn	5b5af5a55a	Update names.coffee ... Added the name "Cid" under "Soldier M".	2014-02-28 12:06:26 +01:00
Darredevil	55ab142d75	Added more names for #53	2014-02-26 23:21:03 +02:00
Aidan Matzko	b69fe85134	Silly error names	2014-02-23 15:30:33 -05:00
Nick Winter	81d3702b49	Merge pull request #388 from jcvno/patch-1 ... Update names.coffee	2014-02-20 14:38:43 -08:00
Scott Erickson	6b2e0bc364	Changed how the goal manager handles arriving at goals and figuring out the how many requirement.	2014-02-20 11:43:35 -08:00
Justin Cano	059c50e47d	Update names.coffee	2014-02-19 03:03:43 -08:00
Nick Winter	af510c7cc7	60 FPS and support for independent world/surface frame rates.	2014-02-17 11:53:52 -08:00
Nick Winter	e3824d7698	Many improvements to the spell palette.	2014-02-16 15:30:00 -08:00
Scott Erickson	b8051689b3	Fixed the goal manager from polluting the goals in the level with the isPositive property.	2014-02-13 15:50:53 -08:00
Scott Erickson	23964abee9	Set up the goal manager to only use goals from the level.goals property, rather than from scripts.	2014-02-13 09:26:42 -08:00
Nick Winter	8a80b9770d	More work on docs. Got rid of Docs.coffee.	2014-02-12 18:54:45 -08:00
Nick Winter	d2345432ff	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-02-12 16:42:31 -08:00
Nick Winter	dc8c4394e1	Spell palette entries now using property docs from components.	2014-02-12 16:42:09 -08:00
Scott Erickson	8176e2258f	Set up the goal manager to use goals from the new level goals property, rather than from scripts. Backward-compatible for now.	2014-02-12 16:20:25 -08:00
Michael Schmatz	1a2fa68473	Merge branch 'feature/task-queue' ... Conflicts: app/views/play/level/tome/spell.coffee	2014-02-11 15:58:38 -08:00
Michael Schmatz	b29ab56fe2	Fixed simulation goals	2014-02-11 15:26:57 -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	74ddb1135a	Tweaked collision to make missiles not collide with one another.	2014-02-08 12:27:56 -08:00
Scott Erickson	72b1b989d8	Tweaked the world to return points that are not 0,0, as that's what the world reports non-existent thangs at.	2014-02-07 11:49:16 -08:00
Nick Winter	2a3e47b08f	Using playable team config from Alliance system.	2014-02-06 16:05:41 -08:00
Nick Winter	6af2d34f59	Fixed a ton of memory leaks, but not all of them.	2014-02-06 14:00:27 -08:00