Commit Graph

117 Commits

Author SHA1 Message Date
pandamicro a06a9b7ff4 Merge pull request #900 from pandamicro/webgl
Upgrade WebGL Renderer with auto batching
2016-07-15 13:52:30 +08:00
pandamicro c532c09eff Merge Cocos2d-html5 v3.12 webgl renderer 2016-07-12 16:33:51 +08:00
Jare Guo 6b21bb1400 fix unit test 2016-07-12 16:28:35 +08:00
Jare Guo ef436d9da4 deferred load scene's raw asset 2016-07-08 17:15:57 +08:00
Jare Guo c0585d676b use __eventTargets to automate unregister Scene events 2016-06-24 14:09:17 +08:00
Jare Guo 2c9f152867 fine tune the api doc 2016-06-24 10:59:02 +08:00
Jare Guo e0f3a36006 fix unit test 2016-06-23 18:43:00 +08:00
Jare Guo 1365de131a Merge pull request #823 from cocos-creator/v1.1
Sync V1.1
2016-06-23 18:03:49 +08:00
Jare Guo 47e6172766 optimize setPosition continuously 2016-06-22 23:52:52 +08:00
knoxHuang 12dffa3006 fix CCEventManager the event the wrong order 2016-06-22 16:22:12 +08:00
Jare Guo dd4465bfc7 Remove Node event parameter of 'position-changed' and 'size-changed' 2016-06-22 13:56:07 +08:00
Jare Guo fb5e1df331 DRY 2016-06-22 11:19:29 +08:00
Jare Guo 14d2dc6e4e should not redefine Node._id as non-writable 2016-06-22 10:48:21 +08:00
2youyouo2 df6407c894 refine code 2016-06-15 16:04:54 +08:00
2youyouo2 d00c6aa3c6 prevent '/' in node name 2016-06-15 15:13:58 +08:00
Jare Guo 335ece5eb4 sizeProvider should also be restored 2016-05-24 13:50:07 +08:00
Jare Guo 5f3aecb6a4 add type checking code for addChild 2016-05-20 10:30:15 +08:00
Nan Wang 017f573473 merge v1.0 2016-05-17 13:00:03 +08:00
Jare Guo d4f1eb6f68 Merge pull request #657 from pandamicro/v1.0
Fix setSiblingIndex and some code cleanup
2016-05-17 12:00:37 +08:00
pandamicro f4c86f906a Fix event order not changed in setSiblings and some code cleanup 2016-05-17 11:57:21 +08:00
Jare Guo 28e6ae187d Merge pull request #668 from jareguo/master
remove cc.sys.isNative in html5
2016-05-13 17:12:18 +08:00
Wang Nan 5d9ce5d57e Merge pull request #669 from cocos-creator/v1.0
merge V1.0
2016-05-13 13:45:01 +08:00
Jare Guo f8edcbe802 remove cc.sys.isNative in html5 2016-05-13 11:21:22 +08:00
Jare Guo 1ba10d8122 fix memory leak in JSB 2016-05-13 11:10:37 +08:00
Wang Nan a92d10babc Merge pull request #662 from zilongshanren/remove-all-events-on-node
improve emit event performance.
2016-05-12 16:16:38 +08:00
zilongshanren 3453d465be improve emit event performance.
1. remove unused event emit
2016-05-12 16:02:48 +08:00
Nan Wang 3e396e3080 merged v1.0 2016-05-11 17:29:17 +08:00
Jare Guo 6bc1cdae4d node's sibling index should not changed if zIndex not changed 2016-05-11 13:42:55 +08:00
Jare Guo a99889f948 minor optimizations 2016-04-30 00:53:01 +08:00
Jare Guo 3f1b682d19 Merge commit '0d438a748a5aae594e29344fffe4ea040e235c81'
# Conflicts:
#	cocos2d/core/components/CCRendererInSG.js
#	cocos2d/core/load-pipeline/asset-table.js
#	cocos2d/tilemap/CCTiledMap.js
#	jsb/jsb-editbox.js
2016-04-27 10:01:06 +08:00
Jare Guo c1ab4182ac minor fix 2016-04-26 16:42:09 +08:00
Jare Guo 4b45975ed8 minor update 2016-04-25 14:34:07 +08:00
Jare Guo 8a11d50099 inline redundant type cheching function 2016-04-25 14:33:47 +08:00
Jare Guo 1b8fafc9cc turn on dead code optimization in building 2016-04-25 14:32:57 +08:00
Jare Guo c1dd1be57b optimize setColor and setOpacity 2016-04-25 14:10:15 +08:00
Jare Guo 3265e632e6 disallow ignoreAnchorPointForPosition in render tree to avoid rotation bug can not fixed in JSB 2016-04-20 01:15:09 +08:00
Jare Guo 98cc058392 support the live reloading of undo history 2016-04-17 14:21:58 +08:00
Jare Guo 0037498571 transform should be computed immediately in canvas mode 2016-04-12 14:13:18 +08:00
Jare Guo 9facb9a14f inline unused method in base-node 2016-04-08 17:29:49 +08:00
Wang Nan e49a359b2c Merge pull request #565 from cocos-creator/v1.0
V1.0
2016-04-05 09:55:19 +08:00
Jare Guo 38256cc062 transform should be computed immediately in canvas mode 2016-03-29 17:43:57 +08:00
pandamicro b8f97a1a02 Improved logic of Node sortAllChildren 2016-03-28 20:23:14 +08:00
pandamicro aab8562bdd Remove re-added deprecated properties of Node 2016-03-28 19:35:48 +08:00
pandamicro 850d921fae Fix children no reordered after zIndex and sibling index change in Node 2016-03-28 19:26:40 +08:00
knoxHuang dd7e228c34 update Node and Component API 2016-03-24 17:14:06 +08:00
Jare Guo 965c0bffbd fix removeSgNode on JSB 2016-03-18 11:07:35 +08:00
pandamicro e009eb0fc2 Detect existing persist node by uuid 2016-03-17 11:37:21 +08:00
Jare Guo d423ebeacf export uuid for persist root node 2016-03-15 20:30:11 +08:00
pandamicro 1d8a6f29e0 Refactor cc.Macro to cc.macro 2016-03-14 11:49:03 +08:00
pandamicro 8306801243 Modulize event-manager, renderer and clean up core 2016-03-14 11:49:03 +08:00