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

453 Commits

Author SHA1 Message Date
yinkaile 1f38fc28a6 change interface 2014-01-02 11:07:31 +08:00
CaiWenzhi 81bdfac795 Modify class name Label LabelBMFont LabelAtlas 2013-12-31 16:36:33 +08:00
James Chen edb2ad0933 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding 
Conflicts:
	cocos/editor-support/cocostudio/TriggerMng.cpp
 2013-12-30 21:06:57 +08:00
James Chen 1edf748dc3 [JSB] Adds trigger bindings for CocoStudio. 2013-12-30 20:57:46 +08:00
chengstory 0488aa6dcb fixed #3474 
1.  Modify CCLOG, Add classname.
         2.  change ArmatureMovementDispatcher::addAnnimationEventCallBack to ArmatureMovementDispatcher::addAnimationEventCallBack.
         3.  remove unused do while(0).
 2013-12-30 15:26:51 +08:00
minggo 0e9b43248c Merge pull request #4728 from dabingnn/develop_removeCommandPool 
Develop remove command pool
 2013-12-29 21:53:12 -08:00
James Chen e509a52551 Small fix for `FREE` wrong variable. 2013-12-28 14:38:13 +08:00
James Chen b17117a1a1 More warning fixes. 2013-12-28 14:34:52 +08:00
James Chen f4825ec94a Bug fixes for cocostudio. 2013-12-27 20:54:05 +08:00
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
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
Huabing.Xu 66e550e5a0 Merge branch 'develop' into develop_removeCommandPool 
* develop: (33 commits)
  fix black screen when back to foreground  on android.
  Fix set FPS broken.
  Update CHANGELOG [ci skip]
  Update AUTHORS [ci skip]
  Update CCString.cpp
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Updates Bindings-generator.
  Renames: IntValueMap —> ValueMapIntKey
  Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
  Modify reader
  long --> ssize_t for TableView callback.
  Generates execute file in cocos root_dir/bin folder for HelloCpp.
  Add listview and pageview  reader
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Modify actionnode
  [AUTO] : updating submodule reference to latest autogenerated bindings
  optimize loop
  fix LabelTestNew
  Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669
  Fix box2dView
  ...
 2013-12-27 14:07:04 +08:00
chengstory 4cb227ae0d fixed #3457 ui action can not play. 2013-12-27 12:45:05 +08:00
zhangcheng dd4339b0bb Merge branch '#3457' of git://github.com/chengstory/cocos2d-x into #3457 2013-12-27 12:41:01 +08:00
zhangcheng 1b666d4d41 fixed #3457 scenetest crashed when back to menu. 2013-12-27 12:39:21 +08:00
Liam 0cdf2d15fe merge from develop branch 2013-12-27 10:50:50 +08:00
Liam 2a6c24f8bf update coco action with correct coding rule 2013-12-27 10:43:49 +08:00
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
boyu0 d32fbbbfca change GroupCommand variable to class member. 2013-12-26 18:11:23 +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
yinkaile 891d8c3a38 change comment 2013-12-26 16:48:19 +08:00
Liam a158e25767 modify coco action with new coding rule 2013-12-26 16:36:21 +08:00
boyu0 2fb0179293 change QuadCommand variable to class member. 2013-12-26 16:36:03 +08:00
Liam bc54707893 modify coco action with new coding rule 2013-12-26 16:29: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
yinkaile 7027587542 fixed armature update 2013-12-26 15:49:20 +08:00
boyu0 f878864794 Specialize GroupCommand and CustomCommand, change generateCommand to new. 2013-12-26 15:41:47 +08:00
yinkaile c096743325 change comment 2013-12-26 14:57:38 +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
yinkaile b44090b40b change std::map to std::unordered_map 2013-12-26 10:23:51 +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 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
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
James Chen 142b189305 Some warning fixes. 2013-12-25 16:06:39 +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
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
James Chen d33b2c41c7 Merge branch 'develop' into data-refactor 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-12-24 16:24:17 +08:00
Liam c6fb3b7e0d Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2013-12-24 15:32:09 +08:00
James Chen 451d76f6b0 Merge pull request #4611 from dumganhar/spine-test 
Merge PR #4572, Spine JS test support.
 2013-12-23 22:55:58 -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
