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

1264 Commits

Author SHA1 Message Date
Ricardo Quesada d35846b0d4 Merge pull request #4588 from ricardoquesada/events_in_director 
Events in director
 2013-12-21 10:58:43 -08:00
Ricardo Quesada 49903ea779 Director emits events after visit, after draw and after update. And when the projection changes 
Adds helper functions on EventDispatcher
Adds test in NewEventDispatcherTest
 2013-12-21 10:55:16 -08:00
Ricardo Quesada eea2e70d1e Adds events in director 2013-12-21 00:56:28 -08:00
CocosRobot 58e25a657f [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-21 03:47:33 +00:00
Ricardo Quesada 72d77bb035 removes dirty from ActionCamera 2013-12-20 19:45:30 -08:00
Ricardo Quesada eadbaa3bf5 Adds comment to ActionCamera file 2013-12-20 19:37:14 -08:00
Ricardo Quesada fd8c7e9a5d Removes CCCamera 
Not needed anymore.
 2013-12-20 19:24:56 -08:00
Ricardo Quesada b8b7714431 Camera is working OK in 2d projection 2013-12-20 19:19:24 -08:00
Ricardo Quesada d8ad5291f4 Nore camera 2013-12-20 16:33:31 -08:00
Ricardo Quesada 0703d974e2 NodeGrid fixes 
Adds license
Removes unneded matrix
replaces std::for_each with for range-loop
 2013-12-20 11:52:52 -08:00
James Chen 2a7b2c107a Updates CCUserDefaultAndroid.cpp. 2013-12-20 21:51:53 +08:00
James Chen b504d817b5 Small bug fix in CCData. 2013-12-20 21:41:20 +08:00
minggo 9bea08ded9 Merge pull request #4580 from dabingnn/develop_MotionStreak 
Migrate MotionStreak to new renderer
 2013-12-20 05:36:52 -08:00
Huabing.Xu 739cf0ce85 Migrate MotionStreak to new renderer 2013-12-20 21:21:50 +08:00
James Chen 9e05f300f3 [Data Refactor] compilation error fix. 2013-12-20 21:16:46 +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
James Chen 3d76281617 Removes an unused assert. 2013-12-20 19:49:25 +08:00
James Chen 5852c66e5a closed #3463: ListenerID is std::string now. To avoid hash collision when using lots of EventCustoms. 2013-12-20 19:47:11 +08:00
Huabing.Xu a8d2ae9eda Merge branch 'develop' into develop_transitionScene 
* develop:
  [AUTO] : updating submodule reference to latest autogenerated bindings
  closed #3463: Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding. Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()), We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
  Update CHANGELOG [ci skip]
  Update AUTHORS [ci skip]
  closed #3457: Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
 2013-12-20 19:15:50 +08:00
byeonggee.seo f3e4d9277e spine android build phase moved 2013-12-20 19:16:16 +09:00
CocosRobot f3d3e65e76 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-20 09:35:05 +00:00
James Chen 55ff96df3a closed #3463: Potential hash collision by using typeid(T).hash_code() in JSB and LuaBinding. 
Instead of using std::unordered_map<long, T>(long is the hash_code generated by typeid(T).hash_code()),
We needs to use std::unordered_map<std::string, T> to avoid collision since unordered_map internally processes collisions.
 2013-12-20 17:13:09 +08:00
yinkaile 3bd1562f4a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-20 16:46:29 +08:00
James Chen e54c993918 Merge pull request #4564 from dmurtagh/UserDefault_GetDouble_Fix_For_Android 
Fixed non-functioning default value for CCUserDefault::getDoubleForKey()
 2013-12-20 00:13:05 -08:00
byeonggee.seo 0a30a9a604 spine simple JS binding supported 2013-12-20 16:10:15 +09:00
Huabing.Xu ef5b072182 fix transition scene CrossFade 2013-12-20 14:38:02 +08:00
James Chen 2c590cea3e closed #3457: Fix of UserDefault. Infinite loop in UserDefault's destructor on iOS. The destructor of UserDefault is private now. 2013-12-20 14:06:24 +08:00
Huabing.Xu 87f62bc8a0 Merge branch 'develop' into develop_transitionScene 
* develop:
  #include <string> in CCComponentContainer.h to fix linux build failure.
  #include <algorithm> for std::find in CCVector.h.
  const love in CCFileUtils.cpp.
  More std::for_each —> for(const auto& …)
 2013-12-20 12:45:22 +08:00
minggo ea751f8f1f Merge pull request #4568 from dabingnn/develop_transitionScene 
fix transition scene progress timer
 2013-12-19 19:06:06 -08:00
CocosRobot 8c0d74bb33 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-20 02:56:57 +00:00
yinkaile 4f003da8cb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-20 10:53:37 +08:00
Huabing.Xu 9385fb3481 fix transition scene progress timer 2013-12-20 10:53:35 +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
James Chen a53f00c579 #include <string> in CCComponentContainer.h to fix linux build failure. 2013-12-20 10:41:29 +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 3dba88c5c9 #include <algorithm> for std::find in CCVector.h. 2013-12-20 10:12:07 +08:00
James Chen 58772d7dec const love in CCFileUtils.cpp. 2013-12-20 10:11:41 +08:00
James Chen 34382b4a8a More std::for_each —> for(const auto& …) 2013-12-20 09:54:50 +08:00
Ricardo Quesada f5d0d1ce43 batched children work as expected 
Fixed order in the multi matrix.
 2013-12-19 16:33:47 -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
Damien 52c66a678c Fixed non-functioning default value for CCUserDefault::getDoubleForKey() 
- defaultValue was not being passed into the JNI CallStaticDoubleMethod
method previously.
-  CCUserDefault::getDoubleForKey() would return undefined garbage when
the key doesn’t exist.
Test Case:
Call the following from anywhere in your code (in release
configuration). X will be garbage.
Call the following from your code:
double x =
CCUserDefault::sharedUserDefault()->getDoubleForKey("Some-Non-existant-k
ey-1234", 0);
CCLOG("x = %4.2f", x);

Fix Tested on Android. Affects Android only.
 2013-12-19 12:32:51 -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
Huabing.Xu 61cf9e49eb change TransitionPageTurn::_outSceneProxy when class construction instead of onEnter 2013-12-19 22:01:32 +08:00
Huabing.Xu 517fec4de7 change TransitionTurnOffTiles::_outSceneProxy when class construction instead of onEnter 2013-12-19 21:49:21 +08:00
Huabing.Xu 034e1152e5 minor change accord to cocos2d coding style 2013-12-19 21:41:07 +08:00
Huabing.Xu 9fec597ff3 remove unreachable code 2013-12-19 21:36:44 +08:00
James Chen cfec4d5b7e Updates spine test. 2013-12-19 21:35:43 +08:00
CocosRobot 982d5626fc [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 13:13:34 +00:00
yinkaile 05e0d03ca9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-19 21:13:15 +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
CocosRobot fc1516aee4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 12:54:14 +00:00
yinkaile b367896f94 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-19 20:50:27 +08:00
James Chen 3dc052db4f Fixes linux and windows building failure. 2013-12-19 20:32:22 +08:00
James Chen 755d29b0e1 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into more_container_bind 2013-12-19 20:17:54 +08:00
James Chen f73e939b57 Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>. 2013-12-19 20:17:44 +08:00
CocosRobot 8421d43195 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 10:12:28 +00:00
Huabing.Xu 44366c653c fix compile error 2013-12-19 17:20:36 +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
Huabing.Xu 911e5b0bac fix bug : group command nesting will cause infinite loop 2013-12-19 16:55:22 +08:00
Huabing.Xu 1bc7250f7e node grid migrating to new renderer 2013-12-19 16:54:39 +08:00
yinkaile c02272ade3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-19 15:44:05 +08:00
yinkaile 140bd2ecad fixed armature position not right 2013-12-19 15:43:32 +08:00
Ricardo Quesada 1ed37df37f Merge pull request #4553 from ricardoquesada/skew_fixes 
Skew works again!
 2013-12-18 21:11:47 -08:00
Ricardo Quesada 1d3cc7a24c Skew works again! 2013-12-18 21:11:06 -08:00
CocosRobot ac24dec620 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 04:19:07 +00:00
James Chen 113fa9924e Merge pull request #4550 from dumganhar/merge-pr-4532 
Merge pr 4532
 2013-12-18 20:12:18 -08:00
CocosRobot 403315e315 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-19 03:58:41 +00:00
James Chen f8b7d70d92 Reverts submodule. 2013-12-19 11:53:56 +08:00
James Chen d31c1457b1 Merge pull request #4546 from Dhilan007/update_vsProject 
update vs project for removes unneeded files
 2013-12-18 19:30:21 -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 d138925aa0 Merge branch 'develop' into node_fixes 2013-12-18 18:33:56 -08:00
Ricardo Quesada b9a64725ab iterator in Sprite fixes 
And replaces some std::for_each() with for() to prevent another object in the stack.
 2013-12-18 18:33:04 -08:00
Dhilan007 ffa6ad3cb2 update vs project for removes unneeded files 2013-12-19 10:24:50 +08:00
minggo 9fc28e6c7d Merge pull request #4534 from boyu0/edit_hungarian_notation 
Edit hungarian notation
 2013-12-18 18:10:17 -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
boyu0 c6cc77e75b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation 2013-12-19 09:45:21 +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
CocosRobot 228b4ebf75 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 22:11:07 +00:00
Ricardo Quesada 7616edd9f3 Improves SpriteTest 
Improves SpriteTest.
It is easier to see if Sprite works as SpriteBatchNode (and vice-versa).

Needed for the new renderer.

Also adds `const` to title() and subtitle()
 2013-12-18 13:52:10 -08:00
Ricardo Quesada a175e5a13c Merge pull request #4539 from CocosRobot/updategeneratedsubmodule_1387397647 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-18 12:18:22 -08:00
CocosRobot d0779b5352 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 20:14:20 +00:00
Ricardo Quesada b36d77b1c2 Android and Linux fixes 2013-12-18 12:07:51 -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
Ricardo Quesada 903844c7bd Removes unneeded files 
New functionality is merged into the 'official' classes
 2013-12-18 11:44:45 -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
boyu0 d0b039ceda fix compile errors. 2013-12-18 22:44:03 +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
boyu0 71be55a9aa revert AccelerometerSimulation.m 2013-12-18 19:02:49 +08:00
boyu0 50544a04a7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation 2013-12-18 18:53:44 +08:00
boyu0 f16384a105 fix more code with hungarian notation 2013-12-18 18:51:36 +08:00
boyu0 d16c67096a revert submodules 2013-12-18 18:33:39 +08:00
boyu0 082c3d274a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation 2013-12-18 18:05:30 +08:00
CocosRobot 000958bf82 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 09:57:15 +00:00
James Chen 9c0d39c6f9 Merge pull request #4531 from dumganhar/extension-warning-fix 
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
 2013-12-18 01:48:14 -08:00
boyu0 e07c4ffec1 Change NULL to nullptr, edit hungarian notation. 2013-12-18 17:47:20 +08:00
Huabing.Xu 46d1d5bb91 add GridNode New renderer imp 2013-12-18 17:19:50 +08:00
James Chen 589b71eecf Merge pull request #4530 from samuele3hu/developConversion 
issue #3402:Add the new label lua binding and the releated test cases
 2013-12-18 01:16:47 -08:00
James Chen ddc1328e6b Small fix in CCValue.cpp. visitMap is a template that supports IntValueMap and ValueMap. IntValueMap is confused. ValueMapIntKey seems better. 2013-12-18 17:01:57 +08:00
James Chen 7719c692b8 More warning fixes. 2013-12-18 16:03:07 +08:00
James Chen 581ba49399 Diables CC_ENABLE_CACHE_TEXTURE_DATA in Renderer::initGLView since Renderer is not inherited from Object now. CCNotificationCenter will not be able to work. 
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
 2013-12-18 15:41:57 +08:00
James Chen 0695e32fff Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp. 2013-12-18 15:40:31 +08:00
samuele3hu f5f95399fd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-18 14:58:35 +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
CocosRobot 8f1e94471e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-18 06:52:09 +00:00
James Chen 7a5074652c Merge pull request #4526 from samuele3hu/LuaConversion 
Add  support for unsigned short
 2013-12-17 22:43:42 -08:00
Dhilan007 2d9b7ee4fc update vs project for new renderer and fix compiling fail on vs. 2013-12-18 14:36:49 +08:00
samuele3hu 55830c3023 Add support for unsigned short 2013-12-18 13:47:59 +08:00
samuele3hu 4d4b96ba30 issue #3402:Add the new label lua binding and the releated test cases 2013-12-18 11:39:43 +08:00
Ricardo Quesada 24f89ac45c Revert... android platform is 10 2013-12-17 19:07:28 -08:00
Ricardo Quesada 156f69c528 Renderer is subclass of Object again... needed for Android. 
ouch
 2013-12-17 19:06:22 -08:00
Ricardo Quesada 5c9b8db0cb Updates project files file Linux and Android 2013-12-17 18:47:46 -08:00
Ricardo Quesada 33c4f891a0 Adds 'CC' to renderer files 2013-12-17 18:41:09 -08:00
Ricardo Quesada f369a8eec3 Adds correct License to Renderer files 2013-12-17 18:12:15 -08:00
Ricardo Quesada 3f3071fbb6 Cleanup RenderCommand code 
RenderCommand code is cleaner
 2013-12-17 18:02:11 -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
Ricardo Quesada 441cb6c282 fixes warnings in QuadCommand 2013-12-17 10:35:15 -08:00
Ricardo Quesada ff106ed070 fixes warning on Label Fragment shader 2013-12-17 10:01:38 -08:00
yinkaile 581a7856de fixed compiler error 2013-12-17 19:32:16 +08:00
CocosRobot 12d8740537 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 10:39:43 +00:00
James Chen 9d1cb43d8c Merge pull request #4510 from dumganhar/vector-fix 
Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other).
 2013-12-17 02:28:56 -08:00
James Chen 37f408f2b9 Merge pull request #4506 from Dhilan007/ushort_jsb 
add API for transform unsigned short
 2013-12-17 02:20:56 -08:00
Dhilan007 0414926b52 add API for transform unsigned short 2013-12-17 18:17:04 +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
James Chen 3829f841e7 Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other). 2013-12-17 18:09:07 +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 16b643fbef Merge pull request #4508 from CocosRobot/updategeneratedsubmodule_1387273832 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-17 01:56:09 -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 c85f9877bb Reverts Vector::eraseObject, not need to return iterator. 2013-12-17 17:54:38 +08:00
CocosRobot 30521ff5a4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 09:50:36 +00: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
minggo 85ba3ee1a9 Merge pull request #4496 from Dhilan007/addImageAsync_IncorrectError 
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly ...
 2013-12-17 00:32:50 -08:00
CocosRobot 91cfecb931 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-17 08:13:06 +00:00
LinWenhai 649e6b8065 use size_t replace unsigned int for record redeque::size returned value. 2013-12-17 16:04:48 +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
James Chen 7fc7757470 issue #2171: Adds header files of renderer in cocos2d.h. 2013-12-17 15:40:50 +08:00
James Chen 08edcca9be issue #2171: small fix in ccTypes.h 2013-12-17 15:39:35 +08:00