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

12840 Commits

Author SHA1 Message Date
boyu0 d5982ade81 issue #2771: add resource 2013-10-23 11:18:35 +08:00
boyu0 17422c3123 issue #2771: fix some compile error in win32 2013-10-23 11:08:21 +08:00
boyu0 51801d9218 issue #2771: fix some compile error in android and win32 2013-10-23 10:11:08 +08:00
samuelhu 26caaa0a36 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-23 09:57:21 +08:00
minggo 0169189f6a Merge pull request #3992 from Dhilan007/di2905 
issues #2905:add SimpleGame vs-project
 2013-10-22 18:41:26 -07:00
minggo e8184a64fc Merge pull request #3993 from minggo/iss2905-adjust_folder 
Samples build ok on linux
 2013-10-22 03:40:57 -07:00
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
Dhilan007 3252a89791 issues #2905:add SimpleGame vs-project 2013-10-22 18:11:07 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
boyu0 24561860f0 issue #2771: add ray cast test 2013-10-22 18:00:24 +08:00
samuelhu 5f769b2313 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-22 16:52:44 +08:00
James Chen feee6ca84b Merge pull request #3978 from HoGarfield/cc.RESOLUTION_POLICY 
Add cc.RESOLUTION_POLICY to jsb_cocos2d.js,so it can use setDesignResolutionSize in cc.EGLView
 2013-10-22 01:34:44 -07:00
James Chen c47d2b7ae2 Update AUTHORS 2013-10-22 16:34:10 +08:00
James Chen 7a1b6f2972 Update CHANGELOG 2013-10-22 16:33:41 +08:00
James Chen 59b5c26abf Merge pull request #3991 from HoGarfield/AnimationManager 
closed #3040: Modify the sequenceCompleted method in CCBAnimationManager,So it can set the next sequence in callback
 2013-10-22 01:30:06 -07:00
samuelhu be1f17ca0f issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +08:00
minggo d968ef6949 Merge pull request #3990 from Dhilan007/di2905 
issues #2905:add miss file
 2013-10-22 00:58:34 -07:00
garfield_ho 0002815acb Modify the sequenceCompleted method in CCBAnimationManager,So it can set the next sequence in callback 2013-10-22 15:56:35 +08:00
Dhilan007 31a2217178 issues #2905:add miss file 2013-10-22 15:56:08 +08:00
garfield_ho 55d45081f6 Fixed name 2013-10-22 15:41:43 +08:00
James Chen 7ef5bd8110 Update AUTHORS 2013-10-22 15:34:32 +08:00
James Chen b56a9962a6 Update CHANGELOG 2013-10-22 15:32:44 +08:00
James Chen 74b514c299 Merge pull request #3979 from HoGarfield/AutoPlay-Animation 
closed #3033: CCBReader can't play sequence automatically in JSB.
 2013-10-22 00:30:47 -07:00
minggo d07fbb8903 Merge pull request #3974 from boyu0/iss2771_physical 
issue 2771: physical
 2013-10-21 22:44:22 -07:00
minggo d709a471bc Merge pull request #3986 from Dhilan007/di2905 
issue #2905:modification vs-project for folder structure change
 2013-10-21 22:42:13 -07:00
lite3 c6f9f0e406 do not change anchor point of child. 2013-10-22 11:30:53 +08:00
boyu0 e99b80b304 issue #2771: implements rayCast and rectQuery 2013-10-21 23:16:21 +08:00
Dhilan007 232f0d598b issues #2905:add new vs project 2013-10-21 22:21:11 +08:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
Dhilan007 9a0fa3c181 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-21 16:27:49 +08:00
garfield_ho 464d1598d2 fixed bug of CCBReader that can not autoplaySequence 2013-10-19 16:48:57 +08:00
garfield_ho 54ac8f3537 Add cc.RESOLUTION_POLICY to jsb_cocos2d.js,so it can use setDesignResolutionSize in cc.EGLView 2013-10-19 16:44:14 +08:00
James Chen 6a10910ff3 Merge pull request #3975 from samuele3hu/developSrc 
modify project search path format
 2013-10-18 03:13:06 -07:00
samuelhu 0cffe51219 fix libluajia.a search path bug 2013-10-18 18:08:05 +08:00
boyu0 8fbfff97d9 issue #2771: delete some files added by mistake. 2013-10-18 17:56:22 +08:00
boyu0 5741a16620 issue #2771: edit some include head file path 2013-10-18 17:47:29 +08:00
James Chen 0ecd9f03a4 Merge pull request #3973 from samuele3hu/developSrc 
fix libluajia.a search path bug
 2013-10-18 02:45:54 -07:00
samuelhu 4ccb13f5d0 fix libluajia.a search path bug 2013-10-18 17:37:04 +08:00
boyu0 6e2c4801f8 Merge https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-18 16:05:29 +08:00
boyu0 6aef4476d9 issue #2771: edit some mistake when merge 2013-10-18 15:55:47 +08:00
Dhilan007 6ce34288e0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 15:53:26 +08:00
minggo 3a368ec007 Merge pull request #3972 from minggo/iss2905-adjust_folder 
fix xcode compiling error and simplify android.mk
 2013-10-18 00:39:58 -07:00
minggo 5f65cdc3c0 fix xcode compiling error and simplify android.mk 2013-10-18 15:39:09 +08:00
boyu0 d12ee5f120 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-18 15:34:13 +08:00
Dhilan007 8fb0327597 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 14:57:33 +08:00
minggo e72b8bf76c Merge pull request #3971 from minggo/iss2905-adjust_folder 
issue #2905:simplify Android.mk dependence
 2013-10-17 23:20:15 -07:00
minggo 63c13d8eaa issue #2905:simplify Android.mk dependence 2013-10-18 14:18:36 +08:00
boyu0 88ae56bfe9 issue #2771: implement PhysicsBody's bit masks. 2013-10-18 13:52:25 +08:00
Dhilan007 86384b0df1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 12:36:18 +08:00
James Chen 7d588fbaa3 Update CHANGELOG 2013-10-18 11:15:02 +08:00