James Chen 6bbc6e2dde CCSkeleton is inherited from Node now. 2013-12-23 21:12:58 +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 87103434e3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-23 09:30:14 +08:00
James Chen 21a9f05110 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor 
Conflicts:
	cocos/2d/CCUserDefault.cpp
	cocos/2d/CCUserDefault.mm
	cocos/2d/CCUserDefaultAndroid.cpp
	cocos/2d/ZipUtils.cpp
	cocos/2d/platform/CCFileUtils.h
	cocos/2d/platform/CCSAXParser.cpp
 2013-12-20 21:12:11 +08:00
James Chen ab7a273354 closed #3465: New spine runtime support, update CMakeLists.txt 2013-12-20 20:18:32 +08:00
James Chen 0db2067f97 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-spine 2013-12-20 20:11:41 +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
James Chen cfec4d5b7e Updates spine test. 2013-12-19 21:35:43 +08:00
yinkaile c58963bd45 add support for tweenRotate property 2013-12-19 21:12:25 +08:00
James Chen df85ba8fd9 Merge commit 'refs/pull/4545/head' of git://github.com/cocos2d/cocos2d-x into new-spine 
Conflicts:
	cocos/editor-support/spine/CCSkeleton.h
 2013-12-19 21:07:24 +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
byeonggee.seo e673bd80bb new spine runtime applied 2013-12-19 10:50:37 +09: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
yinkaile 324732b867 change play arguments 2013-12-18 23:29:54 +08:00
yinkaile 7be834ea37 change play arguments 2013-12-18 22:57:18 +08:00
yinkaile 57c33e0604 fixed compile error 2013-12-18 22:36:10 +08:00
yinkaile d3a575e8cc change for iterator and callfunc 2013-12-18 22:07:33 +08:00
yinkaile 026811ca59 Merge branch 'develop' into Array 
Conflicts:
	cocos/scripting/auto-generated
	tools/bindings-generator
 2013-12-18 22:03:16 +08:00
James Chen 0695e32fff Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp. 2013-12-18 15:40:31 +08:00
James Chen 2892e8be3f Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData. 2013-12-18 14:58:17 +08:00
Ricardo Quesada 33c4f891a0 Adds 'CC' to renderer files 2013-12-17 18:41:09 -08:00
Ricardo Quesada d6be81b7a8 The Renderer is not a singleton 
In order to access, you have to get it from the Director

`Director::getInstance()->getRenderer()`
 2013-12-17 17:50:17 -08:00
Ricardo Quesada 10eafeaeed fixes warning compiler 2013-12-17 11:16:30 -08:00
yinkaile 581a7856de fixed compiler error 2013-12-17 19:32:16 +08:00
Huabing.Xu 25fc3d3c2a Merge branch 'develop' into develop_gridNode 
* develop: (105 commits)
  update armature to new render
  iOS & Mac project fix.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  use size_t replace unsigned int for record redeque::size returned value.
  issue #2171: Updates CMakeLists.txt.
  issue #2171: Binds New renderer classes, ignores NewTextureAtlas.
  issue #2171: Adds header files of renderer in cocos2d.h.
  issue #2171: Reorder renderer files for iOS & mac project.
  issue #2171: small fix in ccTypes.h
  issue #2171: Don’t ‘using namespace std;’ in header file.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #2171: Ignores Director::getFrustum.
  issue #2171: Fixing compilation errors for Linux port.
  issue #2171: NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
  issue #2171: [New Renderer] Fixing compilation errors for Android.
  [Win32] fix argument type. - argument of interface is ssize_t.
  Update AUTHORS [ci skip]
  Update CHANGELOG [ci skip]
  Add mouse scrolling support for extension test
  issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
  ...

Conflicts:
	cocos/2d/CCNode.cpp
	cocos/2d/cocos2d.vcxproj.filters
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-12-17 18:16:05 +08:00
yinkaile 6ff45b09e7 Merge branch 'newRenderer' into Array 
Conflicts:
	cocos/editor-support/cocostudio/CCArmature.cpp
	cocos/editor-support/cocostudio/CCArmature.h
	cocos/editor-support/cocostudio/CCBatchNode.cpp
	cocos/editor-support/cocostudio/CCColliderDetector.cpp
	cocos/scripting/auto-generated
	tools/bindings-generator
 2013-12-17 18:06:11 +08:00
