Skip to content

Commit

Permalink
Merge pull request #4 from cocos2d/develop
Browse files Browse the repository at this point in the history 
update new version
  • Loading branch information
jianglong0156 committed Mar 19, 2015
2 parents bdafda3 + 288c390 commit 3b07097
Show file tree
Hide file tree
Showing 889 changed files with 154,895 additions and 61,108 deletions.
235 changes: 235 additions & 0 deletions build/cocos2d-jsb-samples.wp8.sln
View file

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions build/cocos2d_jsb_samples.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@
1A604FB518BF1EE900CC9A93 /* libjsbindings Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A604F2B18BF1D2000CC9A93 /* libjsbindings Mac.a */; };
1A604FC118BF1EFC00CC9A93 /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A604F1C18BF1D1D00CC9A93 /* libcocos2d iOS.a */; };
1A604FC418BF1EFC00CC9A93 /* libjsbindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A604F2D18BF1D2000CC9A93 /* libjsbindings iOS.a */; };
420BBD111AA8840E00493976 /* js_DrawNode3D_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBD0F1AA8840E00493976 /* js_DrawNode3D_bindings.cpp */; };
420BBD121AA8840E00493976 /* js_DrawNode3D_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBD0F1AA8840E00493976 /* js_DrawNode3D_bindings.cpp */; };
42BCD4A31AAF3BF500D035E5 /* js_Effect3D_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42BCD4A11AAF3BF500D035E5 /* js_Effect3D_bindings.cpp */; };
42BCD4A41AAF3BF500D035E5 /* js_Effect3D_bindings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 42BCD4A11AAF3BF500D035E5 /* js_Effect3D_bindings.cpp */; };
A01E17661784C06E00B0CA4A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; };
A01E17671784C06E00B0CA4A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; };
A01E17681784C06E00B0CA4A /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482C165F3988007D4F18 /* AudioToolbox.framework */; };
Expand Down Expand Up @@ -420,6 +424,10 @@
1A604F6218BF1D6600CC9A93 /* Test_Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Test_Info.plist; sourceTree = "<group>"; };
1A604F6318BF1D6600CC9A93 /* Test_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Test_Prefix.pch; sourceTree = "<group>"; };
1A9F808C177E98A600D9A1CB /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; };
420BBD0F1AA8840E00493976 /* js_DrawNode3D_bindings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_DrawNode3D_bindings.cpp; sourceTree = "<group>"; };
420BBD101AA8840E00493976 /* js_DrawNode3D_bindings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_DrawNode3D_bindings.h; sourceTree = "<group>"; };
42BCD4A11AAF3BF500D035E5 /* js_Effect3D_bindings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_Effect3D_bindings.cpp; sourceTree = "<group>"; };
42BCD4A21AAF3BF500D035E5 /* js_Effect3D_bindings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_Effect3D_bindings.h; sourceTree = "<group>"; };
A01E17721784C06E00B0CA4A /* js-tests iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "js-tests iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A035A5EC1782290400987F6C /* js-tests Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "js-tests Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; };
A035A71117822E9E00987F6C /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -678,6 +686,10 @@
1A604F3618BF1D5600CC9A93 /* Classes */ = {
isa = PBXGroup;
children = (
42BCD4A11AAF3BF500D035E5 /* js_Effect3D_bindings.cpp */,
42BCD4A21AAF3BF500D035E5 /* js_Effect3D_bindings.h */,
420BBD0F1AA8840E00493976 /* js_DrawNode3D_bindings.cpp */,
420BBD101AA8840E00493976 /* js_DrawNode3D_bindings.h */,
0541A75C19738D5A00E45470 /* NativeOcClass.h */,
0541A75D19738D5A00E45470 /* NativeOcClass.m */,
1A604F3718BF1D5600CC9A93 /* AppDelegate.cpp */,
Expand Down Expand Up @@ -1226,6 +1238,8 @@
files = (
0541A76319738D8C00E45470 /* NativeOcClass.m in Sources */,
1A604F5A18BF1D6000CC9A93 /* RootViewController.mm in Sources */,
42BCD4A41AAF3BF500D035E5 /* js_Effect3D_bindings.cpp in Sources */,
420BBD121AA8840E00493976 /* js_DrawNode3D_bindings.cpp in Sources */,
1A604F3A18BF1D5600CC9A93 /* AppDelegate.cpp in Sources */,
1A604F5918BF1D6000CC9A93 /* main.m in Sources */,
1A604F4D18BF1D6000CC9A93 /* AppController.mm in Sources */,
Expand All @@ -1238,6 +1252,8 @@
files = (
0541A77819750DE700E45470 /* NativeOcClass.m in Sources */,
1A604F6718BF1D6600CC9A93 /* main.cpp in Sources */,
42BCD4A31AAF3BF500D035E5 /* js_Effect3D_bindings.cpp in Sources */,
420BBD111AA8840E00493976 /* js_DrawNode3D_bindings.cpp in Sources */,
1A604F3918BF1D5600CC9A93 /* AppDelegate.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
2 changes: 1 addition & 1 deletion frameworks/cocos2d-html5
Submodule cocos2d-html5 updated 77 files
+1 −0 .gitignore
+11 −1 AUTHORS.txt
+14 −9 CCBoot.js
+14 −6 cocos2d/audio/CCAudio.js
+1 −1 cocos2d/clipping-nodes/CCClippingNodeWebGLRenderCmd.js
+1 −1 cocos2d/core/CCActionManager.js
+11 −19 cocos2d/core/CCCamera.js
+7 −6 cocos2d/core/CCDirector.js
+16 −25 cocos2d/core/CCDirectorWebGL.js
+547 −256 cocos2d/core/CCScheduler.js
+66 −13 cocos2d/core/base-nodes/CCNode.js
+37 −35 cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js
+10 −10 cocos2d/core/base-nodes/CCNodeWebGLRenderCmd.js
+4 −3 cocos2d/core/event-manager/CCEventManager.js
+36 −7 cocos2d/core/labelttf/CCLabelTTF.js
+10 −3 cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js
+94 −15 cocos2d/core/layers/CCLayer.js
+43 −37 cocos2d/core/layers/CCLayerCanvasRenderCmd.js
+103 −40 cocos2d/core/layers/CCLayerWebGLRenderCmd.js
+1 −1 cocos2d/core/platform/CCConfig.js
+7 −2 cocos2d/core/platform/CCEGLView.js
+2 −2 cocos2d/core/platform/CCInputExtension.js
+78 −76 cocos2d/core/platform/CCScreen.js
+35 −1 cocos2d/core/platform/CCTypes.js
+281 −282 cocos2d/core/platform/CCTypesWebGL.js
+2 −2 cocos2d/core/renderer/RendererCanvas.js
+18 −9 cocos2d/core/sprites/CCSprite.js
+49 −31 cocos2d/core/sprites/CCSpriteFrameCache.js
+1 −1 cocos2d/core/support/CCPointExtension.js
+1 −0 cocos2d/core/textures/CCTextureCache.js
+11 −3 cocos2d/core/textures/TexturesWebGL.js
+5 −7 cocos2d/effects/CCGrid.js
+31 −21 cocos2d/kazmath/aabb.js
+48 −27 cocos2d/kazmath/gl/mat4stack.js
+133 −135 cocos2d/kazmath/gl/matrix.js
+308 −292 cocos2d/kazmath/mat3.js
+942 −737 cocos2d/kazmath/mat4.js
+103 −150 cocos2d/kazmath/plane.js
+402 −440 cocos2d/kazmath/quaternion.js
+99 −122 cocos2d/kazmath/ray2.js
+12 −34 cocos2d/kazmath/utility.js
+84 −78 cocos2d/kazmath/vec2.js
+163 −167 cocos2d/kazmath/vec3.js
+129 −129 cocos2d/kazmath/vec4.js
+1 −1 cocos2d/node-grid/CCNodeGrid.js
+1 −1 cocos2d/particle/CCParticleSystemCanvasRenderCmd.js
+1 −1 cocos2d/particle/CCParticleSystemWebGLRenderCmd.js
+10 −0 cocos2d/render-texture/CCRenderTexture.js
+3 −1 cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js
+28 −8 cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js
+5 −5 cocos2d/shaders/CCGLProgram.js
+5 −5 cocos2d/shape-nodes/CCDrawNode.js
+1 −1 cocos2d/tilemap/CCTMXLayer.js
+17 −25 cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js
+11 −0 cocos2d/tilemap/CCTMXObjectGroup.js
+1 −1 extensions/ccpool/CCPool.js
+5 −11 extensions/ccui/base-classes/CCProtectedNodeCanvasRenderCmd.js
+5 −5 extensions/ccui/base-classes/CCProtectedNodeWebGLRenderCmd.js
+3 −3 extensions/ccui/uiwidgets/UIButton.js
+10 −10 extensions/ccui/uiwidgets/UICheckBox.js
+1 −1 extensions/ccui/uiwidgets/UIImageView.js
+1 −1 extensions/ccui/uiwidgets/UILoadingBar.js
+181 −17 extensions/ccui/uiwidgets/UIRichText.js
+5 −5 extensions/ccui/uiwidgets/UISlider.js
+2 −0 extensions/ccui/uiwidgets/UIText.js
+1 −1 extensions/ccui/uiwidgets/UITextBMFont.js
+1 −1 extensions/ccui/uiwidgets/scroll-widget/UIPageView.js
+2 −2 extensions/cocostudio/action/CCActionObject.js
+1 −1 extensions/cocostudio/armature/utils/CCDataReaderHelper.js
+76 −78 extensions/cocostudio/loader/parsers/timelineParser-2.x.js
+2 −2 external/chipmunk/chipmunk.js
+1 −0 template/index.html
+3 −0 template/main.js
+1 −1 template/project.json
+1 −0 template/res/loading.js
+13 −0 tools/XmlCheck.js
+2 −2 tools/build.xml
4 changes: 3 additions & 1 deletion frameworks/js-bindings/bindings/Android.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ LOCAL_SRC_FILES := auto/jsb_cocos2dx_auto.cpp \
auto/jsb_cocos2dx_spine_auto.cpp \
auto/jsb_cocos2dx_studio_auto.cpp \
auto/jsb_cocos2dx_ui_auto.cpp \
auto/jsb_cocos2dx_3d_auto.cpp \
manual/ScriptingCore.cpp \
manual/cocos2d_specifics.cpp \
manual/js_manual_conversions.cpp \
Expand All @@ -36,7 +37,8 @@ LOCAL_SRC_FILES := auto/jsb_cocos2dx_auto.cpp \
manual/network/jsb_websocket.cpp \
manual/network/XMLHTTPRequest.cpp \
manual/spine/jsb_cocos2dx_spine_manual.cpp \
manual/ui/jsb_cocos2dx_ui_manual.cpp
manual/ui/jsb_cocos2dx_ui_manual.cpp \
manual/3d/jsb_cocos2dx_3d_manual.cpp


LOCAL_CFLAGS := -DCOCOS2D_JAVASCRIPT
Expand Down
2 changes: 2 additions & 0 deletions frameworks/js-bindings/bindings/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ set(JSBINDING_SRC
auto/jsb_cocos2dx_spine_auto.cpp
auto/jsb_cocos2dx_studio_auto.cpp
auto/jsb_cocos2dx_ui_auto.cpp
auto/jsb_cocos2dx_3d_auto.cpp
manual/ScriptingCore.cpp
manual/cocos2d_specifics.cpp
manual/js_manual_conversions.cpp
Expand All @@ -62,6 +63,7 @@ set(JSBINDING_SRC
manual/network/jsb_socketio.cpp
manual/spine/jsb_cocos2dx_spine_manual.cpp
manual/ui/jsb_cocos2dx_ui_manual.cpp
manual/3d/jsb_cocos2dx_3d_manual.cpp
../cocos2d-x/cocos/storage/local-storage/LocalStorage.cpp
)

Expand Down
Loading

0 comments on commit 3b07097

Please sign in to comment.