codecombat/app/models
Ruben Vereecken 3fd396974d Merge branch 'master' into achievements
Conflicts:
	app/views/DemoView.coffee
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
	server/users/User.coffee
2014-08-13 10:43:42 +02:00
..
Achievement.coffee Achievements are now i18n'able 2014-08-12 18:18:16 +02:00
Article.coffee Clean up mixed quotes 2014-07-01 12:23:22 +08:00
CocoModel.coffee Merge branch 'master' into achievements 2014-08-13 10:43:42 +02:00
EarnedAchievement.coffee Achievements are now i18n'able 2014-08-12 18:18:16 +02:00
File.coffee Clean up mixed quotes 2014-07-01 12:23:22 +08:00
Level.coffee Can now equip items added from inventory on the Surface side. Sorted out ThangTypes' Components schema defaults and ordering when serializing Levels. 2014-08-11 16:15:46 -07:00
LevelComponent.coffee Extended the LevelLoader to load thang types and components dynamically for hero levels. 2014-08-07 18:27:47 -07:00
LevelFeedback.coffee Clean up mixed quotes 2014-07-01 12:23:22 +08:00
LevelSession.coffee Worked in a lot of changes Scott proposed 2014-08-08 11:54:53 +02:00
LevelSystem.coffee Clean up mixed quotes 2014-07-01 12:23:22 +08:00
Patch.coffee Clean up mixed quotes 2014-07-01 12:23:22 +08:00
SuperModel.coffee Merge branch 'master' into achievements 2014-08-13 10:43:42 +02:00
ThangType.coffee Clean up mixed quotes 2014-07-01 12:23:22 +08:00
User.coffee Worked in a lot of changes Scott proposed 2014-08-08 11:54:53 +02:00
UserRemark.coffee Clean up mixed quotes 2014-07-01 12:23:22 +08:00