James Chen c0d741d0d8 Merge pull request #4507 from dumganhar/del-vector-foreach 
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
 2013-12-17 01:55:35 -08:00
James Chen d16fa07661 Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort. 2013-12-17 17:45:29 +08:00
minggo bcb07abb7b Merge pull request #4505 from 2youyouo2/newRenderer 
update armature to new render
 2013-12-17 01:43:07 -08:00
yinkaile bc868cc004 update armature to new render 2013-12-17 17:00:01 +08:00
James Chen 12cc6c6153 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer 
Conflicts:
	cocos/2d/CMakeLists.txt
 2013-12-17 15:50:24 +08:00
minggo 16ed9155c0 Merge pull request #4460 from Dhilan007/label_distanceField 
new label:add support for distanceField
 2013-12-16 23:18:41 -08:00
James Chen 2a38d4fe94 issue #2171: Fixing compilation errors for Linux port. 2013-12-17 14:50:40 +08:00
James Chen d74ebe18a9 issue #2171: NULL —> nullptr for Android warning of CCBAnimationManager.cpp. 2013-12-17 14:19:35 +08:00
Liam 3c26106ffb update ui animation with frame ease type 2013-12-16 18:13:49 +08:00
youyou 81cdbea9c8 change Array to Vector, Dictionary to Map 2013-12-16 14:34:09 +08:00
Huabing.Xu b1eacd52cb Merge branch 'develop' into develop_gridNode 
* develop:
  fix compile error related to ssize_t.
  issue #2771: add and change some physics API, and add more documents
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Some fixes for XXX:getDescription.
  Reverts CCSpriteBatchNode.h
  size_t —> ssize_t in CCTMXLayer.cpp
  issue #2771: add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
  Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
  [AUTO] : updating submodule reference to latest autogenerated bindings
  More renames of description() to getDescription()
  getDescription() works as expected
  fix compiling error after fixing conflicts
  fix compiling error after fixing conflicts
  use ssize_t for index
  use ssize_t for index and capacity
  use ssize_t for capacity and index in containers
  Fix:Remove some needless lua binding functions and resolve a bug
 2013-12-16 10:43:49 +08:00
Ricardo Quesada 3838268fd0 Merge branch 'develop' into newRenderer 2013-12-14 19:28:01 -08:00
youyou 917bd8c3d9 change Array to Vector 2013-12-13 19:40:38 +08:00
boyu0 defae416f3 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-13 18:09:39 +08:00
youyou 0e8c3409e5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
 2013-12-13 16:28:50 +08:00
youyou 6a3aff0861 fixed change animation internal, animation speed not right 2013-12-13 15:58:58 +08:00
youyou 1bdf1a44a1 1.change blendfunc method 
2.support custom easing
 2013-12-13 15:02:09 +08:00
Dhilan007 39280d55f3 new label:add support for distanceField 
PerformanceTest:add performance test for label.
 2013-12-13 12:42:15 +08:00
Ricardo Quesada 29a15c885a Merge branch 'develop' into newRenderer 2013-12-12 11:44:09 -08:00
boyu0 d7106d49be Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-12 17:04:21 +08:00
Huabing.Xu 5509bd48ef remove _grid 2013-12-12 16:21:21 +08:00
minggo 16efe94946 fix compiling error after fixing conflicts 2013-12-12 14:48:27 +08:00
minggo 1e9c763b40 use ssize_t for index and capacity 2013-12-12 14:48:26 +08:00
Ricardo Quesada 6d1abc7d4d Merge branch 'develop' into newRenderer 2013-12-11 15:28:05 -08:00
James Chen cc567a3077 issue #2790: Vector::remove —> Vector::erase. 2013-12-11 18:08:06 +08:00
boyu0 7cbce905bf issue #3162: delete duplicate functions. 2013-12-11 16:12:14 +08:00
James Chen 473b21a05a Merge pull request #4471 from Dhilan007/compile_error_vs_131210 
fix compile error for vs project.
 2013-12-10 18:06:57 -08:00
