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

12913 Commits

Author SHA1 Message Date
boyu0 fdcf019665 issue #2771: implement contact callbacks 2013-10-25 10:31:22 +08:00
James Chen 73b02875cb Merge pull request #4004 from Dhilan007/di0004 
issues #2905:split jsbinding module
 2013-10-24 04:07:06 -07:00
Dhilan007 56ef197146 update the reference to cocos2d-x repo. 2013-10-24 18:36:36 +08:00
Dhilan007 08960f1510 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2893 2013-10-24 18:16:44 +08:00
James Chen f2584f9730 Update CHANGELOG 2013-10-24 18:04:13 +08:00
James Chen 342003f7b2 Update AUTHORS 2013-10-24 18:03:15 +08:00
James Chen d8683ef705 Merge pull request #3988 from lite3/develop 
closed #3060: The Node's anchor point was changed after being added to ScrollView.
 2013-10-24 03:01:49 -07:00
Dhilan007 fd993e2fa2 issues #2905:split jsbinding module 2013-10-24 17:54:57 +08:00
James Chen 16a3c39402 Merge pull request #4000 from Dhilan007/di0002 
issues #2905:add miss file
 2013-10-24 02:32:35 -07:00
James Chen 10329de46c Merge pull request #4002 from boyu0/iss2771_physical 
issue #2771 physical
 2013-10-24 02:31:40 -07:00
samuelhu a5e479d2bb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-24 11:14:20 +08:00
samuelhu d7689073e0 issue #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-24 11:12:21 +08:00
boyu0 a8ddca81bd issue #2771: fix some compile error in win32 2013-10-23 18:52:09 +08:00
minggo 914269b4bd Merge pull request #4001 from minggo/iss2905-adjust_folder 
issue #2905:ndk-r8e build ok now
 2013-10-23 02:47:05 -07:00
minggo d07d054a01 issue #2905:ndk-r8e build ok now 2013-10-23 17:44:20 +08:00
boyu0 912a9a2887 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-23 17:41:52 +08:00
boyu0 899f720efa issue #2771: implement getShapeAtPoint and getShapesAtPoint 2013-10-23 17:28:23 +08:00
Dhilan007 3305dd1de3 issues #2905:add miss file 2013-10-23 17:05:27 +08:00
minggo 189ff009f2 Merge pull request #3999 from minggo/iss2905-adjust_folder 
issue #2905: android samples run ok
 2013-10-23 01:53:20 -07:00
James Chen c117431b2a Merge pull request #3998 from Dhilan007/0001 
adjust std:function support 10 parameter
 2013-10-23 01:50:30 -07:00
minggo e81efb24c9 issue #2905: android samples run ok 2013-10-23 16:49:50 +08:00
Dhilan007 dfd69d262a adjust std:function support 10 parameter 2013-10-23 16:48:51 +08:00
minggo 4952df576b Merge pull request #3996 from boyu0/iss2771_physical 
issue #2771: physical
 2013-10-22 20:45:55 -07:00
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