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

8150 Commits

Author SHA1 Message Date
minggo 89af0e0a52 Merge pull request #2232 from minggo/test-damganhar 
fix some bugs when creating android project
 2013-03-20 15:22:16 -07:00
minggo ae9675c3bd fix some bugs when creating android project with multi-platform tool 2013-03-21 06:20:19 +08:00
minggo 15826ea15b Merge pull request #2230 from dumganhar/master 
Updating the template of multi-platform.
 2013-03-20 14:46:10 -07:00
minggo 2430f28ea1 Merge https://github.com/dumganhar/cocos2d-x into test-damganhar 2013-03-21 05:33:17 +08:00
James Chen daea6ed3ea Removing unused codes. 2013-03-20 23:19:55 +08:00
James Chen 3f43456072 Updating multi-platform templates. 2013-03-20 23:18:41 +08:00
James Chen f7d3a23a98 Updating the template of multi-platform-js for win32. 2013-03-20 22:45:41 +08:00
James Chen 668d3ce638 Updating TestJavascript.vcxproj and WatermelonWithMe.vcxproj. 2013-03-20 22:07:30 +08:00
minggo 13ad6af87b Merge pull request #2229 from minggo/master 
don't modify .project file when creating a new android project
 2013-03-20 05:55:41 -07:00
minggo 666279e30d don't modify .project file when creating a new android project 2013-03-20 20:54:31 +08:00
waiter a7ee5d9ce6 Merge pull request #5 from cocos2d/master 
update cocos2d-x
 2013-03-20 05:09:43 -07:00
James Chen 03a6181ee3 Merge pull request #2228 from dumganhar/master 
[iOS] Updating ccbi files of js template.
 2013-03-20 04:06:12 -07:00
James Chen bd3bd045ed [iOS] Updating ccbi file of js template. 2013-03-20 19:03:18 +08:00
James Chen 034cbcc5da Merge pull request #2227 from CocosRobot/updategeneratedsubmodule_1363775777 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-20 03:39:19 -07:00
CocosRobot 5414a02c9f cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-20 18:36:26 +08:00
James Chen 6d97f71e42 Merge pull request #2226 from dumganhar/master 
Fix a crash in cc.Scheduler.unscheduleAll cpp binding codes.Renaming function: initWithFile ~> init for CCSprite, CCSpriteBatchNode.
 2013-03-20 03:35:42 -07:00
James Chen 33fc16261b Updating blackberry project settings. 2013-03-20 18:34:28 +08:00
James Chen 4a9e426d2d Renaming function: initWithFile ~> init for CCSprite, CCSpriteBatchNode. 2013-03-20 18:34:28 +08:00
James Chen 4bf7f9bad4 Fix a crash in cc.Scheduler.unscheduleAll cpp binding codes. 2013-03-20 18:32:30 +08:00
minggo 9c3c531483 Merge pull request #2225 from minggo/test-before-release 
update changelog
 2013-03-20 02:58:31 -07:00
minggo 46c318185e update changelog 2013-03-20 17:57:11 +08:00
James Chen 62ae350fda Merge pull request #2224 from dumganhar/master 
Updating CCLabelBMFont.pkg.
 2013-03-20 01:08:09 -07:00
James Chen cc07fb2fcc Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-03-20 16:07:01 +08:00
minggo dd697cc382 Merge pull request #2223 from minggo/test-before-release 
remove unsupported parameter in android
 2013-03-20 01:06:48 -07:00
James Chen 196ff7228d Updating CCLabelBMFont.pkg. 2013-03-20 16:05:45 +08:00
minggo ee37529884 remove unsupported parameter in android 2013-03-20 16:04:42 +08:00
James Chen df2cbbad6e Merge pull request #2222 from dumganhar/master 
Updating vs project dependence.
 2013-03-20 00:46:21 -07:00
James Chen dfb921c9f4 Updating vs2010 project dependence. 2013-03-20 15:41:16 +08:00
James Chen 119d5e16a3 Update vs2012 solution, adding dependence for libExtension. 2013-03-20 15:41:04 +08:00
minggo 688f24b217 Merge pull request #2217 from minggo/test-before-release 
fix build error caused by libcurl on android x86
 2013-03-20 00:39:19 -07:00
minggo f33a8fe6f1 remove unsupported parameter in android 2013-03-20 15:37:16 +08:00
minggo a6fa140a42 Merge https://github.com/cocos2d/cocos2d-x into test-before-release 2013-03-20 15:35:15 +08:00
James Chen 4377d5f863 Merge pull request #2221 from dumganhar/master 
Updating JSTest, adding new resources.
 2013-03-20 00:27:43 -07:00
James Chen d68db7e873 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-03-20 15:19:30 +08:00
minggo 406ea3f69d Merge https://github.com/cocos2d/cocos2d-x into test-before-release 2013-03-20 15:19:19 +08:00
James Chen cf9c01cecf Updating JSTest, adding new resources. 2013-03-20 15:19:16 +08:00
James Chen 6bcc4696e9 Merge pull request #2214 from rohankuruvilla/ccbreader 
RotationX,Y for CCBuilderReader and a few bug fixes
 2013-03-20 00:04:51 -07:00
James Chen 89c4f3a5ba Updating JSTest. 2013-03-20 14:58:36 +08:00
James Chen 46335a06b8 Updating JSTest 2013-03-20 14:50:20 +08:00
James Chen 49083415d9 Merge branch 'master' of https://github.com/dumganhar/cocos2d-x 2013-03-20 14:46:13 +08:00
James Chen e728d5d6d0 Updating JS Test. 2013-03-20 14:45:39 +08:00
Rohan Kuruvilla 19b66049b3 Fixing issues with rotationX, rotationY in CCBuilderReader 2013-03-19 23:43:00 -07:00
Rohan Kuruvilla 54bb643ad3 Adding support for RotationX and RotationY to CCBReader 2013-03-19 23:42:59 -07:00
Rohan Kuruvilla 38f86acd23 Updating CocosPlayer AppDelegate files 2013-03-19 23:42:59 -07:00
James Chen d0b6b2cbc0 Merge pull request #2220 from CocosRobot/updategeneratedsubmodule_1363760413 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-19 23:29:14 -07:00
CocosRobot e34d9b18e5 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-20 14:20:23 +08:00
James Chen f292186524 Merge pull request #2219 from dumganhar/master 
fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters.
 2013-03-19 23:15:46 -07:00
James Chen 489b37b4e7 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-03-20 14:14:39 +08:00
James Chen 7e1efa7c89 fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters. 2013-03-20 14:14:01 +08:00
minggo aa5adc185a Merge pull request #2218 from dumganhar/bmfont-logic-error 
fix a logic error and a memory leak in CCLabelBMFont. This PR could fix wrong display of Score in WatermelonWithMe.
 2013-03-19 23:06:48 -07:00