From fcee230cab92c0bbd73c8a041f8c9e05c5115c03 Mon Sep 17 00:00:00 2001 From: Dhilan007 Date: Thu, 16 Oct 2014 13:56:03 +0800 Subject: [PATCH 1/5] Make resources output by Cocos Studio automatically packed into ipa --- templates/cpp-template-default/Resources/res/.gitkeep | 0 .../proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 templates/cpp-template-default/Resources/res/.gitkeep diff --git a/templates/cpp-template-default/Resources/res/.gitkeep b/templates/cpp-template-default/Resources/res/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj b/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj index 3ca78d1be6..2c92f2861c 100644 --- a/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj +++ b/templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj @@ -12,6 +12,8 @@ 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; }; + 3EACC98F19EE6D4300EB3C5E /* res in Resources */ = {isa = PBXBuildFile; fileRef = 3EACC98E19EE6D4300EB3C5E /* res */; }; + 3EACC99019EE6D4300EB3C5E /* res in Resources */ = {isa = PBXBuildFile; fileRef = 3EACC98E19EE6D4300EB3C5E /* res */; }; 46880B7B19C43A67006E1F66 /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 46880B7619C43A67006E1F66 /* CloseNormal.png */; }; 46880B7C19C43A67006E1F66 /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 46880B7619C43A67006E1F66 /* CloseNormal.png */; }; 46880B7D19C43A67006E1F66 /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 46880B7719C43A67006E1F66 /* CloseSelected.png */; }; @@ -102,6 +104,7 @@ 1D6058910D05DD3D006BFB54 /* HelloCpp iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloCpp iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + 3EACC98E19EE6D4300EB3C5E /* res */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "res"; sourceTree = ""; }; 46880B7619C43A67006E1F66 /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseNormal.png; sourceTree = ""; }; 46880B7719C43A67006E1F66 /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseSelected.png; sourceTree = ""; }; 46880B7919C43A67006E1F66 /* Marker Felt.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Marker Felt.ttf"; sourceTree = ""; }; @@ -263,6 +266,7 @@ 46880B7519C43A67006E1F66 /* Resources */ = { isa = PBXGroup; children = ( + 3EACC98E19EE6D4300EB3C5E /* res */, 46880B7619C43A67006E1F66 /* CloseNormal.png */, 46880B7719C43A67006E1F66 /* CloseSelected.png */, 46880B7819C43A67006E1F66 /* fonts */, @@ -452,6 +456,7 @@ 50EF62A217ECD613001EB2F8 /* Icon-29.png in Resources */, 50EF629617ECD46A001EB2F8 /* Icon-40.png in Resources */, 5087E78217EB970100C73F5D /* Icon-144.png in Resources */, + 3EACC98F19EE6D4300EB3C5E /* res in Resources */, 50EF629817ECD46A001EB2F8 /* Icon-80.png in Resources */, 5087E78417EB970100C73F5D /* Icon-57.png in Resources */, 5087E77E17EB970100C73F5D /* Default.png in Resources */, @@ -467,6 +472,7 @@ 46880B8219C43A67006E1F66 /* HelloWorld.png in Resources */, 46880B8019C43A67006E1F66 /* Marker Felt.ttf in Resources */, 503AE0F817EB97AB00D1A890 /* Icon.icns in Resources */, + 3EACC99019EE6D4300EB3C5E /* res in Resources */, 46880B7C19C43A67006E1F66 /* CloseNormal.png in Resources */, 46880B7E19C43A67006E1F66 /* CloseSelected.png in Resources */, ); From a6f0c1322c7a9f9974d913dd89c0bc7fc4e25f35 Mon Sep 17 00:00:00 2001 From: CocosRobot Date: Thu, 16 Oct 2014 06:02:13 +0000 Subject: [PATCH 2/5] [AUTO][ci skip]: updating cocos2dx_files.json --- templates/cocos2dx_files.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index d963748616..8242430264 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -4611,6 +4611,7 @@ "cocos/scripting/lua-bindings/auto/api/ArmatureDataManager.lua", "cocos/scripting/lua-bindings/auto/api/ArmatureDisplayData.lua", "cocos/scripting/lua-bindings/auto/api/AssetsManager.lua", + "cocos/scripting/lua-bindings/auto/api/AssetsManagerEx.lua", "cocos/scripting/lua-bindings/auto/api/AtlasNode.lua", "cocos/scripting/lua-bindings/auto/api/AttachNode.lua", "cocos/scripting/lua-bindings/auto/api/AudioEngine.lua", @@ -4699,6 +4700,7 @@ "cocos/scripting/lua-bindings/auto/api/EditBox.lua", "cocos/scripting/lua-bindings/auto/api/Event.lua", "cocos/scripting/lua-bindings/auto/api/EventAcceleration.lua", + "cocos/scripting/lua-bindings/auto/api/EventAssetsManagerEx.lua", "cocos/scripting/lua-bindings/auto/api/EventController.lua", "cocos/scripting/lua-bindings/auto/api/EventCustom.lua", "cocos/scripting/lua-bindings/auto/api/EventDispatcher.lua", @@ -4707,6 +4709,7 @@ "cocos/scripting/lua-bindings/auto/api/EventKeyboard.lua", "cocos/scripting/lua-bindings/auto/api/EventListener.lua", "cocos/scripting/lua-bindings/auto/api/EventListenerAcceleration.lua", + "cocos/scripting/lua-bindings/auto/api/EventListenerAssetsManagerEx.lua", "cocos/scripting/lua-bindings/auto/api/EventListenerController.lua", "cocos/scripting/lua-bindings/auto/api/EventListenerCustom.lua", "cocos/scripting/lua-bindings/auto/api/EventListenerFocus.lua", @@ -4768,6 +4771,7 @@ "cocos/scripting/lua-bindings/auto/api/Liquid.lua", "cocos/scripting/lua-bindings/auto/api/ListView.lua", "cocos/scripting/lua-bindings/auto/api/LoadingBar.lua", + "cocos/scripting/lua-bindings/auto/api/Manifest.lua", "cocos/scripting/lua-bindings/auto/api/Menu.lua", "cocos/scripting/lua-bindings/auto/api/MenuItem.lua", "cocos/scripting/lua-bindings/auto/api/MenuItemAtlasFont.lua", From 57068207abfbbeb5d39cf6a8ac7b15efa7d301a6 Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 16 Oct 2014 15:35:42 +0800 Subject: [PATCH 3/5] [ci skip]update config.json --- external/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/config.json b/external/config.json index 3616862da5..53c89a3093 100644 --- a/external/config.json +++ b/external/config.json @@ -1,6 +1,6 @@ { "version":"v3-deps-18", - "zip_file_size":"70810291", + "zip_file_size":"88112898", "repo_name":"cocos2d-x-3rd-party-libs-bin", "repo_parent":"https://github.com/cocos2d/", "move_dirs":{ From 41d280893f427a5e564081272639f9a8b57aed0c Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 16 Oct 2014 15:40:34 +0800 Subject: [PATCH 4/5] [ci skip] Update CHANGELOG --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 35efd7c1b2..a4d2733457 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -cocos2d-x-3.3-beta1 +cocos2d-x-3.3-rc0 Oct.21 2014 [NEW] 3d: added light support: direction light, point light, spot light and ambient light [NEW] Added ClippingRectangleNode [NEW] Added AssetsManagerEx, which is more powerful than AssetsManager From 04839b0e8fff8b9bb24c800cf4ad878f26de0011 Mon Sep 17 00:00:00 2001 From: minggo Date: Thu, 16 Oct 2014 15:41:43 +0800 Subject: [PATCH 5/5] [ci skip]update version --- cocos/cocos2d.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cocos/cocos2d.cpp b/cocos/cocos2d.cpp index fb3b3f4077..111bb4bde6 100644 --- a/cocos/cocos2d.cpp +++ b/cocos/cocos2d.cpp @@ -31,7 +31,7 @@ NS_CC_BEGIN CC_DLL const char* cocos2dVersion() { - return "cocos2d-x 3.3beta0"; + return "cocos2d-x 3.3rc0"; } NS_CC_END