Scott Erickson
|
8164c6881c
|
Fixed a patches resource name.
|
2014-04-28 11:10:27 -07:00 |
|
Scott Erickson
|
01f2a556f9
|
Set up the patches view with the new loading system, fixing a few things in the meanwhile.
|
2014-04-28 11:09:21 -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 |
|
Ting-Kuan
|
7321052c18
|
Fix supermodel with resource value and fix ladder view under supermodel resource management.
|
2014-04-19 13:06:47 -04:00 |
|
Ting-Kuan
|
692693c181
|
Merge branch 'master' into feature/loading-views
Conflicts:
app/locale/en.coffee
app/views/editor/level/edit.coffee
app/views/kinds/CocoView.coffee
app/views/play/ladder/ladder_tab.coffee
app/views/play/ladder_view.coffee
app/views/play/level/level_loading_view.coffee
|
2014-04-19 01:15:04 -04:00 |
|
Ting-Kuan
|
64f986c286
|
Remove dependency management in supermodel.
|
2014-04-17 22:16:29 -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 |
|
Scott Erickson
|
21e8d7b26f
|
Fixed patches denormalization.
|
2014-04-17 15:44:19 -07:00 |
|
Scott Erickson
|
cdaf2ebfaf
|
Set up the tabs and views in the level editor to reload so that when patches are applied, their changes are visible.
|
2014-04-17 14:23:33 -07:00 |
|
Ting-Kuan
|
8e19d8b71f
|
Change some resource loading logic to fit new SuperModel.
|
2014-04-13 13:29:43 -04:00 |
|
Scott Erickson
|
34bf484bf2
|
Added data merge conflict handling.
|
2014-04-11 21:11:52 -07:00 |
|
Scott Erickson
|
bbb9fb7a64
|
Added a patches view.
|
2014-04-11 14:19:17 -07:00 |
|