Carsten Sandtner
2b2d7cb665
Merge branch 'master' into XMLHttpRequest_Demo
...
# By carlo morgantini (28) and others
# Via minggo (6) and zhangbin (3)
* master: (40 commits)
Update AUTHORS
Update AUTHORS
fixed #2155 : Resolve the bug of callback methods in plugin.
Update AUTHORS
fix a warning caused by member variables initialization order in constructor
it now shares code between createTextBitmap and createTextBitmapShadowStroke (no more duplication)
initWithStringShadowStroke() renamed to initWithString()
comment fixed
fix alignent problem when rendering text with shadow
fix a problem with float stroke size
Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase
CCLabelTTF C++ test fixed
new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition
initWithStringAndTextDefinition() changed method's signature
no more bingins for ccTextDefinition
class renamed and moved to ccTypes.h
CCTextDefinition is passed now by pointers
bindings for CCTextDefinition
ccTextDefinition becomes CCTextDefinition
changed the label test (shadows + stroke) for using ccTextDefinition when creating CCLabelTTF
...
2013-05-16 10:12:19 +02:00
Carsten Sandtner
6e43618004
MinXMLHttpRequest extends from CCObject
...
Added MinXMLHttpRequest to Android.mk for Bindings
Added newline at header as compiler threw a warning.
2013-05-16 10:11:00 +02:00
carlo morgantini
3b50ffe5ba
Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase
2013-05-15 16:37:08 -07:00
carlo morgantini
315999edad
new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition
2013-05-15 16:37:08 -07:00
Carsten Sandtner
370a540352
fixed possible memory holes.
2013-05-15 15:15:23 +02:00
Carsten Sandtner
4cb3001fc6
Fixed check for arguments at xhr.send()
2013-05-15 13:57:25 +02:00
Carsten Sandtner
919c347c6d
changed method to strip newlines as Android complained.
2013-05-14 17:21:27 +02:00
Carsten Sandtner
a7e0a83a2e
remove initialization of withCredentialsValue = flase as iso c++ complains it.
2013-05-14 15:50:56 +02:00
Carsten Sandtner
6449d79d60
Fixed some typo
2013-05-14 14:16:22 +02:00
Carsten Sandtner
32d2ee8104
Deactivated Debugging flag.
2013-05-14 13:19:32 +02:00
Carsten Sandtner
1b80208329
Tidied up comments
2013-05-14 12:03:58 +02:00
Carsten Sandtner
2e68188321
Some code cleaning
2013-05-14 11:36:48 +02:00
Carsten Sandtner
915265dd34
Merge branch 'master' into XMLHttpRequest_cchttpclient
...
# By Sam Clegg (2) and James Chen (1)
# Via James Chen
* master:
Update AUTHORS [ci skip]
Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert
Log assert messages
2013-05-14 11:19:46 +02:00
James Chen
99664b5998
Merge pull request #2391 from sbc100/log_asserts
...
fixed #2152 : Logging assert messages to the console and renaming CCScriptSupport::executeAssert to CCScriptSupport::handleAssert.
2013-05-13 19:56:28 -07:00
Carsten Sandtner
d61ee643a9
changed xmlhttprequest to use cchttpclient instead of raw curl. XHR is now async.
2013-05-13 16:57:55 +02:00
Carsten Sandtner
e86f11e36a
Using CChttpClient instead of curl.
2013-05-10 15:00:03 +02:00
Carsten Sandtner
65eb73f81c
activate XMLHttpRequest in bindings.config
2013-05-08 13:13:21 +02:00
Carsten Sandtner
1dccfc70b4
Added Spidermonkey bindings for a synchronous XMLHttpRequest object in JAvascript.
2013-05-08 12:59:07 +02:00
James Chen
9a7c849ce4
fixed #2106 : Fixing a bug on android when only jsc files exist.
2013-05-07 10:50:09 +08:00
James Chen
bf6bbba6ee
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
2013-05-07 09:43:24 +08:00
Sam Clegg
4f6de1bcad
Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert
...
Also remove the first "cond" argument, since it is always false.
2013-05-06 12:25:13 -07:00
sunzhuoshi
fa39c41136
Fixed bad commit
2013-05-06 19:06:16 +08:00
James Chen
9a63b39974
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
2013-05-06 18:13:26 +08:00
sunzhuoshi
3da5a7d5cd
Removed redundant code
2013-05-06 18:06:18 +08:00
sunzhuoshi
6e70884853
Removed redundant code
2013-05-06 15:43:33 +08:00
James Chen
f86a843c8b
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
2013-05-06 12:55:44 +08:00
sunzhuoshi
d4c4170368
Removed bad comment
2013-05-06 12:02:17 +08:00
James Chen
4657ef716c
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
2013-05-06 11:43:40 +08:00
sunzhuoshi
de27f1137a
Changed byte code file ext to ".jsc"
...
Modified loading logic to load js file first
2013-05-06 11:32:23 +08:00
James Chen
0718e6cf70
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
2013-05-06 11:15:19 +08:00
minggo
0c721096ec
fixed #2099:fixed a bug in ScriptingCore::evalString not setting the outval
2013-05-02 09:03:24 +08:00
sunzhuoshi
077214c419
Modified to ensure no popup notify when no byte code file
2013-04-30 20:39:06 +08:00
sunzhuoshi
d4832e3f46
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master
...
Conflicts:
scripting/javascript/bindings/ScriptingCore.cpp
2013-04-30 03:51:07 +08:00
sunzhuoshi
163c19fac2
Added support for javascript byte code
2013-04-30 03:29:56 +08:00
James Chen
2d27353dd3
Using the same native stack size for DEBUG and RELEASE target.
...
#define JSB_MAX_STACK_QUOTA 500000
2013-04-27 23:49:04 +08:00
Rohan Kuruvilla
2636bafd0c
Fixing network logging for Android and iOS
2013-04-25 18:41:29 -07:00
CocosRobot
c501a73a54
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-25 21:30:20 +08:00
James Chen
5572990e5d
Synchronizing some JSB changes in cocos2d-iphone. Fix a bug of "Too much recursion" in loop.
2013-04-25 20:56:27 +08:00
CocosRobot
1e4370f43b
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-25 14:35:16 +08:00
CocosRobot
ca30ce7462
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-23 12:11:31 +08:00
James Chen
e84cf9ef83
Correct log output in js_cocos2dx_CCTMXLayer_getTiles
2013-04-23 10:57:55 +08:00
James Chen
30c6915449
fix a typo.
2013-04-23 10:52:51 +08:00
CocosRobot
8d8a2293a1
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-19 17:27:38 +08:00
James Chen
20b0e41b78
fixed #2017 : Binding cc.TMXLayer.getTiles manually.
2013-04-19 17:25:24 +08:00
James Chen
556d95d922
Removing an unused comment in ccaffinetransform_to_jsval.
2013-04-18 14:13:26 +08:00
CocosRobot
5ead6d7322
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-18 13:58:01 +08:00
James Chen
4db3c9c692
Refactoring js_cocos2dx_CCFileUtils_getByteArrayFromFile.
2013-04-18 13:53:16 +08:00
James Chen
642d1746f9
issue #2064 : Adding conversation for "jsval ~> CCAffineTransform" and "CCAffineTransform ~> jsval".
2013-04-18 13:50:58 +08:00
James Chen
4bd012dfbf
fixed #2060 : Implementing support for cc.FileUtils.getInstance().getByteArrayFromFile(filename)
2013-04-17 18:43:57 +08:00
James Chen
63ce8adfad
fixed #2059 : Fix complication errors on Android.
2013-04-17 17:05:39 +08:00
James Chen
ddd6d9d155
fixed #2059 : cc.FileUtils.getInstance().getStringFromFile(filename) doesn't return a whole string.
2013-04-17 16:08:48 +08:00
James Chen
694c47f5d6
Merge pull request #2382 from wedteam/keypad-support
...
fixed #2057 : [JSB] Adding response for back and menu keypad event for Android.
2013-04-16 21:56:37 -07:00
akira_cn
e1f9e1a300
update keypad support
2013-04-17 10:40:46 +08:00
akira_cn
54f18be09a
add back key support
2013-04-16 10:19:36 +08:00
CocosRobot
5928d2836c
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-16 10:02:11 +08:00
CocosRobot
d6e9d4420e
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-15 14:01:47 +08:00
James Chen
3f695d1934
Merge branch 'master' of https://github.com/SevInf/cocos2d-x into SevInf-master
2013-04-10 16:07:54 +08:00
CocosRobot
40c5280527
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-09 14:49:20 +08:00
James Chen
a2c71f8e89
Exposing CCApplication to js.
2013-04-09 14:42:12 +08:00
James Chen
831dfb6ade
Merge remote-tracking branch 'origin/iss1592-update-uthash' into iss1592-update-uthash
2013-04-08 11:56:10 +08:00
James Chen
2c3427dcee
issue #1592 : Fixing complication errors for windows port.
2013-04-08 11:56:04 +08:00
James Chen
ea4603a057
issue #1592 : Removing uthash.h in scripting/javascript/bindings. Using the version in cocos2d-x/cocos2dx/support/data_support/uthash.h.
2013-04-08 11:55:35 +08:00
James Chen
ef731879f1
Merge pull request #2291 from dumganhar/iss1944-remove-associate-nativeobj
...
fixed #1944 : The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.
2013-04-06 20:20:33 -07:00
CocosRobot
3871129c1f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-07 11:13:28 +08:00
Sergej Tatarincev
1510354568
Support variable cell sizes in CCTableView
2013-04-04 17:57:43 +03:00
CocosRobot
0338a3e504
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-04 00:08:15 +08:00
James Chen
f1d48b41e2
issue #1944 : Fixing a typo.
2013-04-03 10:39:40 +08:00
James Chen
ad555e70fb
issue #1944 : Removing commented codes in cc.associateWithNative.
2013-04-03 10:39:15 +08:00
James Chen
6d6bc03465
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1944-remove-associate-nativeobj
2013-04-03 10:27:01 +08:00
CocosRobot
1462c2a570
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-02 12:01:52 +08:00
James Chen
ec7a2f4c5c
fixed #1944 : The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.
2013-04-02 11:35:55 +08:00
CocosRobot
9f50cb71e2
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-29 17:02:38 +08:00
CocosRobot
7b37a9aaef
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-29 12:02:51 +08:00
James Chen
92d132ae19
Updating Android.mk to add OpenGL jsb support.
2013-03-29 11:43:25 +08:00
James Chen
fd1b056d6a
define JSB_INCLUDE_OPENGL in js_bindings_config.h
2013-03-29 11:41:32 +08:00
James Chen
b7a86c601a
fixing compilation errors for TestJavascript on windows.
2013-03-29 11:16:14 +08:00
James Chen
54edf8cafd
Don't require 'jsb_opengl_constants.js' in 'jsb_opengl.js'. It will break js obscure
2013-03-28 16:58:02 +08:00
James Chen
771ffb4368
fixer #1936 : Updating "obfuscate_exclude_cocos2d.js".
2013-03-28 16:53:35 +08:00
James Chen
65bcc6035e
Fixing a type: "FiniteTimeAction" --> "GLNode".
2013-03-28 16:51:11 +08:00
Rohan Kuruvilla
1d89b137ed
Adding new Javascript bindings for OpenGL to cocos2d-x. Modifying bindings generated in cocos2d-iphone
2013-03-27 23:59:29 -07:00
Rohan Kuruvilla
57fd3cdb9c
Modifying JS files to load OpenGL bindings. Also modify AppDelegate and Project files and generator template
2013-03-27 23:59:29 -07:00
James Chen
0faeb5da5e
Merge branch 'jsb_obfuscate' of https://github.com/walzer/cocos2d-x into walzer-jsb_obfuscate
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-03-22 14:12:38 +08:00
walzer
42c73fb820
Fixed #1841 , obfuscated js source can run on iOS correctly now.
2013-03-22 12:06:04 +08:00
James Chen
d80d68f7e0
fixed #1855 : std_string_to_jsval generates messy js string when passing non-ascii UTF8 std::string.
2013-03-22 12:01:08 +08:00
walzer
6f41b7c4ea
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into jsb_obfuscate
2013-03-21 17:37:28 +08:00
walzer
0a252aceaf
update submodule scripting/javascript/bindings/generated to the same ref ptr as upstream/master branch.
2013-03-21 17:13:24 +08:00
walzer
67cda2bfd4
issue #1841 , TestJavascript is obfuscated successfully
2013-03-21 16:55:55 +08:00
CocosRobot
5414a02c9f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-20 18:36:26 +08:00
James Chen
4bf7f9bad4
Fix a crash in cc.Scheduler.unscheduleAll cpp binding codes.
2013-03-20 18:32:30 +08:00
CocosRobot
e34d9b18e5
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-20 14:20:23 +08:00
James Chen
a38fc50593
Fixing compilation errors for win32.
2013-03-19 19:51:07 +08:00
CocosRobot
a115096bec
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-19 18:05:15 +08:00
walzer
0d73934f5c
issue #1841 , TestJavascript-ios is obfuscated successfully
2013-03-19 17:21:01 +08:00
CocosRobot
afccad27e1
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-19 13:45:54 +08:00
James Chen
7b5e2351c3
Updating jsb_cocosbuilder.js.
2013-03-19 13:08:34 +08:00
James Chen
3380c7cdca
fixed #1838 : Updating iOS project setting for CocosDragonJS.
2013-03-19 13:05:06 +08:00
Rohan Kuruvilla
e4efa88d00
Adding empty virtual definition to CCBScriptCallbackProxy to support CallFunc
2013-03-18 20:54:48 -07:00
Rohan Kuruvilla
5ca6648e47
Updating CCBReader JS bootstrap file
2013-03-18 16:06:48 -07:00
James Chen
6a98553633
Synchronizing the submodule reference of cocos2d-js-test to the latest one.
2013-03-18 18:24:37 +08:00
CocosRobot
d098eb06aa
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-18 15:41:39 +08:00