442 commits

Author	SHA1	Message	Date
Scott Erickson	0a78368217	Refactored user authentication again. Now the user object is inserted into main.html, which was renamed from index.html so the express static middleware wouldn't serve it.	2014-04-02 13:12:24 -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	a319e183b6	Fixed a little mistake with user signup.	2014-03-31 14:02:15 -07:00
Nick Winter	389323953b	Fixed #180.	2014-03-31 13:56:13 -07:00
Nick Winter	cb27124285	Fixed #135.	2014-03-30 17:24:07 -07:00
Nick Winter	8df80ad1bc	Merged AKeeper's ru.coffee additions, taking into account M-r-A's suggestions.	2014-03-30 13:33:21 -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
Nick Winter	cf81d51a89	Fixed #46.	2014-03-28 15:23:12 -07:00
Nick Winter	62f2fe80c3	Updated CoordinateDisplay styles; fixed #10.	2014-03-28 11:55:24 -07:00
Nick Winter	127c4a4e0f	Refactored defaults for Aether's fancy options, and overriding them with query parameters. Reduced non-dev-mode script debug logging.	2014-03-27 13:36:33 -07:00
Scott Erickson	fae9034dfc	Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master ... Conflicts: app/models/SuperModel.coffee	2014-03-26 14:29:16 -07:00
Nick Winter	544070e578	Fix for infinite loop fix.	2014-03-26 12:34:45 -07:00
Nick Winter	515b8723a3	Simulator handles more errors.	2014-03-26 12:12:43 -07:00
Nick Winter	127eb3cef6	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-26 11:32:49 -07:00
Nick Winter	cab343b0b3	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-03-26 11:25:20 -07:00
Nick Winter	773df44b14	Added infinite loop handling to Simulator.	2014-03-26 11:25:05 -07:00
swapnesh	1118324b41	Migrate from .on, .once to .listenTo, .listenToOnce	2014-03-26 03:25:11 +05:30
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