69eed4b99c
Updated comment
2016-01-04 11:19:40 +01:00
10558cadd1
Merge pull request #14823 from chengstory/UpdateWebSubmodule
...
[ci skip]Update cocos2d-js web submodule to latest.
2016-01-04 10:13:06 +08:00
abccd72c35
Merge pull request #14791 from ricardoquesada/v3_js_fixes_squashed
...
Adds iOS tests, calls GC after replacing scene
2016-01-04 10:09:33 +08:00
843da8837b
Update cocos2d-js web submodule to latest.
2016-01-04 10:09:09 +08:00
13b3611a1c
Merge pull request #14766 from chengstory/Update3.10ReleaseNote
...
[ci skip]Update cocos2d-x 3.10 Release note.
2015-12-31 15:27:14 +08:00
d3525d8a1d
1, Fix error english explain.
...
2, Fix error API.
3, Fix some bugs.
2015-12-31 15:07:48 +08:00
f1bc58ee82
Merge pull request #14817 from xiaofeng11/v3.10
...
Fix pre-compiled frame work js project will crash when exit on MacOS
2015-12-31 13:32:56 +08:00
ba32f4ea2b
Merge pull request #14818 from WenhaiLin/oh3.10
...
Fixed WebSocket may automatically disconnected if invoke `send` several times in quick succession on Android.
2015-12-31 12:50:50 +08:00
168e851cce
Fixed WebSocket may automatically disconnected if invoke `send` several times in quick succession on Android.
2015-12-31 10:42:06 +08:00
7bd9ceda10
Use method same as MacOS solution fix js pre-compiled framework project crash when exit on windows.
2015-12-31 09:54:32 +08:00
0c0f241c5e
Fix pre-compiled frame work js project will crash when exit on MacOS
2015-12-30 19:42:19 +08:00
efbbdb1f58
Merge pull request #14813 from xiaofeng11/v3.10_xf_fix
...
Fix boundingRectWithSize compile failed with OSX 10.10 or lower version SDK
2015-12-30 13:51:41 +08:00
2feed57572
Merge pull request #14814 from xiaofeng11/v3.10_xf
...
Fix js project with pre-build frameworks crash when exit program
2015-12-30 11:39:35 +08:00
7467611daf
Merge pull request #14810 from GuoLunHao/v3.10_templates
...
fix compile error in visual studio 2015
2015-12-30 11:39:00 +08:00
efac4a17d4
Merge pull request #14809 from GuoLunHao/v3.10_js_window_size
...
change the resolution size of js template to (960 * 640) ,consistent with other templates
2015-12-30 11:30:24 +08:00
b599f2f8d1
Merge branch 'v3_js_fixes_squashed' of github.com:ricardoquesada/cocos2d-x into v3_js_fixes_squashed
2015-12-29 18:30:25 -08:00
2ee5dafbbc
fixes xcodeproj
2015-12-29 18:28:34 -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
046584c7fd
Merge branch 'v3_js_fixes_squashed' of github.com:ricardoquesada/cocos2d-x into v3_js_fixes_squashed
2015-12-29 17:33:30 -08:00
0a6bff7c71
moves macro definition to `ccConfig.h`
2015-12-29 17:33:08 -08:00
8e02749993
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:33:08 -08:00
634dd45c8f
moves macro definition to `ccConfig.h`
2015-12-29 14:26:41 -08:00
9c7edc09f4
Merge pull request #14816 from ricardoquesada/tvos_fixes
...
fixes compilation issues on tvOS
2015-12-29 12:58:45 -08:00
77aa3871b6
fixes compilation issues on tvOS
2015-12-29 12:30:00 -08:00
3a3bf8da0f
Merge pull request #14808 from ricardoquesada/tvos_support
...
adds tvOS support
2015-12-29 09:01:23 -08:00
6ea389f475
Merge pull request #14815 from pandamicro/v3.10
...
Made require overwritable
2015-12-29 22:06:00 +08:00
daac6ceb08
Made require overwritable
2015-12-29 21:28:30 +08:00
52fb3fd098
Fix js project with pre-build frameworks crash when exit program
2015-12-29 19:38:37 +08:00
770f3d7f8e
Fix boundingRectWithSize compile failed with OSX 10.10 or lower version SDK
2015-12-29 18:31:20 +08:00
d3387f5ab2
change the resolution size of js template to (960 * 640) ,consistent with other templates
2015-12-29 15:24:21 +08:00
d216785f43
fix compile error in visual studio 2015
2015-12-29 15:02:22 +08:00
92d5d0bde7
[v](#v310) -> [v3.10](#v310)
2015-12-29 09:48:14 +08:00
b6d1edc8e7
Merge branch 'tvos_support' of github.com:ricardoquesada/cocos2d-x into tvos_support
2015-12-28 16:43:01 -08:00
666a6c6f88
adds missing scheme files
2015-12-28 16:42:44 -08:00
492389fd5b
Update CCPlatformConfig.h
2015-12-28 16:03:48 -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
69a6406661
Merge pull request #14805 from pandamicro/v3.10
...
Fix JSB issues on win32
2015-12-25 20:06:47 +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
722669b3e2
Update Release notes.
2015-12-25 18:58:31 +08:00
eea1c814df
Merge pull request #14803 from super626/v3.10
...
Fix NavMeshDebugDraw bug on iphone5s
2015-12-25 18:41:42 +08:00
50d16c13df
remove unused code
2015-12-25 17:54:58 +08:00
d61ec5bb08
Merge pull request #14804 from xiaofeng11/v3.10
...
Fix variable type mismatch.
2015-12-25 17:53:08 +08:00
728682d68e
Fix variable type mismatch.
2015-12-25 17:18:15 +08:00
755d2559cf
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into Update3.10ReleaseNote
2015-12-25 16:25:28 +08:00
b219828d69
Merge pull request #14801 from xiaofeng11/v3.10
...
Merge https://github.com/cocos2d/cocos2d-x/pull/14784 to V3.10
2015-12-25 16:14:27 +08:00
20e2b4acbd
fix NavMeshDebugDraw on iphone5s
2015-12-25 16:02:03 +08:00
b2a58b3d4a
Merge pull request #14802 from liamcindy/v3_ui_layout
...
fix layout backimage size error with newest scale9sprite
2015-12-25 15:27:20 +08:00
c92b563c28
fix layout backimage size error with neweset scale9sprite
2015-12-25 14:11:56 +08:00
Andreas Loew