Skip to content

Update EngineVersion #1230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 25, 2014
Merged

Update EngineVersion #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab086af
Update EngineVersion
pandamicro Dec 25, 2014
1c6ae5a
Update submodules
pandamicro Dec 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frameworks/cocos2d-html5
Open in desktop
Submodule cocos2d-html5 updated 50 files
+115 −109 CCBoot.js
+76 −21 cocos2d/audio/CCAudio.js
+51 −44 cocos2d/clipping-nodes/CCClippingNodeCanvasRenderCmd.js
+1 −1 cocos2d/core/CCCamera.js
+3 −6 cocos2d/core/CCDirector.js
+300 −298 cocos2d/core/CCDirectorWebGL.js
+38 −30 cocos2d/core/CCDrawingPrimitivesCanvas.js
+3 −3 cocos2d/core/base-nodes/CCNode.js
+6 −6 cocos2d/core/base-nodes/CCNodeCanvasRenderCmd.js
+1 −0 cocos2d/core/event-manager/CCEventManager.js
+27 −51 cocos2d/core/layers/CCLayerCanvasRenderCmd.js
+1 −1 cocos2d/core/platform/CCConfig.js
+24 −17 cocos2d/core/platform/CCEGLView.js
+2 −4 cocos2d/core/platform/CCInputManager.js
+132 −6 cocos2d/core/renderer/RendererCanvas.js
+1 −1 cocos2d/core/sprites/CCBakeSprite.js
+2 −2 cocos2d/core/sprites/CCSprite.js
+45 −120 cocos2d/core/sprites/CCSpriteCanvasRenderCmd.js
+2 −2 cocos2d/particle/CCParticleBatchNodeWebGLRenderCmd.js
+11 −17 cocos2d/particle/CCParticleSystemCanvasRenderCmd.js
+15 −34 cocos2d/progress-timer/CCProgressTimerCanvasRenderCmd.js
+1 −0 cocos2d/render-texture/CCRenderTexture.js
+6 −40 cocos2d/render-texture/CCRenderTextureCanvasRenderCmd.js
+0 −96 cocos2d/shape-nodes/CCDrawNode.js
+30 −25 cocos2d/shape-nodes/CCDrawNodeCanvasRenderCmd.js
+1 −1 cocos2d/tilemap/CCTMXLayer.js
+63 −30 cocos2d/tilemap/CCTMXLayerCanvasRenderCmd.js
+0 −84 extensions/ccui/base-classes/CCProtectedNode.js
+39 −9 extensions/ccui/base-classes/CCProtectedNodeCanvasRenderCmd.js
+33 −5 extensions/ccui/base-classes/CCProtectedNodeWebGLRenderCmd.js
+0 −88 extensions/ccui/base-classes/UIScale9Sprite.js
+63 −2 extensions/ccui/base-classes/UIScale9SpriteCanvasRenderCmd.js
+34 −0 extensions/ccui/base-classes/UIScale9SpriteWebGLRenderCmd.js
+0 −2 extensions/ccui/layouts/UILayout.js
+30 −50 extensions/ccui/layouts/UILayoutCanvasRenderCmd.js
+1 −4 extensions/ccui/uiwidgets/UIButton.js
+0 −6 extensions/ccui/uiwidgets/scroll-widget/UIScrollView.js
+12 −1 extensions/cocostudio/action/CCActionManager.js
+0 −16 extensions/cocostudio/armature/CCArmature.js
+59 −35 extensions/cocostudio/armature/CCArmatureCanvasRenderCmd.js
+5 −6 extensions/cocostudio/armature/CCArmatureWebGLRenderCmd.js
+46 −3 extensions/cocostudio/armature/CCBone.js
+1 −3 extensions/cocostudio/armature/display/CCSkinCanvasRenderCmd.js
+0 −4 extensions/editbox/CCdomNode.js
+21 −5 extensions/gui/control-extension/CCScale9SpriteCanvasRenderCmd.js
+14 −38 extensions/gui/scrollview/CCScrollViewCanvasRenderCmd.js
+1 −1 extensions/spine/CCSkeleton.js
+5 −9 extensions/spine/CCSkeletonCanvasRenderCmd.js
+1 −1 moduleConfig.json
+1 −1 template/project.json
2 changes: 1 addition & 1 deletion frameworks/js-bindings/bindings/manual/ScriptingCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <assert.h>
#include <memory>

#define ENGINE_VERSION "Cocos2d-JS v3.2 RC0"
#define ENGINE_VERSION "Cocos2d-JS v3.2"

void js_log(const char *format, ...);

Expand Down
2 changes: 1 addition & 1 deletion frameworks/js-bindings/bindings/script/jsb_cocos2d.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

// CCConfig.js
//
cc.ENGINE_VERSION = "Cocos2d-JS v3.2 RC0";
cc.ENGINE_VERSION = "Cocos2d-JS v3.2";

cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0;
cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0};
Expand Down
2 changes: 1 addition & 1 deletion tools/cocos2d-console
Open in desktop
Submodule cocos2d-console updated 2 files
+4 −0 bin/cocos_project.py
+3 −0 plugins/project_new/project_new.py