Commit Graph

4129 Commits

Author SHA1 Message Date
zilongshanren 31eee86bcd remove visible property 2017-04-24 17:43:33 +08:00
zilongshanren 6b121a2be5 improve fontFamily property 2017-04-24 17:32:15 +08:00
zilongshanren 9f7f1d48f3 add system font fontFamily support 2017-04-24 16:46:57 +08:00
Jare Guo 52c0e21d40 Merge pull request #1611 from zilongshanren/refactoring-modular-cocos2d
remove modular engine code
2017-04-24 14:49:23 +08:00
pandamicro c1492cf662 Merge pull request #1609 from pandamicro/domimage
Add dom image pool to reduce memory footprint
2017-04-24 14:43:29 +08:00
pandamicro f378a670c7 Use fixed size array in misc.imagePool 2017-04-24 14:18:34 +08:00
zilongshanren 9651447d8e remove useless try catch 2017-04-24 14:14:29 +08:00
pandamicro 1c4c8f9eac Merge pull request #1610 from pandamicro/actionmanager
Improve ActionManager detection
2017-04-24 14:09:17 +08:00
zilongshanren 15832966f9 remove modular.js 2017-04-24 14:04:28 +08:00
pandamicro 7dcbef1e85 Use !!cc.ActionManager to detect existence 2017-04-24 13:57:29 +08:00
zilongshanren 462714b70d remove modular engine code 2017-04-24 13:44:10 +08:00
pandamicro d5cb7bd2e5 Improve ActionManager detection 2017-04-24 10:43:12 +08:00
Jare Guo f43005fee2 Merge pull request #1608 from pandamicro/fix-unit
Fix unit test, audio not supported in test environment
2017-04-24 09:29:39 +08:00
pandamicro 3a7c704da1 Use isPhantomJS to detect test environment 2017-04-23 22:19:40 +08:00
pandamicro 4f5da96c26 Merge pull request #1607 from pandamicro/revert-action
Reverse pure JS Action, reuse JSB Action
2017-04-23 03:17:20 +08:00
pandamicro 65049d5ded Merge pull request #1606 from pandamicro/master
Remove Focus listener and fix event listener leak caused by anonymous…
2017-04-23 03:16:10 +08:00
pandamicro 2ba40ce428 Add dom image pool to reduce memory footprint 2017-04-22 17:05:01 +08:00
pandamicro 19b42a34ae Fix audio not supported in test environment 2017-04-22 16:01:24 +08:00
pandamicro 8a7e8ceabe Reverse pure JS Action, reuse JSB Action 2017-04-22 14:58:55 +08:00
pandamicro ad53286a3f Remove Focus listener and fix event listener leak caused by anonymous function 2017-04-22 12:23:34 +08:00
Jare Guo 0f88319d04 Merge pull request #1605 from 2youyou2/master
fixed unsupported grammar
2017-04-21 16:09:40 +08:00
2youyouo2 2218f7c3e1 fixed unsupported grammar 2017-04-21 16:06:07 +08:00
Wang Nan 83032156e4 Merge pull request #1601 from nantas/master
fix sprite edge crop issue
2017-04-19 16:09:38 +08:00
Nan Wang 7708b69ef2 fix sprite edge crop issue 2017-04-19 16:08:30 +08:00
Wang Nan 82f5c21ecd Merge pull request #1600 from jareguo/master
fix JSB: ReferenceError: __extends is not defined
2017-04-19 14:35:24 +08:00
Jare Guo 4b8bc8fe8f fix JSB: ReferenceError: __extends is not defined 2017-04-19 14:33:36 +08:00
Jare Guo 561c5643d3 Merge pull request #1598 from knoxHuang/master
fix cocos-creator/fireball/issues/5585
2017-04-19 10:21:51 +08:00
knoxHuang 66069604b1 fix cocos-creator/fireball/issues/5585 2017-04-19 10:17:54 +08:00
Jare Guo 00947c6afe Merge pull request #1599 from 2youyou2/camera
add warn info for camera
2017-04-19 09:55:30 +08:00
2youyouo2 10d1498a95 refine camera 2017-04-19 09:54:18 +08:00
Wang Nan a2e8ae00da Merge pull request #1597 from 2youyou2/physics
Physics
2017-04-19 09:51:37 +08:00
Wang Nan f21f171d4d Merge pull request #1596 from jareguo/master
修复原生平台使用 BitmapFont/LabelAtlas 字体的场景延迟加载会闪退的 bug
2017-04-19 09:47:34 +08:00
2youyouo2 bfc6fa87ab add warn info for camera 2017-04-18 18:00:18 +08:00
Wang Nan 3f423788d7 Merge pull request #1595 from 2youyou2/matrix_stack
update stack when do operation to matrix stack
2017-04-18 17:32:47 +08:00
2youyouo2 586e59bc68 add api doc for physics 2017-04-18 17:32:33 +08:00
2youyouo2 086b4ce4fa improve physics 2017-04-18 17:32:12 +08:00
Jare Guo d7cd74b782 no need to async load raw assets on JSB 2017-04-18 17:23:43 +08:00
Jare Guo ecb242f046 fix JSB crash of label when texture not loaded 2017-04-18 17:23:43 +08:00
Jare Guo 900d7236cf fix js_creator_Scale9SpriteV2_setInsetTop : Error processing arguments 2017-04-18 17:23:43 +08:00
Wang Nan 50345cb4ca Merge pull request #1593 from knoxHuang/master
fix cocos-creator/fireball/issues/5484
2017-04-18 15:09:30 +08:00
2youyouo2 9fa2dc5e7e update stack when do operation to matrix stack 2017-04-18 15:08:46 +08:00
Wang Nan 31c890d065 Merge pull request #1588 from jareguo/master
fix global variable ‘j’
2017-04-18 11:06:54 +08:00
Wang Nan e645392cdf Merge pull request #1589 from zilongshanren/improve-toggle-component
Improve toggle component
2017-04-18 10:33:01 +08:00
knoxHuang 004abc3b66 fix cocos-creator/fireball/issues/5484 2017-04-18 09:18:03 +08:00
Jare Guo 2d69c0ca59 Merge pull request #1594 from zilongshanren/improve-bmfont-prompt
optimize bmfont error log info
2017-04-17 18:16:23 +08:00
zilongshanren 17298a4471 optimize bmfont error log info 2017-04-17 17:55:35 +08:00
zilongshanren 658a12e9ab update API docs 2017-04-17 16:51:32 +08:00
zilongshanren be4b8785e9 toggle group add toggleItems property 2017-04-17 16:46:58 +08:00
Jare Guo 457e454d3e Merge pull request #1592 from knoxHuang/master
fix mask onDisable err
2017-04-17 14:50:45 +08:00
knoxHuang 3cf5a8219a fix mask onDisable err 2017-04-17 14:44:51 +08:00