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

1218 Commits

Author SHA1 Message Date
James Chen b03c8259b1 Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test 
Conflicts:
	cocos/scripting/auto-generated
 2013-12-27 20:18:58 +08:00
James Chen 9baa64f274 Merge pull request #4688 from walzer/develop 
make CC_USE_PHYSICS can ACTUALLY be switch off
 2013-12-27 04:04:48 -08:00
chengstory 3f4e4c9684 Merge branch 'develop' into #3457 2013-12-27 17:51:27 +08:00
minggo 0690305398 Merge pull request #4666 from 2youyouo2/develop 
change play interface name
 2013-12-27 01:50:08 -08:00
chengstory faaf6d3f2b fixed #3457 fixes some bug. 2013-12-27 17:21:13 +08:00
walzer ece68aafc2 add Scene::update & addChild into CC_USE_PHYSICS scope, TestCpp compiles and runs successfully when CC_USE_PHYSICS == 0 2013-12-27 15:49:08 +08:00
Dhilan007 861925e752 fix compiling error in vs project on win7. 2013-12-27 14:38:22 +08:00
chengstory 4cb227ae0d fixed #3457 ui action can not play. 2013-12-27 12:45:05 +08:00
walzer c5e95618d9 fixed #3517, make CC_USE_PHYSICS can be switch off, and bring Scene::update(float), Scene::addChild(...) out of CC_USE_PHYSICS segment 2013-12-26 23:55:05 +08:00
chengstory 774e3d8536 issue #3457 
1. replace UIAction NULL to nullptr.
2. modify  class variable  name.
 2013-12-26 23:40:50 +08:00
chengstory cfbbb7889b Merge branch 'develop' into #3457 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 2013-12-26 23:01:34 +08:00
James Chen 93ed5a4f0f long --> ssize_t for TableView callback. 2013-12-26 04:09:24 -08:00
chengstory 91edad5152 Merge branch 'develop' into #3457 2013-12-26 16:56:43 +08:00
James Chen 9d4a84c40c Merge pull request #4679 from dabingnn/develop_FixTestCase_labelTestNew 
Develop fix test case label test new
 2013-12-26 00:27:59 -08:00
yinkaile f0d4f3f9bf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 16:19:21 +08:00
James Chen 517f3991ef Merge pull request #4678 from dumganhar/compile-fix 
Compilation fixes after merge PR #4669
 2013-12-26 00:15:24 -08:00
Huabing.Xu 706d0e185a fix LabelTestNew 2013-12-26 16:11:06 +08:00
Huabing.Xu 69a490ef08 Fix box2dView 2013-12-26 15:48:26 +08:00
Huabing.Xu 5faf89c183 change rendering callback from public to protected 2013-12-26 15:34:22 +08:00
Huabing.Xu c28f3fb0e9 fix clippingNodeTest 2013-12-26 15:30:13 +08:00
Huabing.Xu 3cdc20612b Merge branch 'develop' into develop_FixTestCase_TilemapTest 
* develop:
  Update CHANGELOG [ci skip]
  [AUTO] : updating submodule reference to latest autogenerated bindings
  [GUI] Updates Mac project.
  Remove C cast
  Fixed bugs about color and opacity
  Remove "_renderer" from widget
  Fixed bugs
  Remove CCDictionary from GUIReader
  Add samples
  Remove NodeRGBA inherit
 2013-12-26 14:57:10 +08:00
chengstory efa7495953 Merge branch 'develop' into #3457 2013-12-26 14:46:36 +08:00
minggo 03c4b57f5b Merge pull request #4668 from dabingnn/develop_FixTestCase_Texture2dTest 
Develop fix test case texture2d test
 2013-12-25 22:42:20 -08:00
chengstory 263c4fbb0a fixed #3457 remove unused comment. 2013-12-26 12:58:34 +08:00
chengstory 8ae7ecff33 Merge branch 'develop' into #3457 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-12-26 12:55:52 +08:00
CaiWenzhi 7be4d07b7f Fixed build error 2013-12-26 11:56:48 +08:00
CaiWenzhi 8215e90870 Modify build files 2013-12-26 11:44:55 +08:00
CaiWenzhi 30cc579f0c Modify Test CMakeList 2013-12-26 11:36:18 +08:00
Huabing.Xu ec8f30b4d5 fix tilemapTest 2013-12-26 11:19:09 +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
Huabing.Xu e8fd46f6b8 fix Texture2dTest->DrawAtPoint 2013-12-26 10:03:45 +08:00
chengstory 8afdf88d25 Test triiger 3.0 2013-12-26 01:17:04 +08:00
CaiWenzhi 570b6c95a7 Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 17:29:30 +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
yinkaile 13408e4dc5 change play interface name 2013-12-25 16:46:31 +08:00
Huabing.Xu 7816635963 fix ShadeNodeTest->ShaderNode 2013-12-25 16:38:43 +08:00
Huabing.Xu 218dc7c115 fix RenderTextureTest->simpleSprite 2013-12-25 16:18:29 +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
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
Huabing.Xu 22a62d9d07 Fix TestBoundingBox 2013-12-25 14:02:13 +08:00
Huabing.Xu 699424e3c7 remove ArmatureTestLayer::draw 2013-12-25 11:53:50 +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
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