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

12718 Commits

Author SHA1 Message Date
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
James Chen c8ba071294 Update AUTHORS 2013-10-18 11:13:54 +08:00
James Chen d9241526e7 Merge pull request #3968 from dumganhar/create-project-fix 
Merge PR 3943
 2013-10-17 20:12:25 -07:00
James Chen ca3cbec858 [Template] Hello JavaScript --> HelloJavascript. It's for replacement. 2013-10-18 11:06:17 +08:00
James Chen d6be31f74a Merge commit 'refs/pull/3943/head' of git://github.com/cocos2d/cocos2d-x into create-project-fix 2013-10-18 10:40:12 +08:00
James Chen 39afa3b8df Merge pull request #3967 from dumganhar/change-url 
Changing the submodule URL for 'auto-generated'.
 2013-10-17 19:00:36 -07:00
James Chen 8c0d7e151c Updating the submodule reference of 'auto-generated'. 2013-10-18 10:02:47 +08:00
Dhilan007 66c2fe26ef Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 22:34:09 +08:00
minggo 8a7f52d5d9 Merge pull request #3966 from minggo/iss2905-adjust_folder 
issue #2905:simple game and assets manager build ok on android
 2013-10-17 03:41:08 -07:00
minggo 9c3cac759c issue #2905:simple game and assets manager build ok on android 2013-10-17 18:39:37 +08:00
Dhilan007 b2be3ed4ee Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 18:02:08 +08:00
minggo 5c7f037508 Merge pull request #3965 from minggo/iss2905-adjust_folder 
issue #2509:make lua android template build ok
 2013-10-17 02:47:01 -07:00
minggo 4d28d0ab8b issue #2509:make lua android template build ok 2013-10-17 17:46:09 +08:00
Dhilan007 6f39f903e3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 16:23:19 +08:00
James Chen 736a117fae Changed submodule URL for 'auto-generated'. 2013-10-17 16:15:51 +08:00
James Chen 222cb93aaf Update AUTHORS 2013-10-17 15:43:45 +08:00
James Chen 28c627fcfa Update CHANGELOG 2013-10-17 15:38:24 +08:00
James Chen fd0e84bfa2 Merge pull request #3963 from kpkhxlgy0/use 
closed #2994: Can't click the area that outside of keyboard to close keyboard when using EditBox
 2013-10-17 00:36:33 -07:00
minggo 64a8205573 Merge pull request #3964 from minggo/iss2905-adjust_folder 
issue #2905: jsbinding samples and lua binding samples build ok on andro...
 2013-10-17 00:06:20 -07:00
minggo e50f9fc43b issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
XiaoLongHan a2de02cc19 Change the class name of textfield to compare, so that you can touch anywhere outside of the virtual keyboard. 2013-10-17 14:21:55 +08:00
James Chen c2ac8ffd28 Merge pull request #3962 from dumganhar/develop 
Added missing icons for some iOS and Mac samples.
 2013-10-16 23:09:54 -07:00
James Chen 34fe2ba02c Added missing icons for some iOS and Mac samples. 2013-10-17 14:12:43 +08:00