186 commits

Author	SHA1	Message	Date
SHIYING	08a1668bcc	Bug fixed where ordering of thang names becomes undefined sometimes	2014-01-11 16:09:25 -05:00
SHIYING	ae67a9dc23	Added comments and made code more readable	2014-01-11 15:43:34 -05:00
SHIYING	00cdb1e5ad	Randomized naming for Thangs	2014-01-11 15:41:13 -05:00
Nick Winter	033e3a6c0b	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-10 17:04:21 -08:00
Nick Winter	2383d5dd3a	An improvement for containingString in #133.	2014-01-10 17:04:12 -08:00
Scott Erickson	1a3c6498e8	Built the thang editor colors tab.	2014-01-10 16:48:28 -08:00
Scott Erickson	2d5ca50e89	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-09 14:04:53 -08:00
Scott Erickson	3c3e38b585	Set up thang avatar views with the new db portraits.	2014-01-09 14:04:46 -08:00
Dman19993	6f094f0f38	Update names.coffee	2014-01-09 14:47:24 -06:00
Tavio	850313ca70	Update names.coffee	2014-01-09 18:00:39 -02:00
Scott Erickson	4e34b38c83	Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/views/play/level/hud_view.coffee	2014-01-09 11:05:51 -08:00
Scott Erickson	8077c62ceb	Set up talking portraits in the hud.	2014-01-09 11:04:22 -08:00
Nick Winter	e2414f7c5a	Hopefully fixed #106 by being super conservative about whether G+, FB, and Twitter can be loaded.	2014-01-09 10:49:34 -08:00
Scott Erickson	391207d00f	Fixes for unit portraits.	2014-01-08 22:30:00 -08:00
Scott Erickson	50beeb93bc	Merge branch 'production'	2014-01-08 14:59:49 -08:00
Scott Erickson	aab11ea5f7	Fixed logging in with facebook and google plus to not overwrite existing user settings.	2014-01-08 14:57:42 -08:00
Ronald Cheng	a717ee80fb	Add more peasant names, and soldiers cannot be both Will and William	2014-01-08 11:34:52 -08:00
Michael Schmatz	ee3841b32c	Merge pull request #110 from rhc2104/google-plus ... Make G+ button same size as other buttons	2014-01-08 05:56:31 -08:00
Ronald Cheng	3658d5ca3a	Make G+ button same size as other buttons ... The default G+ button size is slightly larger than the Facebook and Twitter buttons. Use the "medium" size to make the size even.	2014-01-08 02:15:52 -08:00
engstrom	21536794be	added peasant names	2014-01-07 20:59:43 -07:00
Tavio	07df7be1f4	Update names.coffee ... A few more names.	2014-01-08 00:26:16 -02:00
Tavio	32eaf4a891	Update names.coffee	2014-01-07 23:02:55 -02:00
Nick Winter	70cd16cee4	Fixing bug with application require for now. Shoutout for Firebase.	2014-01-06 23:45:33 -08:00
Nick Winter	845601ed96	No need for wallNameFor any more.	2014-01-06 19:07:13 -08:00
Scott Erickson	aeaeb84fe5	Fixed general articles showing up in the guides.	2014-01-06 18:03:17 -08:00
Scott Erickson	5a4de61999	Bug fix.	2014-01-06 17:56:34 -08:00
Scott Erickson	975a7453bd	Refactored initial User creation.	2014-01-06 17:45:35 -08:00
Scott Erickson	94cb6ea4e1	Fixed up the search optimization and installed thang portraits into the level editor.	2014-01-06 17:11:57 -08:00
Scott Erickson	fe984d7c73	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-01-06 15:36:50 -08:00
Scott Erickson	27e7b6c240	Tweaks for thang portraits.	2014-01-06 15:36:35 -08:00
Nick Winter	fa687c4c30	Increase infinite loop timeout wait slightly to bandage #81.	2014-01-06 12:47:50 -08:00
George Saines	7758ecc91b	Added additional names for units.	2014-01-06 11:06:03 -08:00
Tom Steinbrecher	d50c362286	Refactored ticker, fixed from all instances were using same ticker.	2014-01-05 01:05:03 -05:00
Tom Steinbrecher	b5bb1b13a1	Completed issue 48: Adds bobbing to thangs with 'bobs' property. ... Thangs with 'bobs' must also set 'bobSpeed' and 'bobHeight'	2014-01-04 22:51:53 -05:00
Mischa Lewis-Norelle	c35cd3437f	Added a bunch of names ... Added a bunch of names, will come up with more tomorrow and add them in the evening.	2014-01-03 23:28:09 -06:00
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00