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

14480 Commits

Author SHA1 Message Date
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
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
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
Huabing.Xu 6b6b37b1ad Merge branch 'develop' into develop_FixTestCase_ShaderNode 
* develop:
 2013-12-25 16:46:45 +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
samuele3hu 9fd64df099 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Spine 2013-12-25 13:48:10 +08:00
samuele3hu 45cfe00ec4 Modify iOS project set and some manual lua binding 2013-12-25 13:47:22 +08:00
Huabing.Xu 699424e3c7 remove ArmatureTestLayer::draw 2013-12-25 11:53:50 +08:00
James Chen 88d30bd26a Merge pull request #4648 from CocosRobot/updategeneratedsubmodule_1387943362 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-24 19:50:49 -08:00
James Chen 17c391f447 Merge pull request #4645 from Dhilan007/update_vs_project 
fix TestCpp project can't work on debug mode on vs.
 2013-12-24 19:50:25 -08:00
CocosRobot 9aa48cac37 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-25 03:49:23 +00:00
James Chen 51fb4e5d1f Merge pull request #4647 from dabingnn/develop_FixTestCase_DrawPrimitiveTest 
change indent to spaces
 2013-12-24 19:49:20 -08:00
Huabing.Xu 02c28cf891 change indent to spaces 2013-12-25 11:46:40 +08:00
James Chen 8fdd6249f0 Merge pull request #4646 from dabingnn/develop_FixTestCase_DrawPrimitiveTest 
fix actionTest->DrawPrimitiveTest
 2013-12-24 19:46:32 -08:00
James Chen 5fc06cf7ac Merge pull request #4644 from dumganhar/spine-remove-cc 
Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings.
 2013-12-24 19:44:18 -08:00
Huabing.Xu 598d295c6c fix actionTest->DrawPrimitiveTest 2013-12-25 11:44:05 +08:00
Dhilan007 c168dc4731 fix TestCpp project can't work on debug mode on vs. 2013-12-25 11:38:46 +08:00
James Chen 856265950d Updates JS tests for SpineTest. 2013-12-25 11:24:02 +08:00
James Chen 538da31773 Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings. 2013-12-25 11:18:14 +08:00
James Chen 30eb05b600 Merge pull request #4642 from dumganhar/deprecate-ccstring 
Don’t use ‘String::createWithFormat’ in our codes, use StringUtils::format() instead.
 2013-12-24 19:02:35 -08:00
James Chen 6fce4f9061 Don’t use ‘String::createWithFormat’ in our codes, use StringUtils::format() instead. 2013-12-25 11:00:51 +08:00
minggo 665b8634bb Merge pull request #4641 from dabingnn/develop_FixTestCase_Box2dTest 
fix actionTest->Box2dTest
 2013-12-24 18:57:40 -08:00
Huabing.Xu fac87108f6 fix actionTest->Box2dTest 2013-12-25 10:54:31 +08:00
boyu0 62fc889a54 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into const_char_star_to_std_string 
Conflicts:
	cocos/2d/platform/CCFileUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCImageCommon_cpp.h
	cocos/2d/platform/CCSAXParser.cpp
	cocos/2d/platform/CCSAXParser.h
 2013-12-25 10:41:37 +08:00