Ting-Kuan
|
2e50d7b15d
|
Merge branch 'feature/Change-view-to-fit-new-supermodel' into feature/loading-views
Conflicts:
app/views/play/ladder/ladder_tab.coffee
app/views/play/ladder_view.coffee
|
2014-04-16 11:38:05 -04:00 |
|
Ting-Kuan
|
af399f4415
|
Merge branch 'master' into feature/loading-views
|
2014-04-15 13:34:20 -04:00 |
|
Nick Winter
|
8aa36178af
|
Fixed #769. Added some analytics timing tracking. Added replacement for $.browser.
|
2014-04-13 20:31:23 -07:00 |
|
Ting-Kuan
|
7ae3bd5a60
|
Fix style and supermodel based on #815.
Fix ladder_view and ladder_tab.
Change error handling functions in CocoView.
|
2014-04-12 16:29:49 -04:00 |
|
Scott Erickson
|
e3a1f170cf
|
Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader
Conflicts:
app/views/kinds/CocoView.coffee
app/views/play/level/level_loading_view.coffee
|
2014-04-11 11:19:16 -07:00 |
|
Ting-Kuan
|
a5e6496a7c
|
Make resources as static class to avoid loading multiple times.
Clean debug message.
|
2014-04-10 16:59:08 -04:00 |
|
Nick Winter
|
76054345d7
|
Fixed #805.
|
2014-04-09 09:04:59 -07:00 |
|
Scott Erickson
|
b6c9b6276c
|
Tweaked logging of sprite building.
|
2014-03-19 17:11:45 -07:00 |
|
Nick Winter
|
6c2a78c060
|
Show videos in HD if possible. Use ready state on level loader.
|
2014-03-17 05:52:19 -07:00 |
|
Scott Erickson
|
db4ae0cd2d
|
Made some tips show up more rarely.
|
2014-03-17 00:12:11 -07:00 |
|
Scott Erickson
|
7555dce172
|
Tweaked the loading page progress bar.
|
2014-03-17 00:05:45 -07:00 |
|
Scott Erickson
|
dc4252a94d
|
Moved the tips into the level loader screen and gave them i18n.
|
2014-03-16 22:01:21 -07:00 |
|
Nick Winter
|
9a64fb5dac
|
Work on /multiplayer modal.
|
2014-03-16 20:32:24 -07:00 |
|
Nick Winter
|
6db33fd967
|
Brawlwood protectAPI on!
|
2014-03-16 17:07:10 -07:00 |
|
Nick Winter
|
b2efb1bba5
|
More work on the loading view.
|
2014-03-14 19:44:19 -07:00 |
|
Nick Winter
|
efd0d82dea
|
Working on new loading view design.
|
2014-03-14 17:06:08 -07:00 |
|