From 74e537602a1ba41eb4cf5ad825fb4f44941bbd7b Mon Sep 17 00:00:00 2001 From: lihex Date: Sat, 15 Mar 2014 12:13:31 +0800 Subject: [PATCH 1/4] update submodule --- tools/cocos2d-console | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cocos2d-console b/tools/cocos2d-console index 67d0fd2ed7..e06b610aa7 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 67d0fd2ed79e5f7d52b797af897bf5cc23ef7994 +Subproject commit e06b610aa7bb1b5357f0700f1370ea64f9cb4b83 From 9bea14b70441d414eecad4fc264723416337cc3f Mon Sep 17 00:00:00 2001 From: dingpinglv Date: Mon, 17 Mar 2014 11:52:03 +0800 Subject: [PATCH 2/4] Fixed #191: add favicon.ico to the template --- templates/js-template-default/res/favicon.ico | Bin 0 -> 1029 bytes templates/js-template-runtime/res/favicon.ico | Bin 0 -> 1029 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 templates/js-template-default/res/favicon.ico create mode 100644 templates/js-template-runtime/res/favicon.ico diff --git a/templates/js-template-default/res/favicon.ico b/templates/js-template-default/res/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1ad6a0907b922eed9a030a5d6c0a3531416604fa GIT binary patch literal 1029 zcmZ?wbhEHb6krfw_|5&mGNC^% zGE!4ry)Y*yAvSi#)Tz@ZPmYU;(bm!`DJrrsH+QhN&(F(CPfLpk4-XFud-&kN&K)}z zE?6*q+O+G}uV1}-_44J*=g*%%bLPycQ>P9bIIwBcrkOKmPMkQgzP>&`KR+WQBPuE? zG&D3IAi%-F!N9;kT3T9MTwF{{Oh7<@o0}UPtD^)_A)o_N1xqu}IHUk?dA7KQ~KN0mHHB9#t5J#kb?r16VJ(h(sgm#$+bo<>KMj!IiJ85pK4 z2yApoWKb#OOla$souDSmRkA{0p`J&@rU{G>4#>Ops^}J7apyiSq-ns}B&>dEfpyN8 z3PmO%2M(dS7fT{PAM=wo$y+0#dHNu;yk+Eq8H^&V-LrH(HT^CWEIc<=D>x=#;v~*9 z{PH5A8Y?zDKQq~=Vot|QXJ_}m6I@aeCzKNy7zN@(4s--6Z))Zckx&p&YH8;XQIFcQ f;Ku_-79MUDl@l8l9&Q&@3k!%jx98`l1_o;Ym5cl# literal 0 HcmV?d00001 diff --git a/templates/js-template-runtime/res/favicon.ico b/templates/js-template-runtime/res/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1ad6a0907b922eed9a030a5d6c0a3531416604fa GIT binary patch literal 1029 zcmZ?wbhEHb6krfw_|5&mGNC^% zGE!4ry)Y*yAvSi#)Tz@ZPmYU;(bm!`DJrrsH+QhN&(F(CPfLpk4-XFud-&kN&K)}z zE?6*q+O+G}uV1}-_44J*=g*%%bLPycQ>P9bIIwBcrkOKmPMkQgzP>&`KR+WQBPuE? zG&D3IAi%-F!N9;kT3T9MTwF{{Oh7<@o0}UPtD^)_A)o_N1xqu}IHUk?dA7KQ~KN0mHHB9#t5J#kb?r16VJ(h(sgm#$+bo<>KMj!IiJ85pK4 z2yApoWKb#OOla$souDSmRkA{0p`J&@rU{G>4#>Ops^}J7apyiSq-ns}B&>dEfpyN8 z3PmO%2M(dS7fT{PAM=wo$y+0#dHNu;yk+Eq8H^&V-LrH(HT^CWEIc<=D>x=#;v~*9 z{PH5A8Y?zDKQq~=Vot|QXJ_}m6I@aeCzKNy7zN@(4s--6Z))Zckx&p&YH8;XQIFcQ f;Ku_-79MUDl@l8l9&Q&@3k!%jx98`l1_o;Ym5cl# literal 0 HcmV?d00001 From ed811f6e4e2dbe6b866e240079db3447ea6d2088 Mon Sep 17 00:00:00 2001 From: zhangbin Date: Mon, 17 Mar 2014 15:23:59 +0800 Subject: [PATCH 3/4] Update the reference of submodule "cocos2d-console". --- tools/cocos2d-console | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cocos2d-console b/tools/cocos2d-console index e06b610aa7..79fa77ec13 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit e06b610aa7bb1b5357f0700f1370ea64f9cb4b83 +Subproject commit 79fa77ec132d6037f35110bde66fb882d82eb0de From c62805722c56d18e0c6a7bc31632b1f4c172e56b Mon Sep 17 00:00:00 2001 From: pandamicro Date: Mon, 17 Mar 2014 16:34:33 +0800 Subject: [PATCH 4/4] Issue #4294: Make cc.Component extendable in JSB --- frameworks/js-bindings/bindings/script/jsb_cocos2d.js | 1 + tools/tojs/cocos2dx.ini | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frameworks/js-bindings/bindings/script/jsb_cocos2d.js b/frameworks/js-bindings/bindings/script/jsb_cocos2d.js index 65682e132b..3bfbc6c5e4 100644 --- a/frameworks/js-bindings/bindings/script/jsb_cocos2d.js +++ b/frameworks/js-bindings/bindings/script/jsb_cocos2d.js @@ -595,6 +595,7 @@ cc.MenuItemFont.extend = cc.Class.extend; cc.MenuItemToggle.extend = cc.Class.extend; cc.Scene.extend = cc.Class.extend; cc.DrawNode.extend = cc.Class.extend; +cc.Component.extend = cc.Class.extend; // Cocos2d-html5 supports multi scene resources preloading. // This is a compatible function for JSB. diff --git a/tools/tojs/cocos2dx.ini b/tools/tojs/cocos2dx.ini index 25197aac04..23c150427f 100644 --- a/tools/tojs/cocos2dx.ini +++ b/tools/tojs/cocos2dx.ini @@ -29,7 +29,7 @@ headers = %(cocosdir)s/cocos/2d/cocos2d.h %(cocosdir)s/cocos/audio/include/Simpl classes = New.* Sprite.* Scene Node.* Director Layer.* Menu.* Touch .*Action.* Move.* Rotate.* Blink.* Tint.* Sequence Repeat.* Fade.* Ease.* Scale.* Transition.* Spawn Animat.* Flip.* Delay.* Skew.* Jump.* Place.* Show.* Progress.* PointArray ToggleVisibility.* RemoveSelf Hide Particle.* Label.* Atlas.* TextureCache.* Texture2D Cardinal.* CatmullRom.* ParallaxNode TileMap.* TMX.* CallFunc RenderTexture GridAction Grid3DAction GridBase$ .+Grid Shaky3D Waves3D FlipX3D FlipY3D Speed ActionManager Set SimpleAudioEngine Scheduler Orbit.* Follow.* Bezier.* CardinalSpline.* Camera.* DrawNode .*3D$ Liquid$ Waves$ ShuffleTiles$ TurnOffTiles$ Split.* Twirl$ FileUtils$ GLProgram ShaderCache Application ClippingNode MotionStreak TextFieldTTF GLViewProtocol GLView Component ComponentContainer __NodeRGBA __LayerRGBA SAXParser Event(?!.*(Physics).*).* Device Configuration -classes_need_extend = Node Layer.* Sprite Menu MenuItem MenuItemFont MenuItemToggle Scene DrawNode +classes_need_extend = Node Layer.* Sprite Menu MenuItem MenuItemFont MenuItemToggle Scene DrawNode Component # what should we skip? in the format ClassName::[function function] # ClassName is a regular expression, but will be used like this: "^ClassName$" functions are also