Ricardo Quesada 3b66d09bf5 Merge branch 'develop' into newRenderer 2013-12-10 11:10:55 -08:00
Ricardo Quesada 23222923bf Migrated code to Matrix4 2013-12-10 11:07:15 -08:00
Dhilan007 35eeebe64a add comments for include "CCStdC.h" only for windows 2013-12-10 23:13:21 +08:00
Dhilan007 abef5b59fa fix compile error for vs project 2013-12-10 21:20:52 +08:00
James Chen f10bd853c0 A warning fix in CCBAnimationManager. Uses CallFuncN::create(std::function) instead. 2013-12-10 20:33:21 +08:00
boyu0 a71394b122 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-10 18:03:41 +08:00
boyu0 083a0eea2a Remove all std::move in function returns. 2013-12-10 16:06:05 +08:00
James Chen e03dc97726 isssue #2790: Removes unused FIXME comment. 2013-12-10 13:51:58 +08:00
James Chen 1a385c1572 issue #2790: _actionManager —> _animationManager. 2013-12-10 13:45:15 +08:00
James Chen 52d00477ad issue #2790: Uses std::shared_ptr for _actionManagers. 2013-12-10 13:42:55 +08:00
James Chen 479477be52 issue #2790: Stops all actions when reset _rootNode. 2013-12-10 13:41:51 +08:00
James Chen 64fd2386a9 issue #2790: Uses Map<K, V> instead of Dictionary in CCBAnimationManager. 2013-12-09 18:17:04 +08:00
James Chen 8b69994d5c issue #2790: Removes CCBValue. 2013-12-09 17:55:56 +08:00
James Chen d1d5659818 issue #2790: Uses Vector<T> or Map<K, V> as many as possible for CCBReader. 2013-12-09 17:55:56 +08:00
James Chen 21b84339ca issue #2790: Reverts to use Dictionary to avoid a strange bug for CCBReader. 2013-12-09 17:55:56 +08:00
James Chen d63b933eb3 issue #2790: More CCArray —> Vector<T> or ValueVector for CCBAnimationMangager 2013-12-09 17:55:55 +08:00
youyou a884a70045 fix2d compling warning 2013-12-09 13:56:07 +08:00
youyou c96bc7b58d fix collider Synchronization 2013-12-09 11:14:53 +08:00
James Chen 13111c2cd9 issue #2790: Error fix in CCBReader. 2013-12-09 09:54:04 +08:00
James Chen e07f2bdddd issue #2790: Vector<T> and Map<K, V> for CCBReader. Not finished yet. 2013-12-08 22:17:54 +08:00
boyu0 4d0e3dbd8d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-06 18:16:26 +08:00
boyu0 af5f496861 issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed. 2013-12-06 18:07:16 +08:00
minggo fa7c97171b fix some warnings 2013-12-06 16:32:06 +08:00
youyou e17b9d839b 1.add TEST_EASING 
2.add play serveral movement function
3.update TEST_COLLIDER_DETECTOR
4.fixed movement event
 2013-12-06 13:40:49 +08:00
minggo b67d567a79 replace long with int or ssize_t 2013-12-05 17:22:22 +08:00
James Chen 499a0404d4 issue #2790: Renames some functions in Vector<T>. Makes it more like stl vector. 2013-12-05 10:35:10 +08:00
James Chen 9928e8bef1 issue #2790: Uses Vector<T>::getObjectAtIndex instead of Vector<T>[] operator to avoid some mistakes. 2013-12-04 16:01:55 +08:00
James Chen 1d5984b29a issue #2790: Vector::makeObjectsPerformCallback —> Vector::forEach 2013-12-04 16:01:02 +08:00
James Chen d4d864216b issue #2790: Deletes Vector::init, adds Vector::setCapacity. 2013-12-04 16:00:18 +08:00
James Chen 90062b656d issue #2790: Node::_children is Vector<Node*> now. 2013-12-04 16:00:17 +08:00
James Chen c152652c5b issue #2790: Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr). 2013-12-04 15:56:08 +08:00
2youyou2 963dd6852b Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-12-02 13:33:26 +08:00
2youyou2 246b03d52d fixed alpha effect 2013-12-02 13:32:31 +08:00
minggo eded94ef76 don't create a pool, since it doesn't invoke any iOS dependent codes 2013-11-27 17:43:54 +08:00
minggo bcb131262c add helper funcion to invoke a function in gl thread 2013-11-27 16:49:07 +08:00
2youyou2 36cd51a453 change ColliderFilter param type 2013-11-27 11:39:58 +08:00
2youyou2 c0bd7f012c change ColliderFilter param type 2013-11-27 11:32:37 +08:00
2youyou2 9cfb7b2a85 change armature version 2013-11-25 14:46:10 +08:00
Ricardo Quesada a26b385b11 Merge branch 'develop' into constructors_are_protected 2013-11-21 10:56:03 -08:00
Ricardo Quesada d3c44cbb0b Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/2d/CCLayer.h
 2013-11-20 11:23:03 -08:00
