Commit Graph

5950 Commits

Author SHA1 Message Date
pandamicro d30b5cb430 Merge pull request #2428 from fusijie/fixed_rename_handler
rename private handler.
2018-03-13 23:15:30 +08:00
pandamicro d20b228701 Merge pull request #2434 from pandamicro/next
Move CCTexture2D & CCSpriteFrame to assets
2018-03-13 17:56:20 +08:00
pandamicro 49fd994035 Move CCTexture2D & CCSpriteFrame to assets 2018-03-13 17:48:38 +08:00
pandamicro 06cb158d84 Merge pull request #2433 from pandamicro/next
Merge master to next
2018-03-13 17:02:12 +08:00
pandamicro ca08067c76 unse engine-dev in editor 2018-03-13 16:48:24 +08:00
pandamicro b531040ac4 Update licenses 2018-03-13 15:52:14 +08:00
pandamicro 8f21947979 Fix conflict 2018-03-13 15:27:44 +08:00
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
Jare Guo e551128150 Merge pull request #2431 from pandamicro/master
Merge v1.9 to master
2018-03-13 12:57:18 +08:00
pandamicro fd842b2743 Merge pull request #2432 from VisualSJ/master
The loading process should determine whether or not ‘cc.engine’ exists.
2018-03-13 12:03:34 +08:00
pandamicro 4e47017aa4 Merge branch 'v1.9' 2018-03-13 11:54:54 +08:00
VisualSJ 37ecfc334c The loading process should determine whether or not ‘cc.engine’ exists. 2018-03-13 11:44:50 +08:00
Jare Guo 3cbc2214f5 Merge pull request #2429 from pandamicro/next
Remove old deprecations
2018-03-13 10:32:03 +08:00
pandamicro d16559200f Remove old deprecations 2018-03-13 10:30:15 +08:00
Jare Guo 8b1fb5c2c8 Merge pull request #2430 from jareguo/v1.8
fix cc._throw
2018-03-12 22:31:59 +08:00
Jare Guo 803a84ab47 fix cc._throw 2018-03-12 22:22:44 +08:00
fusijie 79e6d4a033 rename private handler. 2018-03-12 18:14:22 +08:00
Jare Guo 79491571c8 Merge pull request #2427 from pandamicro/next
Refactor cc.isChildClassOf to cc.js.isChildClassOf
2018-03-12 18:10:03 +08:00
pandamicro ba05646469 Refactor cc.isChildClassOf to cc.js.isChildClassOf 2018-03-12 17:50:26 +08:00
pandamicro 813f960d79 Merge pull request #2426 from pandamicro/next
Update render engine 1.0.1 (Sort camera based on depth)
2018-03-12 17:16:02 +08:00
pandamicro 6e7719e46e Update render engine 1.0.1 2018-03-12 17:09:11 +08:00
pandamicro 7d8887a18a Merge pull request #2416 from 2youyou2/next
optimize camera
2018-03-12 16:28:08 +08:00
Jare Guo e61c8eeb3a Merge pull request #2421 from 2youyou2/v1.8
ensure play the right time after change animation time
2018-03-12 16:24:37 +08:00
pandamicro ede85ab0f1 Merge pull request #2425 from pandamicro/next
Fix Node API usage issue
2018-03-12 16:21:22 +08:00
yinkaile a87ade0047 refine code 2018-03-12 16:16:12 +08:00
pandamicro 666bf01611 Fix Node API usage issue 2018-03-12 16:16:02 +08:00
yinkaile 8705d6f4d5 fixed node cullingMask initialize 2018-03-12 15:59:49 +08:00
pandamicro c34e402390 Merge pull request #2422 from fusijie/fixed_rich_text
fixed richText
2018-03-12 15:41:47 +08:00
pandamicro 21e900805c Merge pull request #2423 from pandamicro/next
Readd getRotation / setRotation, provide more deprecation error
2018-03-12 15:40:29 +08:00
pandamicro 400d181e89 Fix getLocalZOrder usage in EventManager 2018-03-12 15:37:27 +08:00
pandamicro 8aa424b7d7 Readd getRotation / setRotation, provide more deprecation error 2018-03-12 15:36:57 +08:00
fusijie 7fb6b8af0c fixed richText 2018-03-12 15:31:51 +08:00
pandamicro 214096b56b Merge pull request #2420 from pandamicro/next
Add binary loader and improve text downloader
2018-03-12 15:05:34 +08:00
pandamicro d1ea69fc16 Add binary loader 2018-03-12 14:32:20 +08:00
pandamicro 0d68bec9ca Improve text downloader 2018-03-12 14:32:20 +08:00
yinkaile 1d8ec5affa refine code 2018-03-12 14:27:36 +08:00
Jare Guo 1fcc13cda4 Merge pull request #2418 from fusijie/add_private_node
add private node
2018-03-12 14:23:43 +08:00
yinkaile 4a1087e92d ensure play the right time after change animation time 2018-03-12 14:18:12 +08:00
fusijie e08db3ca2c add private node 2018-03-12 12:59:38 +08:00
pandamicro 310448090e Merge pull request #2417 from pandamicro/next
Cleanup Node APIs
2018-03-12 11:30:43 +08:00
yinkaile de77c38b2b change 'MAIN_CAMERA' to 'Main Camera' 2018-03-12 10:33:14 +08:00
Jare Guo 2f81128595 update readme 2018-03-12 10:32:07 +08:00
pandamicro 0882ff0143 Merge pull request #2419 from abzico/patch
Fix typos
2018-03-10 22:12:59 +08:00
Wasin Thonkaew 844f171f7a Fix typos 2018-03-10 07:19:12 +07:00
pandamicro b33aebe10b Add Node.setWorldPos 2018-03-09 18:28:12 +08:00
pandamicro 6d6e1206be Cleanup Node APIs 2018-03-09 18:27:56 +08:00
yinkaile efb8e24f23 revert code 2018-03-09 18:19:38 +08:00
yinkaile f441dba722 remove attachDebugDrawToCamera & detachDebugDrawFromCamera 2018-03-09 16:36:11 +08:00
yinkaile af5930f343 Merge branch 'next' of github.com:fireball-x/engine into next
# Conflicts:
#	cocos2d/core/renderer/render-component-walker.js
2018-03-09 16:14:54 +08:00
yinkaile 22a1e2994a 1. support camera sort
2. support camera culling mask with node group
3. add MAIN_CAMERA to Canvas
2018-03-09 16:12:00 +08:00