Scott Erickson 9406a8c920 Merge branch 'master' into feature/defaults		2014-08-28 17:58:58 -07:00
..
assets	Merged/tweaked GitHub login.	2014-08-26 08:37:11 -07:00
collections	Refactored the item equips view to limit items by slot and also moved the item name loading to the node class itself.	2014-08-28 11:24:45 -07:00
lib	Merge branch 'master' into feature/defaults	2014-08-28 17:58:58 -07:00
locale	Update pt-PT.coffee	2014-08-28 18:20:52 +01:00
models	Tweaked the level serialization, leaving in walkDefaults for now because there may still be some components that don't have defaults properly set up. Added a warn log for when this happens so it can be fixed.	2014-08-28 17:57:39 -07:00
schemas	Merge branch 'master' into feature/defaults	2014-08-28 17:58:58 -07:00
styles	Merge branch 'master' into feature/defaults	2014-08-28 15:26:04 -07:00
templates	Merge branch 'master' into feature/defaults	2014-08-28 15:26:04 -07:00
views	Merge branch 'master' into feature/defaults	2014-08-28 17:58:58 -07:00
application.coffee	Merge conflicts.	2014-08-26 09:53:04 -07:00
initialize.coffee	Merged conflicts.	2014-08-28 09:59:03 -07:00
Router.coffee	Fixed #828. Added many other minor refactorings.	2014-08-27 12:24:11 -07:00
treema-ext.coffee	Migrated to Treema's use of 'schema' as the raw schema property, and 'workingSchema' as the flattened, dereferenced schema.	2014-08-28 17:05:46 -07:00