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

14606 Commits

Author SHA1 Message Date
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
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
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
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
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
CocosRobot 6492f61691 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-25 10:34:46 +00: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
samuele3hu 7c3978bdd8 Add missing file for linux lua binding 2013-12-25 17:42:59 +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
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
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
Huabing.Xu 218dc7c115 fix RenderTextureTest->simpleSprite 2013-12-25 16:18:29 +08:00
James Chen 00d16aadc5 Merge pull request #4658 from dumganhar/develop 
Some warning fixes.
 2013-12-25 00:09:33 -08:00
James Chen 142b189305 Some warning fixes. 2013-12-25 16:06:39 +08:00
James Chen 3da854c8cd Merge pull request #4656 from dabingnn/develop_FixTestCase_LabelTest 
Develop fix test case label test
 2013-12-24 23:20:45 -08:00
Huabing.Xu 7333a636c1 fix Label->LabelBMFontBounds 2013-12-25 15:13:11 +08:00
Huabing.Xu 19522152d5 fix Label->Atlas4 2013-12-25 15:05:49 +08:00
Huabing.Xu cfb06722d5 Merge branch 'develop' into develop_FixTestCase_LabelTest 
* develop:
  [AUTO] : updating submodule reference to latest autogenerated bindings
  change “string.compare()” to “==“
  fix android compile error
  [AUTO] : updating submodule reference to latest autogenerated bindings
  fix TestCpp project can't work on debug mode on vs.
  Updates JS tests for SpineTest.
  Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings.
  change some const char* to const std::string&
  change some const char* to const std::string&
 2013-12-25 14:55:57 +08:00
Huabing.Xu e8d57154dd fix Label->Atlas1 2013-12-25 14:52:49 +08:00
James Chen 2b5a3afd1e Merge pull request #4655 from CocosRobot/updategeneratedsubmodule_1387953575 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-24 22:52:01 -08:00
boyu0 3764005d88 issue #2920: add “FIX ME” comment. 2013-12-25 14:46:29 +08:00
CocosRobot c71cd5a407 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-25 06:39:38 +00:00
James Chen 55b0ef85d8 Merge pull request #4631 from boyu0/const_char_star_to_std_string 
Change const char* to const std::string&
 2013-12-24 22:34:34 -08:00
minggo 599aabc55b Merge pull request #4653 from dabingnn/develop_FixTestCase_ArmatureSceneTest 
Develop fix test case armature scene test
 2013-12-24 22:32:43 -08:00
boyu0 2c2953abc1 change “string.compare()” to “==“ 2013-12-25 14:20:37 +08:00
Huabing.Xu 22a62d9d07 Fix TestBoundingBox 2013-12-25 14:02:13 +08:00
boyu0 f2e18f32a9 fix android compile error 2013-12-25 13:57:17 +08:00