Skip to content

Update runtime #1635

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 4 commits into from
Mar 31, 2015
Merged

Update runtime #1635

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de4fb85
Update runtime
pandamicro Mar 31, 2015
7147391
Remove Framework search path in js-tests iOS proj to avoid potential …
pandamicro Mar 31, 2015
d28f5fa
Update Engine version
pandamicro Mar 31, 2015
7252910
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 31, 2015
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
Prev Previous commit
Next Next commit
Update Engine version
  • Loading branch information
@pandamicro
pandamicro committed Mar 31, 2015
commit d28f5fa609dad3fee57ee60b68c9196f665b975c
2 changes: 1 addition & 1 deletion frameworks/cocos2d-html5
Open in desktop
Submodule cocos2d-html5 updated 2 files
+7 −0 AUTHORS.txt
+1 −1 cocos2d/core/platform/CCConfig.js
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 @@ -39,7 +39,7 @@
#include <assert.h>
#include <memory>

#define ENGINE_VERSION "Cocos2d-JS v3.4"
#define ENGINE_VERSION "Cocos2d-JS v3.5"

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.4";
cc.ENGINE_VERSION = "Cocos2d-JS v3.5";

cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0;
cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0};
Expand Down
2 changes: 1 addition & 1 deletion frameworks/js-bindings/cocos2d-x
Open in desktop
Submodule cocos2d-x updated 1 files
+1 −1 plugin
2 changes: 1 addition & 1 deletion templates/js-template-runtime/runtime/ios/PrebuiltRuntimeJs.app/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.4";
cc.ENGINE_VERSION = "Cocos2d-JS v3.5";

cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0;
cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0};
Expand Down
2 changes: 1 addition & 1 deletion ...mplate-runtime/runtime/mac/PrebuiltRuntimeJs.app/Contents/Resources/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.4";
cc.ENGINE_VERSION = "Cocos2d-JS v3.5";

cc.FIX_ARTIFACTS_BY_STRECHING_TEXEL = 0;
cc.DIRECTOR_STATS_POSITION = {x: 0, y: 0};
Expand Down