Commit Graph

155 Commits

Author SHA1 Message Date
pandamicro ed76cdae41 Refactor cc.Color to reduce memory usage 2017-01-22 17:34:22 +08:00
Jare Guo 321bf8c8a0 Merge commit 'a822f07fcb4fa5be2de898117dff95a1fe98d5a2' into v1.4 2017-01-12 15:16:07 +08:00
Jare Guo c4a1ec752f prompt dialog if user wants to nest prefabs 2016-12-28 17:28:48 +08:00
Nan Wang 4dea8e7a8a move all error logs to DebugInfos.js and only show error id in release build 2016-12-15 17:07:01 +08:00
Jare Guo 7f70be3516 Merge commit 'e248709cf2e84be9b6e56005ff15a550af230bd4'
# Conflicts:
#	cocos2d/core/platform/CCView.js
2016-12-08 17:50:26 +08:00
knoxHuang 55cfa7f7fb update hasEventListener for CCEventDispatcher 2016-12-06 16:30:13 +08:00
Jare Guo 5dc7735e0d optimize destruct operation by using eval 2016-11-24 18:29:38 +08:00
Jare Guo 08a6b31398 sync with changes of Editor.utils 2016-11-09 10:51:07 +08:00
Nan Wang 3c49921cfe merged v1.3 2016-11-07 15:21:06 +08:00
knoxHuang 3bd802f864 fix setSiblingIndex error for JSB for fireball/issues/4375 2016-10-27 15:00:24 +08:00
Jare Guo 8643cd15c9 optimize BaseNode._delaySort 2016-10-25 17:41:21 +08:00
2youyouo2 d5dd3c982c fixed convertToWorldSpace return value 2016-10-12 16:05:00 +08:00
Wang Nan 71b6a59046 Merge pull request #1140 from cocos-creator/v1.2
merge V1.2
2016-09-22 14:13:42 +08:00
Nan Wang 2bc9381eb6 Merge branch 'v1.2' of github.com:cocos-creator/engine into v1.2 2016-09-19 18:03:55 +08:00
Nan Wang c5eceee5df fix node api typo 2016-09-19 14:27:46 +08:00
Jare Guo f5b79afd1e Merge pull request #1113 from pandamicro/v1.2
Fix convertToWorldSpace calculation issue
2016-09-13 18:15:48 +08:00
pandamicro 29f6f34216 Fix convertToWorldSpace calculation issue 2016-09-13 11:47:26 +08:00
Jare Guo 990acec751 Merge pull request #1118 from cocos-creator/v1.2
Sync V1.2
2016-09-13 10:59:07 +08:00
Jare Guo 26761ff2ec fix isRunning 2016-09-12 13:59:44 +08:00
Nan Wang 363a1f7d96 merge v1.2 2016-09-12 10:15:24 +08:00
Jare Guo 2f7025af0e remove non-existent property wrapper 2016-09-08 14:50:13 +08:00
pandamicro 4bdf2446c9 Fix cc.log issue 2016-09-07 09:52:06 +08:00
pandamicro 54e07aa6ac Fix cc.log issue in JSB 2016-09-05 17:50:40 +08:00
Nan Wang 6acbbe6373 merged v1.2 2016-09-05 12:06:47 +08:00
Wang Nan 62c86589e6 Merge pull request #1056 from jareguo/temp
synced prefab
2016-09-05 12:02:18 +08:00
knoxHuang fda6c98d8a fix tintTo and tintBy in the Simulator displays an error for fireball/issues/4137 2016-09-05 11:31:06 +08:00
Jare Guo 7c53c47b5f working on synced prefab 2016-09-03 16:56:39 +08:00
pandamicro a5a0e308a7 Upgrade API with v3.13 2016-09-01 10:53:03 +08:00
Jare Guo f92c3c6127 fix api 2016-08-14 13:54:35 +08:00
pandamicro 3b75a0ab9d Fix memory leak caused by event listener 2016-07-29 18:49:45 +08:00
Jare Guo 03af8f3be3 fix undo node.active 2016-07-28 13:51:55 +08:00
Nan Wang 1f7adb2c5c merge v1.1 fixes 2016-07-19 10:04:06 +08:00
Jare Guo ae11027272 should not reset arrivalOrder of cc.Node 2016-07-18 14:50:52 +08:00
pandamicro d39b6f8972 Merge pull request #895 from zilongshanren/improve-editbox-robust
fix jsb ECS hirarchy not change issue
2016-07-18 13:54:22 +08:00
Jare Guo 1b3dbc678f node._reorderChildDirty should not be serializable 2016-07-16 17:38:10 +08:00
pandamicro a06a9b7ff4 Merge pull request #900 from pandamicro/webgl
Upgrade WebGL Renderer with auto batching
2016-07-15 13:52:30 +08:00
Jare Guo 0b213b94c6 remove dirtyFlags from CCNode 2016-07-13 18:57:06 +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
zilongshanren ee59506580 fix jsb ECS hirarchy not change issue 2016-07-12 14:41:15 +08:00
Jare Guo ef436d9da4 deferred load scene's raw asset 2016-07-08 17:15:57 +08:00
Jare Guo 2a7a66c65e use __eventTargets to automate unregister Scene events (+1 squashed commit)
Squashed commits:
[f93e09b] fix unit test
2016-06-28 14:02:11 +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