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

15129 Commits

Author SHA1 Message Date
Dhilan007 3a95c9db3e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-06 17:21:34 +08:00
minggo cd6b000016 Merge pull request #4920 from minggo/develop 
don't rlease autoreleased object
 2014-01-06 01:21:13 -08:00
minggo 4033ecea77 don't rlease autoreleased object 2014-01-06 17:20:42 +08:00
Dhilan007 922fd50903 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-06 17:20:00 +08:00
James Chen e705dfe471 Merge pull request #4917 from chengstory/AddTriggerCode 
Add Trigger code to sceneTest on cocos2dx 3.x.
 2014-01-06 01:16:46 -08:00
minggo 5d37050cfc Merge pull request #4919 from minggo/develop 
don't release autoreleased objec
 2014-01-06 01:04:13 -08:00
minggo 7b55c3da1e don't release autoreleased objec 2014-01-06 17:03:24 +08:00
Dhilan007 268ea55d64 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-06 16:48:47 +08:00
minggo 14693cbf35 Merge pull request #4918 from minggo/develop 
don't assign last element with (null, null)
 2014-01-06 00:45:29 -08:00
minggo 63ad431349 don't assign last element with (null, null) 2014-01-06 16:41:42 +08:00
Dhilan007 a8e03b264f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-06 16:39:38 +08:00
zhangcheng 573737df40 Add Trigger code to sceneTest on cocos2dx 3.x. 2014-01-06 16:32:39 +08:00
minggo 8102537b43 Merge pull request #4916 from minggo/develop 
Fix a crash of particle test
 2014-01-06 00:29:14 -08:00
minggo 94e0b03d47 don't release autoreleased object 2014-01-06 16:28:15 +08:00
James Chen 2818677795 Merge pull request #4913 from nutty898/develop_nutty_modify_framework_fixedmemleak 
Develop nutty modify framework fixedmemleak
 2014-01-06 00:24:36 -08:00
Dhilan007 eb6ff55571 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-06 16:18:20 +08:00
minggo 9b44e80cf2 Merge pull request #4900 from dabingnn/develop_SpriteBatchNodeShaderBug 
init shader on construction instead of draw in class CCSpriteBatchNode
 2014-01-06 00:11:59 -08:00
James Chen c40cedc804 Don't test Map<K,V>::bucketCount since it's platform dependence. 2014-01-06 16:09:01 +08:00
CaiWenzhi 60b340f2cd Modify wrong codes 2014-01-06 15:59:21 +08:00
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