Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
34,164 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

34164 Commits

Author SHA1 Message Date
zilongshanren 1910f79b2f fix scale9sprite gray state opacity issue. 
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
 2016-01-07 15:26:14 +08:00
xiaofeng11 4785f3af70 Merge pull request #14850 from xiaofeng11/v3.10 
Fix pre-compiled framework js project will crash if use "Force Quit" to terminate program.
 2016-01-07 11:32:16 +08:00
XiaoFeng 1554b6e676 Fix pre-compiled framework js project will crash if use "Force Quit" to terminate program. 2016-01-07 10:42:47 +08:00
Ricardo Quesada b673b5789d Merge pull request #14849 from ricardoquesada/gc_fix_for_cpp 
ouch... doesn't crash on pure C++ projects
 2016-01-06 11:17:38 -08:00
Ricardo Quesada ddb142e211 ouch... doesn't crash on pure C++ projects 2016-01-06 11:16:55 -08:00
pandamicro 8b773e288c Merge pull request #14846 from xiaofeng11/v3.10 
[ci skip] Fix more js parser font setting error
 2016-01-06 20:45:05 +08:00
XiaoFeng 0fcfb359d2 Fix more js parser font setting error 2016-01-06 20:42:27 +08:00
xiaofeng11 87be7e3531 Merge pull request #14844 from xiaofeng11/v3.10 
[ci skip] Fix js parser use resource path name for font name when font name is blank in BMFontLoader and ButtonLoader
 2016-01-06 19:45:24 +08:00
XiaoFeng d82b6b6f1c Fix js parser use resource path name for font name when font name is blank in BMFontLoader and ButtonLoader 2016-01-06 19:36:32 +08:00
pandamicro bf405c9b5a Merge pull request #14838 from chengstory/UpdateReleaseNote3 
[ci skip]Update RELEASE_NOTES.
 2016-01-06 09:54:51 +08:00
zhangcheng a19cceedb5 [ci skip]Update RELEASE_NOTES. 2016-01-06 09:50:00 +08:00
pandamicro 343eec6a25 Merge pull request #14828 from zilongshanren/v3.10 
add overFlow enum to jsb and lua.
 2016-01-05 13:46:25 +08:00
pandamicro 74dc0cc4d0 Merge pull request #14836 from chengstory/UpdateReleaseNote2 
[ci skip]Fix releasenote error.
 2016-01-05 11:29:29 +08:00
zhangcheng 5f85f6154b fix error 2016-01-05 11:24:55 +08:00
pandamicro 013ad3367a Merge pull request #14834 from chengstory/UpdateSubmodule 
[ci skip]Update RELEASE_NOTES
 2016-01-05 10:57:32 +08:00
zhangcheng a6123bee06 Fix error. 2016-01-05 10:52:03 +08:00
zhangcheng 524a4f4c22 Update RELEASE_NOTES. 2016-01-05 10:27:06 +08:00
zhangcheng 324d1f905e [ci skip]Update RELEASE_NOTES.md. 2016-01-05 10:23:52 +08:00
zilongshanren b45e96f77e fix indent issue 2016-01-05 10:20:05 +08:00
zilongshanren 81428737c9 fix compilation errors 2016-01-05 09:51:37 +08:00
zilongshanren ad49fc562b Merge pull request #14833 from cocos2d/slackmoehrle-patch-2 
Added License under Contributing
 2016-01-05 09:20:28 +08:00
zilongshanren dd136dbc07 Merge pull request #14832 from cocos2d/slackmoehrle-patch-1 
added myself :-)
 2016-01-05 09:19:34 +08:00
Slack-Moehrle 614cf5d027 Added License under Contributing 
Added License under Contributing
 2016-01-04 14:48:40 -05:00
Slack-Moehrle f052fd45be added myself :-) 
added myself :-)
 2016-01-04 14:46:28 -05:00
zilongshanren 100a119181 add overFlow enum to jsb and lua. 
1. change clamp to 1 and shrink to 2
 2016-01-04 21:43:37 +08:00
Andreas Loew 69eed4b99c Updated comment 2016-01-04 11:19:40 +01:00
pandamicro 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
pandamicro 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
zhangcheng 843da8837b Update cocos2d-js web submodule to latest. 2016-01-04 10:09:09 +08:00
pandamicro 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
zhangcheng d3525d8a1d 1, Fix error english explain. 
2, Fix error API.
3, Fix some bugs.
 2015-12-31 15:07:48 +08:00
xiaofeng11 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
zilongshanren 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
Wenhai Lin 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
zilongshanren 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
zilongshanren 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
zilongshanren 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
xiaofeng11 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
Ricardo Quesada 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
Ricardo Quesada 2ee5dafbbc fixes xcodeproj 2015-12-29 18:28:34 -08:00
Ricardo Quesada b92b67edad moves macro definition to `ccConfig.h` 2015-12-29 17:36:02 -08:00
Ricardo Quesada 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
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 15:29:01 2015 -0800

    Merge branch 'v3' into v3_js_memory_test_and_fixes

commit 79e926a970e3153ee826b299c3417fb6ac599153
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 21 21:27:19 2015 -0800

    fixes crashes

commit 76f3910748e15c4ea179eab846f24f3e65d52d2d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 21 11:57:56 2015 -0800

    Adds standalone test for JS GC memory

    and fixes leaks on extended/subclassed objects
 2015-12-29 17:36:02 -08:00
Ricardo Quesada 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
Ricardo Quesada 0a6bff7c71 moves macro definition to `ccConfig.h` 2015-12-29 17:33:08 -08:00
Ricardo Quesada 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
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 15:29:01 2015 -0800

    Merge branch 'v3' into v3_js_memory_test_and_fixes

commit 79e926a970e3153ee826b299c3417fb6ac599153
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 21 21:27:19 2015 -0800

    fixes crashes

commit 76f3910748e15c4ea179eab846f24f3e65d52d2d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 21 11:57:56 2015 -0800

    Adds standalone test for JS GC memory

    and fixes leaks on extended/subclassed objects
 2015-12-29 17:33:08 -08:00
Ricardo Quesada 634dd45c8f moves macro definition to `ccConfig.h` 2015-12-29 14:26:41 -08:00
Ricardo Quesada 9c7edc09f4 Merge pull request #14816 from ricardoquesada/tvos_fixes 
fixes compilation issues on tvOS
 2015-12-29 12:58:45 -08:00
Ricardo Quesada 77aa3871b6 fixes compilation issues on tvOS 2015-12-29 12:30:00 -08:00