abe020e808
Merge pull request #15654 from minggo/ipv6-compatibility
...
Ipv6 compatibility
2016-05-17 09:25:14 +08:00
88db5d3660
use AF_UNSPEC to support ipv6
2016-05-16 15:15:29 +08:00
74af3b5232
merge v3.11 back to v3
2016-05-12 09:50:03 +08:00
1023c8730e
[JSB] Made cc.log overwrite-able
2016-05-11 11:58:24 +08:00
d0fc3ec4c4
Add cc.game.end to close game window
2016-05-07 14:37:36 +08:00
1cc0130bdd
Fixes signed/unsigned mismatch warnings.
...
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
2016-04-26 17:53:25 +08:00
fcd8aa30f4
Merge pull request #14312 from TimothyZhang/jsb-getDataFromFile-should-return-null-if-read-failed
...
return null if read failed in js_cocos2dx_CCFileUtils_getDataFromFile
2016-04-21 14:17:44 +08:00
87be03fe9b
Fix compilation error with Platform Toolset v120 for WinRT
2016-04-19 16:13:12 +09:00
19c2893509
Replace cc_utf8_to_utf16 with UTF8ToUTF16 to avoid deprecation warning
2016-04-18 19:50:59 +09:00
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
3eb7d62e6e
fix: compile in Windows
...
Github issue #15372
2016-04-15 09:33:19 +08:00
79cfe8ac0e
Fix a issue in cc.CallFunc JSB implementation
2016-04-11 11:12:13 +08:00
f9f9551645
Fix some issues
...
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-11 11:11:34 +08:00
bb2cfc7308
Update engine version
2016-04-11 11:11:17 +08:00
f18763033d
Merge pull request #15390 from pandamicro/v3
...
Fix a issue in cc.CallFunc JSB implementation
2016-04-08 09:54:13 +08:00
f1108bfbe3
Fix a issue in cc.CallFunc JSB implementation
2016-04-07 23:49:57 +08:00
e6d4beef8a
Merge pull request #15388 from pandamicro/v3
...
Issue fixes and update engine version
2016-04-07 23:15:39 +08:00
1ada222c36
Fix some issues
...
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-07 22:40:32 +08:00
817f4f4871
Update engine version
2016-04-07 22:36:29 +08:00
ae369c1b68
fix: compile in Windows
...
Github issue #15372
2016-04-06 10:26:46 -07:00
6b167a1aa1
Merge pull request #15335 from mogemimi/fix-typos
...
Fix typos in comments and strings
2016-04-06 11:32:46 +08:00
5b10ab3c2d
rollback chipmunk export change
2016-03-31 11:01:58 +08:00
44080a04d8
Fix typos in comments and strings
2016-03-29 10:52:17 +09:00
32e408487f
Fixes import path for m and mm files.
2016-03-21 20:12:58 +08:00
931d56bc10
Fixes includes in .m and .mm files.
2016-03-21 11:02:00 +08:00
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
589d7e47bf
fix polygon api typo
2016-03-17 17:16:56 +08:00
a1b4cd845f
Revert "Fix incorrect function name of getTrianglesCount"
2016-03-17 16:38:17 +08:00
2f75effe96
Add backwards compatibility for 'getTriaglesCount'
2016-03-17 14:22:09 +09:00
23a05ddab2
Fix incorrect function name of getTrianglesCount
2016-03-15 07:39:42 +09:00
06ac05259b
More fix to compile libjscocos2dx as dll under win32
2016-03-14 12:06:14 +08:00
3acea03924
Update deps lib and chipmunk manual binding to support both libcocos2dx and libjscocos2dx compiled as dll file under win32 system
2016-03-11 15:44:28 +08:00
bc11e24019
Squashed commit of the following:
...
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 13:11:40 2016 -0800
binary file 82
commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:56:39 2016 -0800
fore multiple in windows phone 8.1 too
commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:50:45 2016 -0800
force multiple
commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 10:44:40 2016 -0800
compiles
commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d339af2f4e
2016-02-29 13:53:00 -08:00
34b1c1bc18
exported js_get_type_from_native for cocos2d::Node type.
2016-02-25 09:47:19 +08:00
7955721cb9
exported api.
2016-02-25 09:46:34 +08:00
37db8407f1
Merge pull request #14867 from dumganhar/refactor-websocket
...
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-02-21 06:59:59 -08:00
1d9e688707
Fix typos in documentation
2016-02-18 16:16:36 +09:00
7d43e35741
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket
2016-02-17 14:56:32 +08:00
6e7c9ab8db
Cleanup log
2016-02-15 17:19:37 +08:00
94c62bed53
Remove ScriptingCore::retainCount
2016-02-15 16:32:00 +08:00
cb4d24e1ee
Merge pull request #14759 from pandamicro/hbmemory
...
Implement Full GC Relied memory model
2016-02-14 14:48:01 +08:00
c03d2c57d7
Made console.log writable
2016-02-05 15:13:07 +08:00
4992037c5c
Avoid creating temporary string objects
2016-02-03 23:12:37 +08:00
72be9a3966
Fix other issues
2016-02-02 23:39:18 +08:00
3c550853bc
Fix restart game issue and windows crash issue
2016-02-02 23:38:37 +08:00
08056b7b02
Fix debugger issue
2016-02-02 16:45:17 +08:00
01f41921d1
Fix enableDebugger issue
2016-01-28 01:55:10 +08:00
e2568b3a6f
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
...
Conflicts:
tests/js-memory-gc-tests/src/tests-main.js
2016-01-28 01:12:49 +08:00
de9b51c0cf
Fix other GC issues
2016-01-28 01:03:50 +08:00
554523a201
Use JS::Heap instead of Mozilla::maybe to improve stability
2016-01-28 01:03:13 +08:00
93987c7848
Remove PersistentRooted as much as possible and use pure JS references
2016-01-26 19:33:35 +08:00
d6cedb88ec
Remove JS::Persistent and move js object reference into JS scope
2016-01-24 19:47:26 +08:00
ed9ed6c92f
Don't change the behavior of WebSocket::close method. WebSocket::close is an synchronous method before, adds a WebSocket::closeAsync method for asynchronous closing.
2016-01-22 14:22:33 +08:00
73793a8317
Fix macro redefinition warning in JS bindings/Mac
2016-01-20 23:17:24 +09:00
39ab445f7d
Merge pull request #14904 from pandamicro/v3
...
[ci skip]Add more test case to jsb memory test
2016-01-20 11:43:49 +08:00
fc19435123
Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory
...
Conflicts:
cocos/base/ccConfig.h
cocos/scripting/js-bindings/manual/ScriptingCore.cpp
cocos/scripting/js-bindings/manual/ScriptingCore.h
cocos/scripting/js-bindings/script/jsb_prepare.js
2016-01-18 16:40:00 +08:00
f8016978ff
Fix an improper macro syntax for windows platform
2016-01-18 14:28:39 +08:00
8bc9f712ea
Merge pull request #14895 from minggo/firefox-remote-debug
...
web console supports for JSB projects
2016-01-15 21:27:27 +08:00
e062ade514
make require() returns the value of last statement
2016-01-15 18:02:11 +08:00
f9e8ae0f09
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-01-13 21:14:38 +08:00
41dd44c75d
Fix some typos in docs
2016-01-11 19:23:05 +09:00
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
b92b67edad
moves macro definition to `ccConfig.h`
2015-12-29 17:36:02 -08:00
7cd80cb669
Adds iOS tests, calls GC after replacing scene
...
and some bug fixes
Squashed commit of the following:
commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:07:01 2015 -0800
adds missing file
commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:02:27 2015 -0800
disables GC by default
commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 18:57:14 2015 -0800
Adds iOS test and calls GC after replacing the scene
commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
2015-12-29 17:36:02 -08:00
daac6ceb08
Made require overwritable
2015-12-29 21:28:30 +08:00
692c0f8a0e
adds tvOS support
...
Ported tests:
- js-tests
- cpp-tsts
- lua-tests
- game-controller tests
all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
fe1336bdc7
Fix chipmunk cpSpaceAddCollisionHandler issue on argument parsing
2015-12-25 19:08:33 +08:00
2ce866c4ba
Fix jsb_ref_rebind issue on win32 (mystery GC crash)
2015-12-25 19:08:32 +08:00
acf03c06d5
Fixed WebSocket JSB crash issue
2015-12-23 23:28:14 +08:00
b0c4adcbd0
Fix method name spelling in AutoPolygon
2015-12-23 19:07:03 +09:00
616f5c0a01
Correct return type to adopt GC Rooting API
2015-12-21 11:07:40 +08:00
4e36e24993
Correct return type to adopt GC Rooting API
2015-12-21 10:42:54 +08:00
81918f51ea
Fix event handle function issue with compartment
...
and Fix a crash issue caused by malformed js usage
2015-12-21 00:16:17 +08:00
8d712a4c45
Expose CC_ENABLE_GC_FOR_NATIVE_OBJECTS
2015-12-21 00:16:17 +08:00
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
minggo