samuele3 07ea8647c3 Add doxygen comments for the CocoStudio 2013-11-20 15:07:34 +08:00
samuele3 3ed7a79a84 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-20 13:01:07 +08:00
samuele3 8a408f9951 Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
James Chen 60ed1dcd3a Merge pull request #4341 from Dhilan007/touchfix 
fix touches not working in cocosbuilder
 2013-11-19 18:20:42 -08:00
Ricardo Quesada 9a51d6c0ba Merge branch 'develop' into constructors_are_protected 2013-11-19 17:59:43 -08:00
Ricardo Quesada 0d750cdbaf Adds virtual destructors on Interfaces 
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to  Interface classes

And also enables  'warn on  missing virtual destructors'
 2013-11-19 16:57:23 -08:00
Ricardo Quesada 5c74c938ee Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/2d/CCLayer.h
 2013-11-19 13:13:57 -08:00
Dhilan007 23f36e0406 fix touches not working in cocosbuilder 2013-11-19 19:24:04 +08:00
minggo 2848e0dc3e Merge pull request #4328 from 2youyouo2/develop 
[ci skip]update armature
 2013-11-18 19:46:29 -08:00
2youyou2 d5478f1ca2 fix if last frame has tween effect, armature may display wrong 2013-11-19 11:44:17 +08:00
minggo bd00e6fabb Merge pull request #4326 from dabingnn/develop_hotFix 
[ci skip]Develop hot fix
 2013-11-18 19:33:07 -08:00
Huabing.Xu 1fc928df41 HotFix: use static cast for format conversion 2013-11-19 11:32:12 +08:00
yinkaile f308f2f95a fix CCArmature display wrong on mac version 2013-11-19 11:22:40 +08:00
Huabing.Xu 49f34c5339 HotFix: fix CCB particle alpha blend-> setBlendAddictive after set texture 2013-11-19 11:19:12 +08:00
Huabing.Xu 458b9b53da HotFix: fix CCB particle alpha blend 2013-11-19 11:16:14 +08:00
minggo 1e8a3fc92f Merge pull request #4322 from dabingnn/develop_hotFix 
[ci skip]HotFix: fix bug spine alpha blend error
 2013-11-18 18:54:16 -08:00
Huabing.Xu 69b38f6e40 HotFix: change tab to space 2013-11-19 10:42:37 +08:00
Huabing.Xu d9681150fc HotFix: fix bug spine alpha blend error 2013-11-19 10:15:12 +08:00
Ricardo Quesada c943702bc8 Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/editor-support/cocostudio/CCActionObject.cpp
	samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h
 2013-11-18 11:07:15 -08:00
Liam c7932b6181 fixed ui anmation crash when stop animation 2013-11-19 00:57:22 +08:00
minggo 1ed8cfee7c Merge pull request #4297 from liamcindy/develop 
[ci skip]Shielded unusefull log for develop branch
 2013-11-18 07:10:40 -08:00
minggo 946fd16adc Merge pull request #4295 from samuele3hu/developCCS 
[ci skip]hot fix:Repair the crash of cocostudio and the bug of some lua test samples can't come in
 2013-11-17 23:10:01 -08:00
minggo 5c41130083 Merge pull request #4293 from 2youyouo2/develop 
[ci skip]fixed BatchNode's _children is empty, draw will crash
 2013-11-17 23:01:32 -08:00
Liam 66443255a6 Shielded unusefull log 2013-11-18 14:20:50 +08:00
samuele3 e6ed691e7c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-18 14:13:05 +08:00
samuele3 5c8d24a11e hot fix:Repair the crash of cocostudio and the bug of some lua test samples can't come in 2013-11-18 14:12:07 +08:00
2youyou2 4f2603f69c fixed BatchNode's _children is empty, draw will crash 2013-11-18 13:23:38 +08:00