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

33699 Commits

Author SHA1 Message Date
肖峰 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
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
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
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
XiaoFeng 88196a4879 Both Image/blocks9ss.plist and animations/grossini.plist have image frames grossini_dance_*.png, and in Image/blocks9ss.plist the frames is smaller than frames in animations/grossini.plist, so if load Image/blocks9ss.plist first, the samples use frames named grossini_dance_*.png in animations/grossini.plist will crash. After check in source file, we found these frames in Image/blocks9ss.plist hasn't been used, so we changed frames name in Image/blocks9ss.plist to avoid crash. 2015-12-24 20:22:01 +08:00
pandamicro 599b22c816 Merge pull request #14798 from chengstory/UpdateSubmodule 
Update Web Submodule
 2015-12-24 19:07:33 +08:00
zhangcheng 755f46e0cb Update Submodule: https://github.com/cocos2d/cocos2d-html5/pull/3223 2015-12-24 19:05:19 +08:00
pandamicro 169d3fc4b8 Merge pull request #14797 from VisualSJ/v3.10 
Fixed a bug about should not be used `gl` in canvs mode
 2015-12-24 17:51:03 +08:00
VisualSj 79bf3897d7 Fixed a bug about should not be used `gl` in canvs mode 2015-12-24 16:33:46 +08:00
zilongshanren d5147a86c1 Merge pull request #14795 from liamcindy/v3_ui_BMFont 
remove error logic for BMFont with newest CCLabel
 2015-12-24 15:39:15 +08:00
Liam d005bd18b7 remove error logic 2015-12-24 14:39:15 +08:00
xiaofeng11 434c79ae90 Merge pull request #14793 from super626/fixsprite2 
It already been reviewed and compile by jenkins in https://github.com/cocos2d/cocos2d-x/pull/14697.
We need merge it to V3.10 to file TMX render bug.
 2015-12-24 09:40:36 +08:00
Ricardo Quesada 0f92513eeb Merge pull request #14792 from cocos2d/revert-14697-v3.10-fixsprite 
Revert "fix setflip for batch sprite"
 2015-12-23 09:54:19 -08:00
Ricardo Quesada 707f08c557 Revert "fix setflip for batch sprite" 2015-12-23 09:54:04 -08:00
Ricardo Quesada 0d0534a2e1 Merge pull request #14697 from super626/v3.10-fixsprite 
fix setflip for batch sprite
 2015-12-23 09:53:24 -08:00
pandamicro dea1ef1290 Merge pull request #14790 from pandamicro/v3.10 
Fixed WebSocket JSB crash issue
 2015-12-24 01:37:17 +08:00
pandamicro acf03c06d5 Fixed WebSocket JSB crash issue 2015-12-23 23:28:14 +08:00
zilongshanren 830eb3433f Merge pull request #14786 from liamcindy/v3_ui_widget 
fix uiWidget clipping error with Node
 2015-12-23 18:57:15 +08:00
xiaofeng11 519e69813d Merge pull request #14785 from xiaofeng11/v3.10 
Fix in js-test, after UITest->UIFocus tests, in all other test scene when button clicked program will crash
 2015-12-23 18:43:07 +08:00
XiaoFeng c181390881 Fix in js-test, after UITest->UIFocus tests, in all other test scene when button clicked program will crash 2015-12-23 18:39:06 +08:00
Liam bcc2ed0e2a update for scrollView test 2015-12-23 18:14:09 +08:00
Liam 0cac519e5c fix uiWidget clipping error with Node 2015-12-23 16:05:52 +08:00
zilongshanren 851d288d0b Merge pull request #14781 from zilongshanren/rollbackSlider 
Rollback slider and loadingbar in non scale9 mode
 2015-12-23 15:04:55 +08:00
zilongshanren 2a2f184449 refine code with DRY. 2015-12-23 14:43:25 +08:00
zilongshanren 847094ec7d ui::loadingBar -> add flip logic back 2015-12-23 14:34:36 +08:00
pandamicro 45d1d655cc Merge pull request #14779 from xiaofeng11/v3.10 
Bug fix & update
 2015-12-23 12:35:52 +08:00
pandamicro d11b2b4bfd Merge pull request #14782 from geron-cn/v3.10 
update submodule: web
 2015-12-23 12:34:24 +08:00