Merge pull request #508 from pandamicro/master

Update submodules with PluginFacebook
cocos2d · Jun 27, 2014 · b0bf062 · b0bf062
2 parents ee360a4 + 7993434
commit b0bf062
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 12 deletions.
diff --git a/frameworks/cocos2d-html5 b/frameworks/cocos2d-html5
diff --git a/frameworks/js-bindings/bindings/script/jsb_cocos2d.js b/frameworks/js-bindings/bindings/script/jsb_cocos2d.js
@@ -24,7 +24,7 @@
 // cocos2d constants
 //
 
-cc.ENGINE_VERSION = "Cocos2d-JS v3.0 rc";
+cc.ENGINE_VERSION = "Cocos2d-JS v3.0 rc0";
 
 cc.TARGET_PLATFORM = {
     WINDOWS:0,

diff --git a/frameworks/js-bindings/cocos2d-x b/frameworks/js-bindings/cocos2d-x
diff --git a/samples/js-tests/project/Classes/AppDelegate.h b/samples/js-tests/project/Classes/AppDelegate.h
@@ -1,11 +1,3 @@
-//
-//  GCTestAppDelegate.h
-//  GCTest
-//
-//  Created by Rohan Kuruvilla on 06/08/2012.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
 #ifndef  _APP_DELEGATE_H_
 #define  _APP_DELEGATE_H_
 

diff --git a/tools/bindings-generator b/tools/bindings-generator
+4 −2		CCBoot.js
+14 −9		cocos2d/audio/CCAudio.js
+2 −2		cocos2d/core/platform/CCEGLView.js
+1 −1		cocos2d/core/platform/CCLoaders.js
+51 −85		cocos2d/core/platform/CCVisibleRect.js
+3 −6		cocos2d/core/scenes/CCLoaderScene.js
+6 −6		extensions/ccui/base-classes/UIWidget.js
+26 −26		extensions/ccui/layouts/UILayout.js
+4 −4		extensions/ccui/uiwidgets/scroll-widget/UIPageView.js
+82 −82		extensions/ccui/uiwidgets/scroll-widget/UIScrollView.js
+6 −1		extensions/editbox/CCEditBox.js
+2 −2		extensions/gui/scrollview/CCScrollView.js
+1 −1		.gitmodules
+2 −2		cocos/platform/CCFileUtils.cpp
+1 −1		plugin
+1 −1		README.md
+2 −0		generator.py
+1 −0		targets/lua/conversions.yaml
+1 −0		targets/lua/templates/apidoc_function_head.script
+8 −0		targets/lua/templates/register.c