Commit graph

5295 commits

Author SHA1 Message Date
Scott Erickson
cc04626a5a Fixed walls not updating when you edit them in the ThangsTabView. 2014-10-03 11:21:05 -07:00
Scott Erickson
3305a3d7db Added a way to set titles for RootViews. In development, titles show what RootView class you're looking at. 2014-10-03 10:45:01 -07:00
Scott Erickson
d65ade7a97 Couple teardown fixes. 2014-10-03 10:44:02 -07:00
Scott Erickson
df1c72d132 Fixed normalCanvas styling in the level editor. 2014-10-03 09:59:54 -07:00
Scott Erickson
ca9c387964 Fixed singular sprite animations frame ordering. 2014-10-03 09:51:07 -07:00
Scott Erickson
67bd01b397 Fixed a bug where SegmentedSprite would sometimes error out (particularly the door on death). 2014-10-03 09:36:47 -07:00
Scott Erickson
64acbe4580 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-03 09:11:12 -07:00
AbnerZheng
6f0d3fa6e3 Update zh-HANS.coffee
method是不是要统一成法术?  暂时翻译成了方法,如有出入,请告知。
2014-10-04 00:03:57 +08:00
Nick Winter
0c09a468c7 Fixed skipping through real-time playback to fire when the final goals are actually ready. 2014-10-02 17:49:14 -07:00
Scott Erickson
d02d58ed4e Improved the LayerAdapter to more accurately adjust its size downward if it renders a spritesheet, handle when a single thang is too large, and cancels in-progress async builds if a new one starts. 2014-10-02 17:38:50 -07:00
Nick Winter
3cdb8ff416 Fixed music defaulting to off while appearing on. Reordered The Second Kithmaze and New Sight on the dungeon map. 2014-10-02 17:21:06 -07:00
Matt Lott
6ee898eaec Bump sass-brunch to 1.7.2, add bless-brunch
Allows css file splitting to support IE9.  Later versions (up to 1.8.4)
of sass-brunch yield intermittent build hangs.
2014-10-02 17:03:53 -07:00
Scott Erickson
5bb1275cea Tweaked how movie clips are animated and copied from, sidestepping how adding children from movie clips removes them from the movie clips, and making inheritence fully recursive. 2014-10-02 16:55:03 -07:00
Scott Erickson
ca84721921 Added a play button to the thang type edit view, made the canvas taller, and now have selected nodes show bounds for the display object being displayed. 2014-10-02 16:54:58 -07:00
Scott Erickson
6bd6b2eea2 Tweaked when and how we shift the bounds of imported sprites. For things like Anya, especially Anya's attack, it wasn't working correctly. 2014-10-02 16:54:58 -07:00
Nick Winter
abf28c2c19 Fixed bug with world deserialization missing state batches. 2014-10-02 15:33:23 -07:00
Scott Erickson
987061cec6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-02 14:43:08 -07:00
George Saines
90be8a4ad3 moving the level dots to fit the dungeon world map 2014-10-02 14:36:26 -07:00
Nick Winter
3636f3d259 Messing with the scaling on the dungeon map. 2014-10-02 14:05:18 -07:00
Nick Winter
5c2b03d245 Propagated i18n. 2014-10-02 12:12:51 -07:00
Nick Winter
16ff8c6601 Reordered i18n in rough order of section importance. Deprecated employer/candidate pages for now and turned off candidate emails. 2014-10-02 12:10:24 -07:00
Nick Winter
ddc359cf10 Merge pull request #1636 from Imperadeiro98/patch-1
Update pt-PT.coffee
2014-10-02 12:10:12 -07:00
Imperadeiro98
9c97abe6d0 Update pt-PT.coffee 2014-10-02 19:39:23 +01:00
Nick Winter
62fa133075 Merge pull request #1612 from kaktycc/patch-1
Update ru.coffee
2014-10-02 11:25:50 -07:00
Nick Winter
47c4ab700a Propagated i18n. 2014-10-02 11:24:16 -07:00
Nick Winter
285264ceb4 Skip past hero selection if hero has already been selected. 2014-10-02 11:18:43 -07:00
Scott Erickson
e1e8945f9e Made sure all dots are invisible by default. 2014-10-02 10:50:05 -07:00
Scott Erickson
b1f4dc996d Fixed a handful of bugs with the thang editor and sprite animation. 2014-10-02 10:42:21 -07:00
Scott Erickson
e044a660eb Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-02 09:28:31 -07:00
Nick Winter
40b61c32f2 Linked iPad preview video from teacher's page. 2014-10-02 01:20:45 -07:00
Nick Winter
2491861d76 A few tweaks for the iPad app. 2014-10-01 22:02:52 -07:00
Nick Winter
d50a90171a Added new slot icons and dungeon map. 2014-10-01 18:17:21 -07:00
Nick Winter
36615ae39f Unlocked all levels again until we can figure out the achievement timing problems. 2014-10-01 17:02:04 -07:00
Scott Erickson
1b1bc4e95a Fixed adding thangs in the level editor, and moving them around. 2014-10-01 15:02:14 -07:00
Scott Erickson
e9222f34bd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-01 13:26:45 -07:00
Scott Erickson
3205821ee9 Got the level editor mostly working again. 2014-10-01 13:26:38 -07:00
Nick Winter
0290db9cd4 Starting to try to get iPad to work during real-time playback. 2014-10-01 12:08:14 -07:00
Matt Lott
511378465f Fix WebGL check in SpriteStage.js
This was breaking us on IE10.

Fixes #1620
2014-10-01 11:58:25 -07:00
Nick Winter
5dd7c3ffa1 Adding some iPad event publishing optimizations. Fixed #1623. 2014-10-01 10:58:19 -07:00
Nick Winter
b67d83b868 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-01 09:12:08 -07:00
Nick Winter
dce47f6570 Merge pull request #1611 from ClashTheBunny/patch-1
Rough translations of more phrases to Bulgarian
2014-10-01 09:11:59 -07:00
Nick Winter
3871b60ea7 Actually committing last of earned_achievement_handler fixes. 2014-10-01 08:50:07 -07:00
Nick Winter
4c1448e818 Merge pull request #1610 from enricpc/patch-2
Update ca.coffee
2014-09-30 22:10:07 -07:00
Nick Winter
cbad8d30da Merge pull request #1608 from Imperadeiro98/patch-1
Update pt-PT.coffee
2014-09-30 22:09:35 -07:00
AbnerZheng
74398c43f9 Update zh-HANS.coffee 2014-10-01 11:51:24 +08:00
Nick Winter
6e1d048bfd Can't brunch, even in production, with the new sass-brunch. 2014-09-30 19:57:36 -07:00
Nick Winter
8d37309de1 Several fixes for achievement recalculation. 2014-09-30 19:32:11 -07:00
Nick Winter
5c77e103f3 Fixed issues with achievements awarding awry. Fixed iPad auto-debug toggle. 2014-09-30 16:18:32 -07:00
Nick Winter
2611e441d7 Trying to standardize sass imports in an effort to test #1615, to no avail. 2014-09-30 16:17:54 -07:00
Scott Erickson
1dda6bfcfc Layed the view framework for a new hero victory modal. 2014-09-30 16:14:47 -07:00