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

203 Commits

Author SHA1 Message Date
zhangcheng 6a9fbfbc60 fixed #3457 update libCocosStudio.vcxproj, add trigger code. 2013-12-27 10:24:50 +08:00
chengstory 7a7d939da0 issue #3457 use C++ 11 auto loop. 2013-12-26 23:51:55 +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
chengstory 26df681915 fixed #3457 remove jsoncpp. 2013-12-26 22:45:23 +08:00
CaiWenzhi 26a7f3474c Modify reader 2013-12-26 21:02:47 +08:00
CaiWenzhi ad535e2fcb Add listview and pageview reader 2013-12-26 17:53:22 +08:00
chengstory bd46681867 fixed #3457 continue to fixes failed to build. 2013-12-26 17:37:02 +08:00
chengstory 041e78cb54 Fixes failed to build android. 2013-12-26 17:17:02 +08:00
CaiWenzhi 3206727b9c Modify actionnode 2013-12-26 17:01:31 +08:00
Liam a158e25767 modify coco action with new coding rule 2013-12-26 16:36:21 +08:00
Liam bc54707893 modify coco action with new coding rule 2013-12-26 16:29:59 +08:00
chengstory ab3cf064d1 fixed #4357 failed to build android. 2013-12-26 13:26:23 +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
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
yinkaile 5eb961b165 fixed warning 2013-12-25 19:46:09 +08:00
yinkaile d72c9d94d7 upload trigger code. 2013-12-25 17:40:54 +08:00
CaiWenzhi 2ae8576e0f Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 10:40:05 +08:00
chengstory e4e22b52cb Merge branch 'develop' into #3456 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCDataReaderHelper.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSSceneReader.cpp
 2013-12-24 22:05:13 +08:00
chengstory 64f0987fea issue #3456 ios test rapidjson. 2013-12-24 21:23:24 +08:00
zhangcheng 2c6f95ecea issue #3456 replace jsoncpp to rapidjson. 2013-12-24 20:33:55 +08:00
CaiWenzhi 0dac69523c Remove "_renderer" from widget 2013-12-24 20:22:14 +08:00
zhangcheng 5214965e4f fixed #3456 2013-12-24 18:33:19 +08:00
James Chen 0ff85852cc Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead. 2013-12-24 18:08:40 +08:00
yinkaile 67c3480320 change std::string.compare() to == 2013-12-24 14:21:25 +08:00
yinkaile 44e22584a4 fixed getFileData 2013-12-24 13:35:46 +08:00
yinkaile ff053e71fe change std::string compare method 2013-12-24 11:05:53 +08:00
CaiWenzhi 3885477276 Remove CCDictionary from GUIReader 2013-12-24 10:41:01 +08:00
CaiWenzhi 9aa85d2bd6 Remove NodeRGBA inherit 2013-12-23 15:02:52 +08:00
yinkaile ba809a0096 change const char* to const std::string& 2013-12-23 14:05:46 +08:00
yinkaile 4f003da8cb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-20 10:53:37 +08:00
James Chen e56a4a7c00 Merge pull request #4567 from dumganhar/for_each-gone 
All std::for_each has gone. uses for(const auto& ...) instead.
 2013-12-19 18:50:50 -08:00
minggo 756f8f7a11 Merge pull request #4482 from dabingnn/develop_gridNode 
Develop grid node
 2013-12-19 18:30:42 -08:00
James Chen 34382b4a8a More std::for_each —> for(const auto& …) 2013-12-20 09:54:50 +08:00
Ricardo Quesada 59fee6b8d2 replaces std::for_each with for() 
replaces `std::for_each` with C++11 `for( : )`
 2013-12-19 13:34:41 -08:00
Ricardo Quesada 99ae4d86d3 fixes compiler warnings 
* converts some `int` to `ssize_t`
* adds `const` to `title()` and `subtitle()`
 2013-12-19 12:23:42 -08:00
yinkaile c58963bd45 add support for tweenRotate property 2013-12-19 21:12:25 +08:00
James Chen ec0bdf06af Merge pull request #4555 from 2youyouo2/develop 
fixed armature position not right
 2013-12-19 05:05:25 -08:00
yinkaile b367896f94 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-19 20:50:27 +08:00
Huabing.Xu d51ad36613 Merge branch 'develop' into develop_gridNode 
* develop: (67 commits)
  Adds const in ShaderTest2.h
  Skew works again!
  [AUTO] : updating submodule reference to latest autogenerated bindings
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Reverts submodule.
  Updates submodule of bindings-generator.
  Adds `std::for_each` test in invocation
  Reverts bindings-generator.
  fixed not render
  iterator in Sprite fixes
  update vs project for removes unneeded files
  getNodeToParentTransform fixes
  Node cleanup
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Improves SpriteTest
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Android and Linux fixes
  removes `using namespace std` from header file
  Removes unneeded files
  change play arguments
  ...

Conflicts:
	cocos/2d/CCNode.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-12-19 17:20:22 +08:00
boyu0 ef54ed3c15 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 
Conflicts:
	cocos/2d/CCLabel.cpp
	cocos/2d/CCLabel.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/2d/CCLayer.cpp
	cocos/2d/CCLayer.h
	cocos/2d/CCNode.cpp
	extensions/GUI/CCControlExtension/CCControl.cpp
	extensions/GUI/CCControlExtension/CCControlButton.cpp
	extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
	tools/tojs/cocos2dx.ini
 2013-12-19 17:05:59 +08:00
yinkaile 140bd2ecad fixed armature position not right 2013-12-19 15:43:32 +08:00
James Chen 75b5edb66c Merge commit 'refs/pull/4532/head' of git://github.com/cocos2d/cocos2d-x into armature-test 2013-12-19 11:16:03 +08:00
yinkaile a6a432d2a2 fixed not render 2013-12-19 10:42:06 +08:00
Ricardo Quesada 89701f5006 getNodeToParentTransform fixes 
Code is cleaner.
`Armature` calls parent to reduce code.

[]: Skew is still not working properly
 2013-12-18 18:00:55 -08:00
yinkaile 93eaf44e9c Merge branch 'develop' into Array 
Conflicts:
	cocos/scripting/auto-generated
 2013-12-19 09:42:21 +08:00
Ricardo Quesada 8390e7eadb Node cleanup 
Uses "normal" interation without the lambda to prevent another object in the stack.

removed unused code.
 2013-12-18 16:56:59 -08:00
Ricardo Quesada d1b555614e removes `using namespace std` from header file 
... in order to prevent possible collisions.

`using namespace XXX` MUST never be used in header files.
 2013-12-18 11:45:30 -08:00