James Chen
|
6ecc8d37c5
|
Fix a typo, this._is_nativeObj -> this.__nativeObj.
|
2014-01-26 14:45:45 +08:00 |
James Chen
|
26125f4e26
|
closed #3858: Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
Please refer to http://www.cocos2d-x.org/issues/3858.
|
2014-01-26 14:41:27 +08:00 |
James Chen
|
04f2cc48a2
|
closed #3856: Crash when Firefox connects to JSB application.
|
2014-01-26 13:54:48 +08:00 |
James Chen
|
5b9f1697d3
|
closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform. Don’t define `DEBUG` macro in our projects since all third party libraries(e.g. Spidermonkey) were built in RELEASE mode.
|
2014-01-26 11:16:25 +08:00 |
pandamicro
|
d6df71cc11
|
Fixed #3806: Change parameters to const &
|
2014-01-22 22:31:26 +08:00 |
pandamicro
|
3de7ed93f9
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Conflicts:
cocos/scripting/javascript/bindings/cocos2d_specifics.cpp
|
2014-01-21 18:18:32 +08:00 |
pandamicro
|
a467fe3244
|
Fixed #3806: SAXParser supported with manual binding in JSB
|
2014-01-21 18:12:12 +08:00 |
Dhilan007
|
b8adba4c64
|
fix crash cause by string(null).
|
2014-01-21 11:59:43 +08:00 |
James Chen
|
e5f723774d
|
Updates jsbindings and localStorage.
|
2014-01-20 22:45:40 +08:00 |
James Chen
|
2e7516c582
|
Merge pull request #5041 from Dhilan007/develop_label
closed #3630:Uses a struct of TTF configuration for Label::createWithTTF to reduce parameters and make this interface more easily to use.
|
2014-01-15 18:37:40 -08:00 |
Dhilan007
|
68eddf3cd7
|
fix compiling error
|
2014-01-15 17:29:07 +08:00 |
Dhilan007
|
69c004108b
|
issue#3630:Adjust some method for more easily create and change type.
|
2014-01-11 22:33:07 +08:00 |
Ricardo Quesada
|
c88f81481b
|
JSB compiles OK
|
2014-01-10 19:22:04 -08:00 |
James Chen
|
65b5a7c031
|
If this.ctor was not found, output a log.
|
2014-01-07 22:39:14 +08:00 |
James Chen
|
ac3697db19
|
fix for jsval_to_ssize and ssize_to_jsval, it only supports 32 bits now. Otherwise, (string).toFixed(0) will fails. Do we need 64 bit for JS?
|
2014-01-07 18:28:46 +08:00 |
James Chen
|
5391024399
|
Adds override keyword.
|
2014-01-07 18:27:04 +08:00 |
James Chen
|
1bd0f90437
|
Warning fix in js_manual_conversions.cpp/h
|
2014-01-06 20:02:01 +08:00 |
James Chen
|
f3eb21e748
|
Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash
closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
|
2014-01-03 18:51:16 -08:00 |
James Chen
|
61af958976
|
closed #3579: Bug fix in setTouchEnabledForLayer for jsbindings.
|
2014-01-04 10:32:04 +08:00 |
Dhilan007
|
e017609fc4
|
fix compiling error in jsb_cocos2dx_studio_manual.cpp on android.
|
2014-01-03 23:59:05 +08:00 |
Dhilan007
|
b6e676caa4
|
fix warn and compiling error in jsb_cocos2dx_studio_manual.cpp.
|
2014-01-03 23:03:48 +08:00 |
Dhilan007
|
b4d392dc38
|
update js binding for studio change.
|
2014-01-03 21:33:48 +08:00 |
Dhilan007
|
8e2c51d31e
|
update vs project for split spine binding.
|
2014-01-03 15:29:50 +08:00 |
James Chen
|
04760f2508
|
[Android] Adds jsb-spine module. TestJavascript now depends on jsb-spine module.
|
2014-01-03 10:30:55 +08:00 |
James Chen
|
831e0b08e0
|
Merge pull request #4807 from dumganhar/iss3291-xmlhttprequest-error-fix-develop
closed #3291: XMLHttpRequest.status needs to be assigned even when connection fails.
|
2014-01-02 06:46:25 -08:00 |
James Chen
|
e337fb35fc
|
closed #3291: XMLHttpRequest.status needs to be assigned even when connection fails.
|
2014-01-02 21:59:47 +08:00 |
minggo
|
d345139a08
|
fix compiling errors
|
2014-01-02 21:53:18 +08:00 |
minggo
|
674b38beef
|
no in header file
|
2014-01-02 21:43:27 +08:00 |
minggo
|
2b5be1bacf
|
Merge pull request #4801 from minggo/namespace
fix compiling errors because of new namespace of network module
|
2014-01-02 04:03:03 -08:00 |
minggo
|
9124f189c3
|
fix compiling errors because of new namespace of network module
|
2014-01-02 19:44:46 +08:00 |
James Chen
|
dd54e906f0
|
ccs.XXX —> ccui.XXX for gui js bindings.
|
2014-01-02 14:21:24 +08:00 |
James Chen
|
8c1c9fef15
|
Bug fix in cc.VisibleRect
|
2013-12-31 18:17:20 +08:00 |
James Chen
|
74a7f68dc1
|
[JSB] Adds cc.VisibleRect.
|
2013-12-31 18:12:42 +08:00 |
James Chen
|
1d8ee016e5
|
Merge pull request #4596 from boyu0/bug2050_tilemap_firstgid_bug
closed #2050: fix tilemap firstgid bug
|
2013-12-30 05:42:19 -08:00 |
James Chen
|
1edf748dc3
|
[JSB] Adds trigger bindings for CocoStudio.
|
2013-12-30 20:57:46 +08:00 |
boyu0
|
1f72fafd08
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
Conflicts:
cocos/2d/CCTMXXMLParser.cpp
cocos/2d/CCTMXXMLParser.h
|
2013-12-30 12:30:59 +08:00 |
James Chen
|
17ff6ef764
|
Renames: IntValueMap —> ValueMapIntKey
|
2013-12-26 22:07:20 +08:00 |
James Chen
|
93ed5a4f0f
|
long --> ssize_t for TableView callback.
|
2013-12-26 04:09:24 -08:00 |
James Chen
|
5dfb7f321a
|
Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
|
2013-12-26 16:03:30 +08:00 |
James Chen
|
0ff85852cc
|
Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead.
|
2013-12-24 18:08:40 +08:00 |
James Chen
|
d33b2c41c7
|
Merge branch 'develop' into data-refactor
Conflicts:
tools/tolua/cocos2dx.ini
|
2013-12-24 16:24:17 +08:00 |
James Chen
|
451d76f6b0
|
Merge pull request #4611 from dumganhar/spine-test
Merge PR #4572, Spine JS test support.
|
2013-12-23 22:55:58 -08:00 |
James Chen
|
325f2e21a7
|
[JSB] long —> ssize_t in JSB_TableViewDataSource::callJSDelegate.
|
2013-12-24 10:41:45 +08:00 |
James Chen
|
05f6a5b09b
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into spine-test
|
2013-12-23 22:05:20 +08:00 |
James Chen
|
3327614a99
|
Binds Node::setAnchorPoint manually.
|
2013-12-23 21:54:02 +08:00 |
James Chen
|
cafebe7295
|
Merge commit 'refs/pull/4572/head' of git://github.com/cocos2d/cocos2d-x into spine-test
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2013-12-23 20:28:51 +08:00 |
James Chen
|
3096c34311
|
Removes unneeded binding glue codes, Sprite::setPosition.
|
2013-12-23 20:25:46 +08:00 |
boyu0
|
669ba8149a
|
closed #2050: fix js glue code.
|
2013-12-23 17:06:13 +08:00 |
James Chen
|
43e9df17bb
|
Removes unneeded ‘clone’ in cocos2d_specifics.cpp.
|
2013-12-23 16:39:25 +08:00 |
James Chen
|
aeafe06d7f
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
Conflicts:
cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
|
2013-12-23 11:57:29 +08:00 |