34c7331b99
Issue fixes for new memory model
2015-12-21 00:16:17 +08:00
8ddaf310ef
Update manual bindings to use the new memory model
2015-12-21 00:16:16 +08:00
e1bc6640f4
Implement full GC relied memory model
2015-12-21 00:14:51 +08:00
022bcc24f1
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
2015-12-20 22:56:33 +08:00
1071f63ac7
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-12-20 22:45:51 +08:00
8f836162aa
Temporary disable forceGC on win32
2015-12-19 22:45:57 +08:00
d943381c65
Update spidermonkey_specifics.h
...
updated docstrings
2015-12-16 20:03:09 -08:00
1ba3f2badb
minor fixes
2015-12-16 17:47:50 -08:00
f023d5a378
no more uthash
...
Instead of using two uthash entires, it uses two unordered_map entries.
Benefits are:
easier to debug. I can inspect the contents of the unorderd_map with the
debugger
less memory. I don't need to allocate two proxies. I only allocate one
proxy and I added it into both maps
If also fixes an important bug when unrooting objects. Unroot was
cleaning the heap object. So now proxy adds a _jsobj, which is a raw
pointer. Needed under certain cases.
2015-12-16 17:37:44 -08:00
66b0a0e9b1
Adds `std::nothrow` to the `new` statements
2015-12-16 17:06:56 +08:00
eb8e755362
removes logs
2015-12-15 18:21:44 -08:00
43a573f4fd
ccvector_to / ccmap_to converted to new API
...
and more fixes
2015-12-15 17:37:48 -08:00
6e20c3cc4f
Merge pull request #14681 from pandamicro/v3.10
...
Fix ComponentJS proxy management issue in JSB
2015-12-15 12:26:12 +08:00
64276bd664
Fix ComponentJS proxy management issue in JSB
2015-12-15 11:48:44 +08:00
280a8e9d9c
Merge pull request #14663 from xiaofeng11/v3.10
...
Update all version number to v3.10
2015-12-15 10:48:51 +08:00
0e7a02d025
Merge pull request #14670 from pandamicro/v3
...
Fix evalString doesn't return result issue
2015-12-14 17:26:34 +08:00
662c7fbec5
Made API consistent with old version
2015-12-14 13:55:17 +08:00
cbce4d37c3
Merge pull request #14671 from ricardoquesada/more_js_fixes
...
More js fixes
2015-12-14 13:41:59 +08:00
330b588215
Fix evalString doesn't return result issue
2015-12-14 13:13:54 +08:00
4815ec8b9a
Update version number to v3.10
2015-12-14 10:32:29 +08:00
445442c964
Upgrade spider monkey to solve win32 js project crash issue
2015-12-14 10:27:11 +08:00
c5058aa2f9
more conversions
2015-12-11 17:18:20 -08:00
47911e0c24
more js fixes
...
fixes in how ref count is measured
opengl bindings converted to new API
2015-12-11 15:18:09 -08:00
8b2dfb1a4b
Mooooores fixes
...
but GC memory model doesn't work yet... somewhere someone is still
retaining a reference that prevents the whole thing from
releasing
2015-12-10 22:15:44 -08:00
96d391ea30
Squashed commit of the following:
...
commit aff4e27200a77db60b13ea30c2457558e5f53059
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 17:58:41 2015 -0800
compiles with new GC model
commit 1fa69cd71231d56371cd45a378e50a1888308b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 17:41:15 2015 -0800
Animation3D works Ok
commit d439969caf7e6fe83a74e37d078c4361a08cb816
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 13:39:50 2015 -0800
Sprite3d create: converted to new API
commit aabe449e4a968fad882c44df9be787eb7c3bfcec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 13:27:33 2015 -0800
ouch...
commit 688ab610a8cb7607bc3c51b8ca01d800ef3c9794
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 13:12:25 2015 -0800
Spawn/Sequence init* were not bound
Fixed. Now JS Scheduler Test works Ok
2015-12-10 18:02:55 -08:00
cb22de5a09
Merge pull request #14590 from pandemosth/issue_14589
...
Fixes #14589 allocation issue with remote images
2015-12-10 10:04:29 +08:00
ceac1d9d6a
Merge pull request #14626 from dumganhar/v3
...
Bug fix for shouldStartLoading method, should return value from JS
2015-12-10 09:36:28 +08:00
65eb5fa4ba
Bug fix for shouldStartLoading method, should return value from JS, also fix that webview callback is already in Cocos Thread, don't need to post to cocos thread for running again.
2015-12-09 22:40:57 +08:00
96ee343884
fixes for windows
2015-12-08 20:07:13 -08:00
e675657cae
improved docstrings
2015-12-07 19:14:10 -08:00
13dc967b03
js_get_or_create_jsobject() and other stuff
...
- getDescendatns() converted
- singletons converted
- new helper template-specialized js_get_or_create_jsobject()
Squashed commit of the following:
commit 3f21e65bca5f7e5e5c4bf304f2daed0eff26f6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 19:04:24 2015 -0800
logging added (and commented)
will be useful in the future
commit f995295b385a515c1f82136688610a90eb379855
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 19:00:09 2015 -0800
new js_get_or_create_jsobject<T>
Specializes Template on cocos2d::Ref.
When Ref, it calls the `jsb_ref` functions
commit 240b80e4080757ebb47db0d02a1fe1f875237d24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 13:31:52 2015 -0800
singletons converted
commit 667d94bf90267c103b620630bacfffa7767b42dd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 12:20:07 2015 -0800
getDescendants() converted
2015-12-07 19:05:23 -08:00
c9d32a83b8
Merge pull request #14597 from mogemimi/fix-api-spelling
...
Fix misspelled APIs in v3.10
2015-12-07 11:07:13 +08:00
c7640c8aaf
Replace 'resoucedata' with 'resourcedata' in JS Binding
2015-12-05 18:59:54 +09:00
745f54b421
Replace 'ResouceData' with 'ResourceData'
2015-12-05 18:59:54 +09:00
aebfefd7a8
Merge branch 'v3' into js_more_conversions
2015-12-04 19:01:20 -08:00
cd8631ef09
sfunction "create" uses new optimized code
...
...although this code should never be called
2015-12-04 18:42:31 -08:00
54ac5d8d2e
fix allocation issue with remote images
2015-12-05 10:10:58 +11:00
1820a006ba
Merge pull request #14502 from xiaofeng11/v3_combine_2d
...
Combine Studio change for 2d components
2015-12-04 16:05:24 +08:00
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
49882ed91c
js_cocos2dx_CCGLProgram_createWithString converted to new JSAPI
2015-12-03 15:49:56 -08:00
b87975096e
GLProgram converted to new JSAPI
2015-12-03 15:47:39 -08:00
67948ff8c8
adds jsb_ref_get_or_create_jsobject()
...
kind of replaces js_get_or_create_jsobject for Ref objets.
Benefits: friendly with the new JS API
takes less space (no template)
2015-12-03 15:40:52 -08:00
37b4c3fe6a
CallFuncN converted to new JS API
2015-12-03 15:24:37 -08:00
013f5b8d33
layerMultiplex converted to new JS API
2015-12-03 15:15:47 -08:00
3100cba5a1
Animation ported to JS
2015-12-03 15:02:39 -08:00
cc6e72fe7c
MenuToggleItem converted
2015-12-03 14:54:38 -08:00
e5032dccc0
rootObject/unrootObject working again
2015-12-03 14:49:23 -08:00
bd943c5415
Sequence/Spawn converted to use new API
2015-12-03 13:56:00 -08:00
c304348c34
Merge pull request #14565 from pandamicro/v3
...
Add js test case for fix, improve template
2015-12-03 18:48:34 +08:00
4cc4dd3a9f
Fix Rooting API usage issue in cocos2d_specifics
2015-12-03 16:48:25 +08:00
58e4d3c487
JS Menu fixes
2015-12-02 17:30:54 -08:00
48523572b7
label JS fixes
2015-12-02 17:23:23 -08:00
6e50cf883f
Sprite::create() using new API...
...
...also code easier to understand
2015-12-02 16:45:28 -08:00
c321d35a9a
Squashed commit of the following:
...
commit 000a025fb4027c26bf05f7296e2d1fbbf21abe6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Dec 2 10:38:27 2015 -0800
updated submodule
commit b5f45a62b48493f05d75aea865158c371241973d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 19:21:34 2015 -0800
ooops... thanks Panda
commit 85f0b9c01d5281970f748b6460107bc0ca82cdf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 18:19:16 2015 -0800
better macro name for GC. Thanks panda
commit e42ad74a664dd2b85cbf4463a6fef8f6abc06664
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 17:10:32 2015 -0800
RepeatForever, Repeat and Speed converted
commit 3a8130ffc06301c91c836539736bbae456f05b4d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 14:31:32 2015 -0800
cherry-picking changes to disable retain/release from GC
commit 3ed6e00dc2d9d46248d9374a1f9874cd0b2ba67d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 12:31:04 2015 -0800
fixes autorelease issues on rebind
commit b65f5f6b16c1542c28b04d66377a27233c6cf214
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 12:23:33 2015 -0800
my JS changes... again
2015-12-02 14:45:13 -08:00
e5d57b4fa2
update binding-generator sub module & code
2015-12-01 22:30:36 +08:00
ea077c5141
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim
...
Conflicts:
cocos/scripting/js-bindings/manual/js_manual_conversions.h
2015-12-01 15:12:32 +08:00
81f590e52a
Merge pull request #14478 from pandamicro/v3
...
Improved JS bindings with more secured memory management
2015-12-01 12:24:21 +08:00
17bdfb4050
Fix android compilation issue
2015-11-30 15:20:57 +08:00
43c68aa16b
Fix Chipmunk bindings issue
2015-11-27 22:38:16 +08:00
e13e0cb886
Fix getJSObject issues
2015-11-27 14:54:25 +08:00
1ee7b11e31
Refactor jsb_new_proxy and jsb_get_js_proxy with RootedObject
2015-11-27 10:20:51 +08:00
8320c2f702
Use rooted object for js_proxy new and get
2015-11-27 10:19:13 +08:00
d23ffe4fc7
Fix some issue of js_type_class usage
2015-11-27 10:16:11 +08:00
ae2b75c8be
Fix issues causing by temporary RootedObject passed as function parameters
2015-11-27 01:35:06 +08:00
24dc9f3392
update code as comment
2015-11-26 17:39:57 +08:00
145943068f
Add missing function export
2015-11-25 22:35:02 +08:00
9811d6efcf
Combine studio change for LuaBinding, jsb and simulator
2015-11-25 21:52:44 +08:00
b0d88a552a
Merge pull request #14419 from xiaofeng11/v3_combine_ui
...
Combine Studio change for UI components
2015-11-25 17:19:54 +08:00
c202834312
Clean up manual bindings code, remove JS_THIS_OBJECT and JS_SET_RVAL
2015-11-25 14:33:43 +08:00
69b2b5720b
Use JS::PersistentRooted instead of JS::Heap to prevent delegates and wrappers internal js object from GC
...
More elegant and secured way, potential crashes exists in previous implementation
2015-11-25 14:32:19 +08:00
be2a3077c2
Remove useless manual bindings for addEventListener functions in UI
2015-11-25 14:15:45 +08:00
930405d52c
Remove useless manual bindings for MenuItems
2015-11-24 16:32:02 +08:00
b6b35e0c74
Fix name space.
2015-11-19 15:47:36 +08:00
32f21ca5be
Binding ResouceData structure to js to fix auto compile error
2015-11-19 14:31:39 +08:00
974bdba154
Fix issue in ComponentJS::~ComponentJS
2015-11-16 11:50:48 +08:00
c0c35c603e
Update version number & RELEASE_NOTES.md, prepare 3.9 release
2015-11-06 18:38:09 +08:00
a31cce9a80
Fix minor grammar and typo in documentation
2015-11-04 17:14:00 +09:00
8f632365c3
Fix typos in documentation
2015-11-03 04:43:44 +09:00
68d75a519a
Use generational gc friendly API in JSTouchDelegate
2015-10-28 11:55:28 +08:00
a3c2904e7f
Fix cc.DrawNode.drawPoly
2015-10-27 16:46:25 +08:00
530321fe70
#14124 Improved JSCallbackWrapper with generational GC and fix the issue
2015-10-22 17:00:57 +08:00
9eeda122e9
Fix Scheduler API inconsistency
2015-10-21 22:10:48 +08:00
428db9c458
update js binding version info
2015-10-20 17:04:31 +08:00
cde67d1261
Merge pull request #14162 from mogemimi/fix-warnings
...
Fix warnings on Xcode 7
2015-10-18 22:56:12 +08:00
11890d6c4b
Fix issue for web engine upgrade
2015-10-18 00:19:02 +08:00
8af6531c94
Replace deprecated CCApplication with Application
2015-10-16 15:02:06 +09:00
4600c41f9b
Add override keywords
2015-10-16 15:01:10 +09:00
27837e0615
return null if read failed in js_cocos2dx_CCFileUtils_getDataFromFile
2015-10-14 16:07:42 +08:00
57ac40b9bc
Fix simulator android x86 release compilation issue
2015-10-08 09:46:50 +08:00
7b85211cfe
Remove ScriptComponent
...
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
f4c56e8605
Fixed compile errors
2015-09-26 19:43:36 +08:00
2a3526a3fd
Fix lua project
2015-09-26 19:43:36 +08:00
91928aa23d
Add ComponentJS test case and fix windows platforms
2015-09-26 19:43:36 +08:00
ddb636a022
Add ScriptComponent and ComponentJS
2015-09-26 19:43:36 +08:00
d3504a9216
Update versions and html5 engine
2015-09-22 02:31:21 +08:00
caaf912a28
add writeDataToFile() for jsb
2015-09-20 15:38:15 +08:00
4aaf017e4c
Merge pull request #13890 from jianglong0156/addsetUniformLocationWithMatrix
...
add CCGLProgram function binding setUniformLocationWithMatrix
2015-09-17 17:45:16 +08:00
1b320ac248
add CCGLProgram function binding setUniformLocationWithMatrix
2015-09-17 15:34:41 +08:00
848fa2c0d0
Merge cocos2d.
2015-09-15 18:30:45 +08:00
5a918608c1
Fix Chipmunk setCollisionType issue by initializing variables
2015-09-11 15:23:29 +08:00
4509a316cc
add uniform conversion
...
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
2015-09-09 16:03:57 +08:00
dc607a1784
Merge pull request #13726 from jianglong0156/actionExtendSquash
...
support custom action, and rewrite update function
2015-09-09 10:25:56 +08:00
badd80bf3a
support custom action, and rewrite update function
...
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
ctor:function (duration, deltaPos, deltaY) {
this._super(duration, deltaPos, deltaY);
},
update:function (dt) {
this._super(dt);
if (this.getTarget()) { // rand color
this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
}
}
});
2015-09-09 10:08:07 +08:00
d86b256396
don't define static variable in header file or each dynamic lib will have a copy
2015-09-08 11:04:51 +08:00
8f6f5c1191
Update engine versions
2015-08-31 13:52:15 +08:00
6ee33499b4
Update changelog and versions for v3.8 rc0
2015-08-22 11:56:25 +08:00
5ef4f3159e
Merge pull request #13487 from jianglong0156/fixopenglErrorSquash
...
fix opengl test error
2015-08-20 17:47:08 +08:00
10d5b73c7e
fix opengl test error
...
fix opengl test error, add the condition, when the data type is samewith long, it will reset data
relate pr:#13449
fix open gl show error
2015-08-20 17:42:26 +08:00
2dbb4ad50e
fixed JSB_glGetUniformfv uniform location is different from index.
2015-08-19 09:53:52 +08:00
b19e02bdf6
Remove duplicate function definition, Add function adaptation
2015-08-17 18:18:38 +08:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
a170b1caf1
Made SocketIO events correctly fired when compile in release mode
...
Fixed https://github.com/cocos2d/cocos2d-x/issues/13248
Reason: `ScriptingCore::executeJSFunctionWithThisObj` is somehow broken in release mode.
Solution: Use `JSFunctionWrapper` to manage callbacks instead of managing JS values manually.
I also did the following in this commit:
- Correct the coding style in jsb_socketio.cpp
- Remove android.mk in the Xcode project
2015-08-06 17:20:04 +08:00
fac7a78fc8
improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI
...
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
2015-08-05 16:10:14 +08:00
00b7e98c89
improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.
2015-08-04 16:24:08 +08:00
979700e343
there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program
2015-08-04 11:30:30 +08:00
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
5d281d45ef
recover the physics3DShape initHeightfield api
2015-08-01 18:29:48 +08:00
bcec599993
Merge branch 'v3' into constructedWith3D_3#12404
2015-08-01 15:38:26 +08:00
d52a5da1d8
Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404
...
Constructed with3d
2015-08-01 10:09:08 +08:00
80e812e5a0
add Physics3DShape support constructor
2015-07-31 18:17:35 +08:00
113233b8df
add Camera support constructor
2015-07-30 18:00:51 +08:00
507a094653
Merge pull request #13108 from jianglong0156/constructedWith3D#12404
...
improve jsval_to_physics3DRigidBodyDes
2015-07-30 17:58:16 +08:00
52ed2e8d4e
add conversion function declare, use to the physics3d auto conversion the data
2015-07-30 14:56:24 +08:00
a1a9e281a3
add conversion cpp file into iOS project (reverted from commit 439bc8a99f)
2015-07-30 14:37:58 +08:00
642ccac5dc
Merge pull request #12927 from ricardoquesada/spine-2.3
...
Adds support for Spine runtime 2.3
2015-07-29 13:33:15 -07:00
f71f9b2b15
improve the code
2015-07-28 16:32:56 +08:00
3fa9463ec7
Fix manual bindings for changed API in spine
2015-07-28 15:11:20 +08:00
ec4d53fcf7
add 3d conversion
2015-07-28 10:08:58 +08:00
a2a32ef58c
Release docs for v3.7.1
2015-07-25 15:16:39 +08:00
29b9ed685f
Add BoneNode/SkeletonNode/SkinNode JS bindings
2015-07-24 15:48:34 +08:00
6110700615
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend
2015-07-23 15:25:33 +08:00
85d4ce0d5a
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
docs/RELEASE_NOTES.md
tools/cocos2d-console
tools/tojs/cocos2dx.ini
2015-07-21 11:39:24 +08:00
e2068ab84a
Update versions and docs for v3.7
2015-07-16 16:53:43 +08:00
949eca2846
Improve some manual binding code
2015-07-16 14:34:14 +08:00
490d5a3747
Remove cleanup from auto bindings add made it support override in JS
2015-07-16 14:09:26 +08:00
436564f922
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
docs/RELEASE_NOTES.md
web
2015-07-15 14:39:40 +08:00
c126aac35f
v3.7 rc1 release doc
2015-07-14 23:21:34 +08:00
efffea5b91
Fixed #12834 Invoke cleanup function when override in JS
2015-07-14 15:35:29 +08:00
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
69cdaca306
Auto add extend to jsb need to extend classes
2015-07-10 09:49:39 +08:00
6238ddebf3
Merge remote-tracking branch 'upstream/v3.7-release' into v3
2015-07-07 10:18:43 +08:00
1f48beee1e
Reorganize code
2015-07-03 12:55:55 +08:00
155b9b918c
Add retain/release for XMLHTTPReqest in JSB
2015-07-03 11:01:43 +08:00
1b22438792
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
...
Conflicts:
cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
221d33a431
Fixed iOS/JS-Bind callStaticMethod() with bool arg
2015-06-30 14:00:28 +09:00
15c763d84a
Update engine version
2015-06-29 18:21:06 +08:00
7ff383e4d2
add the return value
2015-06-23 20:27:30 +08:00
276ce3a0a7
Update versions
2015-06-19 09:56:19 +08:00
c6d4f283bb
Fix compilation issue in navmesh conversion
2015-06-19 08:11:45 +08:00
91bc19fb29
Merge branch 'v3_origin' into navmesh
...
Conflicts:
tests/js-tests/src/Physics3DTest/Physics3DTest.js
2015-06-18 23:50:19 +08:00
61db9ef103
modify cocos2d_specifics ， add navmesh head file。 modify template。add navmesh head file and register code
2015-06-18 23:21:53 +08:00
b757837239
Move NavMesh to jsb namespace
2015-06-18 22:57:41 +08:00
10a8adad53
Change physics3d api to jsb namespace
2015-06-18 20:39:40 +08:00
4fe1542d17
add navmesh tests
2015-06-18 19:22:27 +08:00
85c40b6580
Merge pull request #8 from pandamicro/physics3d
...
Physics3d
2015-06-18 14:54:32 +08:00
811173ea3b
Fix Physics3D test and js bindings
2015-06-18 14:33:16 +08:00
3ffc0e6be6
Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d
2015-06-18 09:20:37 +08:00
a94b49bdef
Add nav mesh bindings
2015-06-17 23:41:12 +08:00
85e8a407b1
Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3
...
# Conflicts:
# tests/js-tests/project/Classes/AppDelegate.cpp
# tools/tojs/genbindings.py
2015-06-17 19:58:24 +08:00
683812d817
Update Physics3D test for js.
2015-06-17 18:50:55 +08:00
b265033a41
add testcase and manual bindings
2015-06-17 18:38:18 +08:00
27d0f51e9b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
2015-06-15 16:13:36 +08:00
b4ca8c1489
Merge pull request #15 from pandamicro/spritepolygon
...
Add SpritePolygon JSB bindingsJSB bindings
2015-06-15 15:47:02 +08:00
852b9b42b9
Remove jsb_cocos2dx_experimental_manual
2015-06-15 10:46:57 +08:00
032f231ed4
Add bindings for AutoPolygon and PolygonInfo
2015-06-13 11:14:57 +08:00
f9057b3f32
Merge pull request #12284 from pandamicro/v3
...
Fix template android compilation issue on physics3d
2015-06-12 21:10:40 +08:00
e9d648f151
Fix physics 3d macro include issue
2015-06-12 15:41:46 +08:00
df1219c92d
Update manual conversion for sprite polygon
2015-06-12 12:56:37 +08:00
c317eb428a
fix webview crash in android
2015-06-11 17:28:02 +08:00
e0eff26674
Fix component function execution issue in JSB
2015-06-05 00:03:21 +08:00
25e047eb41
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into skipComponentFns
2015-06-04 23:29:45 +08:00
af756c50dc
Merge pull request #12184 from pandamicro/v3
...
Fix issue that __JSDownloaderDelegator::onError get called twice
2015-06-04 20:42:35 +08:00
e75dee6e7c
Remove C++ invocation functions of Component
2015-06-04 20:10:10 +08:00
2da754dcf2
Merge pull request #12157 from chengstory/v2_addOnEnterAndOnExitToCCNode
...
Add onEnter and onExit of components to CCNode's onEnter and onExit function
2015-06-04 18:39:52 +08:00
ba1191f98f
Merge pull request #12132 from pandamicro/v3_origin
...
cocos2d/cocos2d-js#1658 : Fix js_load_remote_image issue with multithread
2015-06-04 17:51:11 +08:00
2c168130ed
Fix jsbinding calls for CCComponent
2015-06-04 15:59:05 +08:00
83f7f30c1c
Fix issue that __JSDownloaderDelegator::onError get called twice
2015-06-04 15:03:20 +08:00
9c23126d9e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-06-04 13:14:34 +08:00
4c6f67fd7e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
tools/bindings-generator
web
2015-06-02 10:12:22 +08:00
fdec552ed7
Fix cocos2d/cocos2d-js#1658 : Fix js_load_remote_image issue with multithread and improve Downloader
2015-06-02 10:08:13 +08:00
722b6b1baf
add video player binding files
2015-05-29 11:39:47 +08:00
7820610f13
Merge branch 'modifyTestResource' into jsWebviewTest
...
Conflicts:
cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
tests/js-tests/project.json
tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
tools/tojs/genbindings.py
2015-05-26 17:49:17 +08:00
81d562803b
upgrade rapidjson to 1.0.2
2015-05-25 11:43:03 +08:00
1366f615dd
mac && ios works
2015-05-22 10:43:37 +08:00
342734e3b5
Merge remote-tracking branch 'upstream/v3' into physics
2015-05-21 21:15:42 +08:00
83237b8dbd
add physics3d js manual binding and tests
2015-05-21 18:05:49 +08:00
3523173594
removed CC_PLATFORM_WP8
2015-05-20 07:58:39 -07:00
0a3e6338f1
Merge pull request #11834 from pandamicro/v3_origin
...
Sync fixes in Cocos2d-JS
2015-05-14 13:38:18 +08:00
2685df73f2
Fix spine crash issue
2015-05-14 10:40:37 +08:00
3190d0e5fb
Add localStorage.clear test case
2015-05-12 19:02:22 +08:00
c9ee849a2c
Add localStorage.clear in JSB
2015-05-12 18:02:14 +08:00
80326aa40e
add webiew jsb code
2015-05-12 10:30:51 +08:00
234f4db8a0
add SpritePolygon binding && js tests
2015-05-11 17:04:23 +08:00
b4f2d94109
Update js bindings & js tests.
2015-05-05 10:50:19 +08:00
pandamicro