419 commits

Author	SHA1	Message	Date
kgy01	29aad01697	hide Arrow and Spear if buried use ['Arrow', 'Spear'] for condition	2014-03-25 08:48:26 -04:00
kgy01	a420064bc1	hide spear's shadow if buried	2014-03-25 08:31:38 -04:00
kgy01	3cc422a281	Merge remote-tracking branch 'upstream/master'	2014-03-25 08:10:30 -04:00
kgy01	c48863fae6	Hide arrow's shadow if buried	2014-03-25 08:06:37 -04:00
Scott Erickson	2c329a256f	Removed all the setting properties to null in destroy methods that don't need them since destroy nullifies all properties.	2014-03-24 14:42:56 -07:00
Scott Erickson	e9b3db2eb9	Fixed destroy to not break stopListening, which uses off.	2014-03-24 14:27:10 -07:00
Scott Erickson	f55cef5ced	Merge branch 'migrateBBevents' of https://github.com/Shrihari/codecombat into Shrihari-migrateBBevents	2014-03-24 10:38:57 -07:00
Shrihari	0160538b44	More migrations	2014-03-24 22:28:34 +05:30
Shrihari	5845125b43	Migrate .on, .once - Fixed a small error	2014-03-24 12:32:29 +05:30
Shrihari	67f5270bfc	Migrate .on, .once - Batch 1	2014-03-24 12:23:41 +05:30
Akaza Akari	3e4d7d745a	Script-based movement for all CocoSprites for #140	2014-03-23 23:19:18 -07:00
Nick Winter	dbeb3d445b	Give focus back to spell view on palette click.	2014-03-23 16:48:30 -07:00
Nick Winter	4a47c5b517	Dead Thangs sink down a bit in the layer order.	2014-03-23 16:21:36 -07:00
Nick Winter	9fbd008f59	Merge branch 'ItsLastDay-arrow'	2014-03-23 14:15:24 -07:00
Nick Winter	d85dd9f62c	Bringing in #664, but only when maximizesArc is on.	2014-03-23 14:15:06 -07:00
Mikhail Koltsov	13338afe3d	Now absolutely done scaling (#46) ... also commented math's out.	2014-03-23 23:51:46 +04:00
Mikhail Koltsov	446726acc9	done rotating, looks good in Zone of Danger (#46)	2014-03-23 22:13:07 +04:00
Scott Erickson	8ca5f23749	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-23 09:30:46 -07:00
Scott Erickson	72b88a3ee9	First pass on setting up gplus friends on the ladder page.	2014-03-23 09:30:01 -07:00
Mikhail Koltsov	edeeb3c3eb	some work on arrows	2014-03-23 20:21:11 +04:00
Nick Winter	eec46dcb48	Don't try to draw a grid if it's not going to work (no lands).	2014-03-22 14:28:18 -07:00
Nick Winter	808cf9280b	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-22 08:53:02 -07:00
Nick Winter	d289ca825e	Fixed Simulator to actually use protectAPI.	2014-03-22 08:52:47 -07: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
Nick Winter	9e4908ade2	A couple ladder tweaks.	2014-03-20 19:18:46 -07:00
Nick Winter	2f3c0b0cc6	Need updated Aether.	2014-03-20 10:43:24 -07:00
Nick Winter	9713f7d142	Merge branch 'arrow' of git://github.com/ItsLastDay/codecombat into ItsLastDay-arrow	2014-03-19 18:01:49 -07:00
Nick Winter	87f16f2550	Merge branch 'Shrihari-range-radii'	2014-03-19 17:17:05 -07:00
Nick Winter	fec8e34a78	Merged.	2014-03-19 17:16:48 -07:00
Scott Erickson	b6c9b6276c	Tweaked logging of sprite building.	2014-03-19 17:11:45 -07:00
Scott Erickson	74e068af0b	Fixed some bugs from the migration from _.cloneDeep to $.extend	2014-03-18 13:47:51 -07:00
Scott Erickson	a461a14d6e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-18 13:08:34 -07:00
Scott Erickson	37a9b7f319	Switching from the slow _.cloneDeep to the fast $.extend	2014-03-18 13:08:26 -07:00
Nick Winter	358d7fa181	Dont' need to load sessions, too.	2014-03-18 11:52:23 -07:00
Nick Winter	4355813d69	Don't throw away fully loaded supermodels in between simulations or refresh tabs when not looking at them.	2014-03-18 11:26:15 -07:00
Shrihari	ee76e41c78	Range radii - renamed few variales for clarity	2014-03-18 18:33:39 +05:30
Shrihari	8f5e8efce0	Range radii - Some cleanup	2014-03-18 18:22:26 +05:30
Shrihari	ea24ae2fd8	Range radii - Some cleanup	2014-03-18 18:13:38 +05:30
Shrihari	22af95e7b9	Added 4 fallback colors for extra ranges	2014-03-18 18:06:44 +05:30
Shrihari	b283757315	Refactored buildRadius() to work with any range radius	2014-03-18 17:39:16 +05:30
Mikhail Koltsov	97f9e548e2	added perspectivizion for arrows (issue #46)	2014-03-18 00:40:37 +04:00
Scott Erickson	564d267463	Removed a TODO.	2014-03-17 07:33:53 -07:00
Nick Winter	566c9e6c9d	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-16 21:48:37 -07:00
Nick Winter	b51f51f636	Fix for no Camera for creating Marks in the Thang Editor.	2014-03-16 21:48:28 -07:00
Scott Erickson	5a8d1b0a2b	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-16 21:43:21 -07:00
Scott Erickson	de34896a9a	Playback is now disabled during casting. Also cleaned out some remaining hover logic.	2014-03-16 21:43:14 -07:00
Nick Winter	af57e88a1a	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-16 21:33:50 -07:00
Nick Winter	f02f4e77d0	Improved next game routing and speed. Hid that catastrophically dangerous reset all games button.	2014-03-16 21:33:46 -07:00
Scott Erickson	17af4cec0c	Slight tweak.	2014-03-16 20:36:02 -07:00