Skip to content
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

Feature #4236: property apis and manual implementations added to JSB #30

Merged
merged 9 commits into from
Mar 4, 2014
Merged

Feature #4236: property apis and manual implementations added to JSB #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
17d44e2
Feature #4236: property apis and some manual implementations added to…
pandamicro Mar 4, 2014
a438394
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
pandamicro Mar 4, 2014
50db618
Feature #4236: Resolve bug of _undefined
pandamicro Mar 4, 2014
c3e99ab
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
pandamicro Mar 4, 2014
eebb99a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
pandamicro Mar 4, 2014
ae6f2f1
Feature #4236: Manual implementations added to JSB
pandamicro Mar 4, 2014
5fa3692
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
pandamicro Mar 4, 2014
9209b8a
Feature #4236: Remove ccui.EditBox
pandamicro Mar 4, 2014
c300b18
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
pandamicro Mar 4, 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
12 changes: 12 additions & 0 deletions build/cocos2d_jsb_samples.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@
A035A5E71782290400987F6C /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64824165F3934007D4F18 /* OpenGL.framework */; };
A035A5E81782290400987F6C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; };
A035A71217822E9E00987F6C /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A035A71117822E9E00987F6C /* libsqlite3.dylib */; };
BA175BB118C5A2CA0040EA39 /* jsb_property_apis.js in Sources */ = {isa = PBXBuildFile; fileRef = BA175BAE18C5A2CA0040EA39 /* jsb_property_apis.js */; };
BA175BB318C5A2CA0040EA39 /* jsb_property_impls.js in Sources */ = {isa = PBXBuildFile; fileRef = BA175BAF18C5A2CA0040EA39 /* jsb_property_impls.js */; };
BA175BB418C5A2DA0040EA39 /* jsb_property_apis.js in Resources */ = {isa = PBXBuildFile; fileRef = BA175BAE18C5A2CA0040EA39 /* jsb_property_apis.js */; };
BA175BB518C5A2DA0040EA39 /* jsb_property_impls.js in Resources */ = {isa = PBXBuildFile; fileRef = BA175BAF18C5A2CA0040EA39 /* jsb_property_impls.js */; };
D60AE43817F9143D00757E4B /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; };
ED743D1717D099F10004076B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -312,6 +316,8 @@
A07A52B91783AE900073F6A7 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; };
A07A52BB1783AEB80073F6A7 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/CoreGraphics.framework; sourceTree = DEVELOPER_DIR; };
A07A52C11783B01F0073F6A7 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/System/Library/Frameworks/AVFoundation.framework; sourceTree = DEVELOPER_DIR; };
BA175BAE18C5A2CA0040EA39 /* jsb_property_apis.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_property_apis.js; path = "../frameworks/js-bindings/bindings/script/jsb_property_apis.js"; sourceTree = "<group>"; };
BA175BAF18C5A2CA0040EA39 /* jsb_property_impls.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_property_impls.js; path = "../frameworks/js-bindings/bindings/script/jsb_property_impls.js"; sourceTree = "<group>"; };
D60AE43317F7FFE100757E4B /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
EDCC747E17C455FD007B692C /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -386,6 +392,8 @@
1A487B4218BF3E7F007EEB98 /* jsb_cocos2d_constants.js */,
1A487B4318BF3E7F007EEB98 /* jsb_cocos2d_extension.js */,
1A487B4418BF3E7F007EEB98 /* jsb_cocos2d_gui.js */,
BA175BAE18C5A2CA0040EA39 /* jsb_property_apis.js */,
BA175BAF18C5A2CA0040EA39 /* jsb_property_impls.js */,
1A487B4518BF3E7F007EEB98 /* jsb_cocos2d_studio.js */,
1A487B4718BF3E7F007EEB98 /* jsb_cocosbuilder.js */,
1A487B4818BF3E7F007EEB98 /* jsb_debugger.js */,
Expand Down Expand Up @@ -740,6 +748,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
BA175BB418C5A2DA0040EA39 /* jsb_property_apis.js in Resources */,
BA175BB518C5A2DA0040EA39 /* jsb_property_impls.js in Resources */,
1A487B6C18BF3EDF007EEB98 /* jsb.js in Resources */,
1A487B6D18BF3EDF007EEB98 /* jsb_chipmunk.js in Resources */,
1A487B6E18BF3EDF007EEB98 /* jsb_chipmunk_constants.js in Resources */,
Expand Down Expand Up @@ -773,7 +783,9 @@
1A604F5A18BF1D6000CC9A93 /* RootViewController.mm in Sources */,
1A604F3A18BF1D5600CC9A93 /* AppDelegate.cpp in Sources */,
1A604F5918BF1D6000CC9A93 /* main.m in Sources */,
BA175BB118C5A2CA0040EA39 /* jsb_property_apis.js in Sources */,
1A604F4D18BF1D6000CC9A93 /* AppController.mm in Sources */,
BA175BB318C5A2CA0040EA39 /* jsb_property_impls.js in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
2 changes: 2 additions & 0 deletions frameworks/js-bindings/bindings/script/jsb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ require('jsb_cocos2d.js');
require('jsb_cocos2d_extension.js');
require('jsb_cocos2d_studio.js');
require('jsb_cocos2d_gui.js');
require('jsb_property_impls.js');
require('jsb_property_apis.js');
require('jsb_chipmunk_constants.js');
require('jsb_chipmunk.js');
require('jsb_opengl_constants.js');
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 @@ -19,7 +19,7 @@ cc.TARGET_PLATFORM = {
PC_BROWSER:101
};

cc.RESOLUTION_POLICY = {
cc.ResolutionPolicy = {
// The entire application is visible in the specified area without trying to preserve the original aspect ratio.
// Distortion can occur, and the application may appear stretched or compressed.
EXACT_FIT:0,
Expand Down
Loading