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

14890 Commits

Author SHA1 Message Date
CaiWenzhi b1d2aa9b79 Modify CMakeList 2013-12-26 11:25:49 +08:00
Huabing.Xu ec8f30b4d5 fix tilemapTest 2013-12-26 11:19:09 +08:00
CaiWenzhi 581678b6b0 Modify android mk 2013-12-26 11:06:10 +08:00
chuanweizhang 951b460321 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 11:03:56 +08:00
James Chen 4e25d88741 Merge pull request #4670 from CocosRobot/updategeneratedsubmodule_1388026235 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-12-25 18:58:22 -08:00
James Chen dafaff0d83 Update CHANGELOG [ci skip] 2013-12-26 10:52:01 +08:00
CocosRobot e6727ea087 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-26 02:50:37 +00:00
子龙山人 47ab490559 Merge pull request #2 from cocos2d/develop 
update
 2013-12-25 18:47:04 -08:00
James Chen 7f459ef16b Merge pull request #4669 from dumganhar/gui-refactor 
Merge PR #4617, GUI refactor
 2013-12-25 18:46:04 -08:00
James Chen 444389e92d [GUI] Updates Mac project. 2013-12-26 10:44:41 +08:00
Huabing.Xu 58bb327db9 fix texture2dtest->drawinrect 2013-12-26 10:24:40 +08:00
yinkaile b553828ed2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 10:24:33 +08:00
yinkaile b44090b40b change std::map to std::unordered_map 2013-12-26 10:23:51 +08:00
chuanweizhang 0343f55dc7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 10:23:00 +08:00
chuanweizhang c9135eb6b9 modify linux template 2013-12-26 10:22:39 +08:00
Huabing.Xu ce97b85935 Merge branch 'develop' into develop_FixTestCase_Texture2dTest 
* develop:
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Add missing file for linux lua binding
  Add include_directories for spine
  issue #2920: add version detect.
  Delete some annotated  statement about spine and add some reserve manual lua binding functions
  issue #2920: add “FIX ME” comment.
  Modify iOS project set and some manual lua binding
  issue #2920: temporary fix dictation input crash on ios7.
  1. add Spine LUA binding with testcase; 2. CCSkeleton inherites from Node since NodeRGBA is deprecated.
 2013-12-26 10:08:25 +08:00
Huabing.Xu e8fd46f6b8 fix Texture2dTest->DrawAtPoint 2013-12-26 10:03:45 +08:00
chengstory 19d75cee01 fixed #3647 fixes ComAttribute warning. 2013-12-26 02:18:28 +08:00
chengstory 8afdf88d25 Test triiger 3.0 2013-12-26 01:17:04 +08:00
CaiWenzhi eaef723bd7 Remove C cast 2013-12-25 22:13:19 +08:00
CaiWenzhi 8299e4c494 Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 22:05:21 +08:00
James Chen 9679b0c8a7 Merge pull request #4664 from CocosRobot/updategeneratedsubmodule_1387967684 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-25 04:29:10 -08:00
yinkaile 5eb961b165 fixed warning 2013-12-25 19:46:09 +08:00
CocosRobot 6492f61691 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-25 10:34:46 +00:00
chuanweizhang 23192a883c modify linux tempalte 2013-12-25 18:32:23 +08:00
CaiWenzhi 96279c12dc Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 18:32:15 +08:00
CaiWenzhi c516860017 Fixed bugs about color and opacity 2013-12-25 18:30:21 +08:00
James Chen 6b3d6da53e Merge pull request #4662 from samuele3hu/Spine 
Add Spine lua binding with test case
 2013-12-25 02:28:58 -08:00
chuanweizhang 02e139f1da Reverts bindings-generator reference. 2013-12-25 18:16:59 +08:00
chuanweizhang bbb11831b6 Reverts submodules 2013-12-25 18:15:40 +08:00
chuanweizhang 6e871e8803 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	template/multi-platform-js/Classes/AppDelegate.cpp
 2013-12-25 18:12:16 +08:00
samuele3hu 7c3978bdd8 Add missing file for linux lua binding 2013-12-25 17:42:59 +08:00
yinkaile d72c9d94d7 upload trigger code. 2013-12-25 17:40:54 +08:00
minggo 939c2a305c Merge pull request #4640 from boyu0/bug2920_dictation_input_crash_on_ios7 
issue #2920: temporary fix dictation input crash on ios7.
 2013-12-25 01:39:48 -08:00
CaiWenzhi 570b6c95a7 Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 17:29:30 +08:00
samuele3hu a2c5881699 Add include_directories for spine 2013-12-25 17:22:14 +08:00
boyu0 07925d112e issue #2920: add version detect. 2013-12-25 17:21:28 +08:00
samuele3hu 1075a711e0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine 2013-12-25 16:58:19 +08:00
James Chen 01bd8792b7 Merge pull request #4661 from dabingnn/develop_FixTestCase_ShaderNode 
Develop fix test case shader node
 2013-12-25 00:57:51 -08:00
yinkaile 369b4da721 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #3456 2013-12-25 16:55:56 +08:00
Huabing.Xu 2eaba86d76 fix ShadeNodeTest->SpriteBlur 2013-12-25 16:54:09 +08:00
yinkaile ebf9833958 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-25 16:47:14 +08:00
Huabing.Xu 6b6b37b1ad Merge branch 'develop' into develop_FixTestCase_ShaderNode 
* develop:
 2013-12-25 16:46:45 +08:00
yinkaile 13408e4dc5 change play interface name 2013-12-25 16:46:31 +08:00
samuele3hu 9cf45a292b Delete some annotated statement about spine and add some reserve manual lua binding functions 2013-12-25 16:42:40 +08:00
Huabing.Xu 7816635963 fix ShadeNodeTest->ShaderNode 2013-12-25 16:38:43 +08:00
chuanweizhang 6d36414dce modify cocos README.md 2013-12-25 16:35:17 +08:00
chuanweizhang 017fb550b7 add README.md 2013-12-25 16:34:23 +08:00
minggo ed5d97a12a Merge pull request #4660 from dabingnn/develop_FixTestCase_RenderTexture 
Develop fix test case render texture
 2013-12-25 00:28:02 -08:00
Huabing.Xu 18a168a528 Merge branch 'develop' into develop_FixTestCase_RenderTexture 
* develop:
  Some warning fixes.
 2013-12-25 16:20:40 +08:00