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

15425 Commits

Author SHA1 Message Date
CaiWenzhi 81836d8aeb Merge branch 'develop' into develop_nutty_modify_framework_fixedmemleak 2014-01-06 15:57:19 +08:00
James Chen d9e79b4ec5 Merge pull request #4915 from Dhilan007/develop_crash 
fix crash in UnitTest.cpp on vs.
 2014-01-05 23:27:08 -08:00
Dhilan007 93923dcb83 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-06 15:24:14 +08:00
Dhilan007 4261a441de fix crash in UnitTest.cpp on vs. 2014-01-06 15:19:47 +08:00
James Chen 34bd322a10 Merge pull request #4911 from chengstory/fixesBugs_Develop 
Fixes bugs on cocos2dx 3.x
 2014-01-05 23:13:30 -08:00
CaiWenzhi ee9634c8d2 Merge branch 'develop' into develop_nutty_modify_framework_fixedmemleak 2014-01-06 15:09:36 +08:00
CaiWenzhi 4d1d225bd1 Fixed bugs and memory leak 2014-01-06 15:07:04 +08:00
James Chen 7f353090c8 Merge pull request #4907 from chuanweizhang2013/develop 
modify lua template mistake and create_project bug
 2014-01-05 22:51:06 -08:00
James Chen d22a906a07 Merge pull request #4909 from dumganhar/develop 
Wrong search path fix for CocoStudioTest/SceneTest
 2014-01-05 22:50:44 -08:00
James Chen 22fa5319a9 Wrong search path fix for CocoStudioTest/SceneTest 2014-01-06 14:49:32 +08:00
user 16bff3da1c add 755 2014-01-06 01:31:36 -05:00
chuanweizhang 07e51e2c86 test template lua 2014-01-06 14:24:33 +08:00
James Chen 0f374ce838 Merge pull request #4898 from nutty898/develop_nutty_modify_framework_optimizeclipping 
Develop nutty modify framework optimizeclipping
 2014-01-05 21:58:36 -08:00
James Chen 8085795a1b Merge pull request #4905 from dumganhar/develop 
Renames resource folder name from 'loadXXX' to 'LoadXXX'
 2014-01-05 21:56:32 -08:00
James Chen 7ae83848a9 Updates JS-Tests submodule. 2014-01-06 13:55:20 +08:00
James Chen f9f369258b Renames resource folder name from 'loadXXX' to 'LoadXXX' 2014-01-06 13:47:11 +08:00
chengstory e44d28ea7b replace CC_SAFE_RELEASE to CC_SAFE_RELEASE_NULL 2014-01-06 13:27:19 +08:00
CaiWenzhi 63fbec05e9 Modify wrong codes 2014-01-06 12:19:59 +08:00
CaiWenzhi 2450841a5f Merge branch 'develop' into develop_nutty_modify_framework_optimizeclipping 2014-01-06 12:13:24 +08:00
minggo e4bec7d1ef Merge pull request #4902 from Dhilan007/develop_crash 
fix TextInput not show IME on android.
 2014-01-05 19:50:19 -08:00
Dhilan007 5b317196c8 fix TextInput not show IME on android. 2014-01-06 11:45:18 +08:00
CaiWenzhi 99d842d954 Merge branch 'develop' into develop_nutty_modify_framework_optimizeclipping 2014-01-06 11:39:01 +08:00
James Chen 1f580d2cf0 Merge pull request #4899 from samuele3hu/developNewUI 
Fix:Resolve the error that CocoStudioSceneTest load resource in android
 2014-01-05 19:29:26 -08:00
Huabing.Xu 381be48c56 init shader on construction instead of draw in class CCSpriteBatchNode 2014-01-06 11:26:00 +08:00
samuele3hu d5d213aa0a Fix:Update the file spelling 2014-01-06 11:19:40 +08:00
samuele3hu 130fa33a50 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-06 11:13:26 +08:00
samuele3hu 7e279219ff Fix:Resolve the error that CocoStudioSceneTest load resource in android 2014-01-06 11:12:44 +08:00
James Chen 704d05521e Update AUTHORS [ci skip] 2014-01-06 11:09:58 +08:00
James Chen d74d21a6f0 Merge pull request #4884 from daltomi/debug 
Proposal: remove boolean flag, The pointer *atlas == item.second not change in map::erase().
 2014-01-05 19:08:37 -08:00
CaiWenzhi 1282debad5 Merge branch 'develop' into develop_nutty_modify_framework_addNode 2014-01-06 11:03:08 +08:00
CaiWenzhi ad30f8ff96 Fixed bug of clippinglayout 2014-01-06 10:56:33 +08:00
James Chen 68f76678f9 Merge pull request #4897 from chengstory/#3585 
fixed actionNode Memory Leak.
 2014-01-05 18:48:02 -08:00
James Chen a84dc3792f Merge pull request #4896 from dumganhar/develop 
[develop] Updates JS-test submodule
 2014-01-05 18:46:02 -08:00
James Chen bf19541330 Updates JS-test submodule after merging. 2014-01-06 10:45:14 +08:00
chengstory e1b36e2e20 Merge branch 'develop' into #3585 2014-01-06 10:43:44 +08:00
chengstory 76f96d0b41 fixed ActionNode memoryleak. 2014-01-06 10:42:17 +08:00
James Chen 26e10ff662 [develop] Updates JS-test submodule 2014-01-06 10:38:04 +08:00
minggo 33c2b89c89 Merge pull request #4894 from dabingnn/develop_renderTextureSaveBug 
remove node reuse in renderTextureSave
 2014-01-05 18:06:35 -08:00
Huabing.Xu a274d35025 remove node reuse in renderTextureSave 2014-01-06 09:49:04 +08:00
James Chen 10089a300a Merge pull request #4892 from CocosRobot/updategeneratedsubmodule_1388918571 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-05 03:06:38 -08:00
CocosRobot cc4bee319c [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-05 10:43:05 +00:00
minggo 9b8d515fc9 Merge pull request #4891 from minggo/parse-tilemap 
make TMXLayer::getProperties() return reference
 2014-01-05 02:37:51 -08:00
minggo 00ac666a42 Merge pull request #4890 from Dhilan007/develop_crash 
add miss file for vs project.
 2014-01-05 02:30:28 -08:00
minggo fcfa6744f4 make TMXLayer::getProperties() return reference 2014-01-05 18:20:29 +08:00
Dhilan007 8abc54bbac add miss file for vs project. 2014-01-05 18:12:11 +08:00
James Chen 0ffe7066af Merge pull request #4889 from CocosRobot/updategeneratedsubmodule_1388901169 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-04 21:54:30 -08:00
CocosRobot 5f8d4f867c [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-05 05:52:52 +00:00
James Chen b592786484 Merge pull request #4883 from chengstory/#3582 
Updates CocoStudio component parser.
 2014-01-04 21:48:04 -08:00
chengstory 877c6dddf3 fixed ＃3582 
1.  CCScene ->  Scene.
 2014-01-05 13:16:23 +08:00
chengstory 4893c561db Merge branch 'develop' into #3582 2014-01-05 12:43:41 +08:00