24 commits

Author	SHA1	Message	Date
Scott Erickson	3dc3f62473	Merge branch 'master' into feature/loading-views ... Conflicts: app/views/editor/components/main.coffee	2014-04-25 14:31:58 -07:00
Scott Erickson	278d6752c3	Refactored SuperModel, CocoModel and LevelLoader. ... Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader. Simplified SuperModel.	2014-04-25 14:30:06 -07:00
Scott Erickson	9c8841e838	Merge remote-tracking branch 'origin/master'	2014-04-22 16:42:50 -07:00
Scott Erickson	5921575a02	Hack to fix a bug with the components view in the thang editor.	2014-04-22 16:42:41 -07:00
Nick Winter	675db1b76f	Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents.	2014-04-22 11:11:08 -07:00
Ting-Kuan	75224e0cd9	hideLoading on ThangEditView and ComponentConfigView.	2014-04-17 22:41:07 -04:00
Ting-Kuan	69fe4428e4	Before merge to master.	2014-04-17 19:52:09 -04:00
Ting-Kuan	a5e2069d60	Move onLoaded logic from CocoView to ChildrenView. Prevent level_loading_view being unveiled before game starts.	2014-04-17 19:37:31 -04:00
Ting-Kuan	c53eb562a3	Remove debug msg.	2014-04-16 02:31:18 -04:00
Ting-Kuan	52a73ceae3	Migrate view to fit new supermodel.	2014-04-16 02:28:59 -04:00
Ting-Kuan	8e19d8b71f	Change some resource loading logic to fit new SuperModel.	2014-04-13 13:29:43 -04:00
Scott Erickson	30f785f7cf	Moved the model schemas into a models folder.	2014-04-12 10:51:02 -07:00
Aditya Raisinghani	6fb5b59a01	Refactored schemas to be in /app	2014-04-12 14:33:55 +05:30
Nick Winter	ba3c4af536	Fixed last piece of #673.	2014-04-01 10:51:03 -07:00
Ting-Kuan	e076440d1b	Move Noty to vendor folder.	2014-04-01 02:41:04 -04:00
Ting-Kuan	085d181ed3	Use Noty to produce warning message while adding component with not added system.	2014-04-01 00:47:50 -04: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
Ting-Kuan	0db309f526	Select dependents when a extant component is selected.	2014-03-21 12:19:47 -04:00
Scott Erickson	74e068af0b	Fixed some bugs from the migration from _.cloneDeep to $.extend	2014-03-18 13:47:51 -07:00
Scott Erickson	37a9b7f319	Switching from the slow _.cloneDeep to the fast $.extend	2014-03-18 13:08:26 -07:00
Nick Winter	6e47416d24	Fixed some level IDs.	2014-03-06 19:09:15 -08:00
Scott Erickson	4ff2abc4b0	Refactored a collection into its own file.	2014-01-22 17:38:22 -08:00
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00