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

33723 Commits

Author SHA1 Message Date
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 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
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
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
pandamicro 6ea389f475 Merge pull request #14815 from pandamicro/v3.10 
Made require overwritable
 2015-12-29 22:06:00 +08:00
pandamicro daac6ceb08 Made require overwritable 2015-12-29 21:28:30 +08:00
XiaoFeng 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
lunhao.guo d3387f5ab2 change the resolution size of js template to (960 * 640) ,consistent with other templates 2015-12-29 15:24:21 +08:00
lunhao.guo d216785f43 fix compile error in visual studio 2015 2015-12-29 15:02:22 +08:00
zhangcheng 92d5d0bde7 [v](#v310) -> [v3.10](#v310) 2015-12-29 09:48:14 +08:00
xiaofeng11 69a6406661 Merge pull request #14805 from pandamicro/v3.10 
Fix JSB issues on win32
 2015-12-25 20:06:47 +08:00
pandamicro fe1336bdc7 Fix chipmunk cpSpaceAddCollisionHandler issue on argument parsing 2015-12-25 19:08:33 +08:00
pandamicro 2ce866c4ba Fix jsb_ref_rebind issue on win32 (mystery GC crash) 2015-12-25 19:08:32 +08:00
zhangcheng 722669b3e2 Update Release notes. 2015-12-25 18:58:31 +08:00
pandamicro eea1c814df Merge pull request #14803 from super626/v3.10 
Fix NavMeshDebugDraw bug on iphone5s
 2015-12-25 18:41:42 +08:00
yangxiao 50d16c13df remove unused code 2015-12-25 17:54:58 +08:00
xiaofeng11 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
zhangcheng 755d2559cf Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into Update3.10ReleaseNote 2015-12-25 16:25:28 +08:00
xiaofeng11 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
yangxiao 20e2b4acbd fix NavMeshDebugDraw on iphone5s 2015-12-25 16:02:03 +08:00
zilongshanren 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
Liam c92b563c28 fix layout backimage size error with neweset scale9sprite 2015-12-25 14:11:56 +08:00
肖峰 dea99211fb Merge https://github.com/cocos2d/cocos2d-x/pull/14784 to V3.10 2015-12-25 11:44:11 +08:00
pandamicro 3a09bd400d Merge pull request #14799 from xiaofeng11/v3.10_xf 
[ci skip] Bug fix
 2015-12-24 21:38:16 +08:00
xiaofeng11 ceedc80b44 Merge pull request #14800 from GuoLunHao/v3.10_updateConsole 
update cocos2d-console submodule to 6cc7a09dc64a57fd5307c2ba3a0a705f8…
 2015-12-24 20:37:36 +08:00
lunhao.guo 1871813c2b update cocos2d-console submodule to 6cc7a09dc64a57fd5307c2ba3a0a705f834dfd97 2015-12-24 20:35:12 +08:00