Commit Graph

14270 Commits

Author SHA1 Message Date
James Chen 3297421ba4 Merge pull request from samuele3hu/developConversion
issue #3374:Register the lua manual binding funtions leading to change the top index of lua state
2013-12-10 22:40:03 -08:00
samuele3hu d104f49dea Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-11 12:06:37 +08:00
samuele3hu 6d8deac8a8 issue #3374:Register the lua manual binding funtions leading to the top index of lua state 2013-12-11 12:05:46 +08:00
James Chen 473b21a05a Merge pull request 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 431eac78e5 Merge pull request from dumganhar/warrning-fix
A warning fix in CCBAnimationManager. Uses CallFuncN::create(std::function) instead.
2013-12-10 04:35:26 -08:00
James Chen f10bd853c0 A warning fix in CCBAnimationManager. Uses CallFuncN::create(std::function) instead. 2013-12-10 20:33:21 +08:00
James Chen 1db469fa3d Merge pull request from CocosRobot/updategeneratedsubmodule_1386674868
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 03:28:49 -08:00
CocosRobot bf11a8d309 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-10 11:27:50 +00:00
James Chen 47541523e8 Merge pull request from dumganhar/iss2790-deprecate-ccarray
issue : HttpClient and TouchesTest uses Vector<T> now.
2013-12-10 03:24:31 -08:00
James Chen dcbd693fec Merge pull request from samuele3hu/developConversion
issue #2790:Resolve some errors of basical conversion functions
2013-12-10 03:21:02 -08:00
James Chen bf7b46c315 issue : TouchesTest.h/.cpp uses Vector<T> now. 2013-12-10 18:27:13 +08:00
samuele3hu cc2323b636 issue #2790:Open travis support 2013-12-10 18:26:10 +08:00
Dhilan007 7c97ed2bcd Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2013-12-10 18:20:40 +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
samuele3hu 89c079009b issue #2790:Resolve some errors of basical conversion functions 2013-12-10 18:01:40 +08:00
James Chen 627a1bf700 issue : HttpClient uses Vector<T> now. 2013-12-10 16:41:13 +08:00
James Chen c130da3d6f Merge pull request from CocosRobot/updategeneratedsubmodule_1386664198
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 00:39:55 -08:00
CocosRobot a775f7940d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-10 08:30:00 +00:00
James Chen 882d3998cb Merge pull request from samuele3hu/developConversion
issue #2790:Update binding-generator submodule
2013-12-10 00:13:04 -08:00
James Chen eff05669b9 Merge pull request from boyu0/edit_using_of_std_move
Edit using of std move
2013-12-10 00:12:07 -08:00
James Chen 98eebb67a9 Merge pull request from CocosRobot/updategeneratedsubmodule_1386660097
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 00:10:04 -08:00
samuele3hu 883ecaa03f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-10 16:07:58 +08:00
boyu0 083a0eea2a Remove all std::move in function returns. 2013-12-10 16:06:05 +08:00
boyu0 698cdc5591 add std::move to Vector move constructor and move equal operator overloading function. 2013-12-10 15:58:13 +08:00
CocosRobot b5a0048ffd [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-10 07:21:39 +00:00
samuele3hu 1ed8d108f7 issue #2790:Update binding-generator 2013-12-10 15:21:21 +08:00
minggo 55270cecb4 Merge pull request from dumganhar/iss2790-deprecate-ccarray
issue : Don't use CCDictionary, CCArray for CCBReader, use std::unordered_map, Vector<T>, Map<K, V> instead.
2013-12-09 23:15:43 -08:00
James Chen e03dc97726 isssue : Removes unused FIXME comment. 2013-12-10 13:51:58 +08:00
James Chen 34e1ffb319 Merge pull request from CocosRobot/updategeneratedsubmodule_1386648497
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-09 21:46:32 -08:00
James Chen 1a385c1572 issue : _actionManager —> _animationManager. 2013-12-10 13:45:15 +08:00
James Chen 52d00477ad issue : Uses std::shared_ptr for _actionManagers. 2013-12-10 13:42:55 +08:00
James Chen 479477be52 issue : Stops all actions when reset _rootNode. 2013-12-10 13:41:51 +08:00
CocosRobot 1927e3e62c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-10 04:08:19 +00:00
James Chen 75c9d415b4 Merge pull request from samuele3hu/developConversion
issue #2790:Add more conversion functions to support templates containers
2013-12-09 20:01:42 -08:00
samuele3 85783fff2b issue #2790:Unify the format 2013-12-10 11:47:51 +08:00
samuele3 34c0147cf3 issue #2790:Resolve the compile error 2013-12-10 11:33:57 +08:00
samuele3 f801a8e5fe Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-10 11:21:59 +08:00
samuele3 c2e7299d8f Issue #2790:Add more conversion functions to support templates containers 2013-12-10 11:21:30 +08:00
Dhilan007 b2875618b2 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2013-12-10 10:15:53 +08:00
Ricardo Quesada 0222c6544e Migration to Mat4x4
Armature not migrated yet

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-12-09 17:32:51 -08:00
Ricardo Quesada aa00137fde Merge branch 'develop' into newRenderer 2013-12-09 11:10:00 -08:00
James Chen 64fd2386a9 issue : Uses Map<K, V> instead of Dictionary in CCBAnimationManager. 2013-12-09 18:17:04 +08:00
James Chen ad5daeb962 issue : Don’t bind CCBAnimationManager::addNode. 2013-12-09 17:55:56 +08:00
James Chen 8b69994d5c issue : Removes CCBValue. 2013-12-09 17:55:56 +08:00
James Chen d1d5659818 issue : Uses Vector<T> or Map<K, V> as many as possible for CCBReader. 2013-12-09 17:55:56 +08:00
James Chen f6dc9bf9b6 issue : Adds more ‘assignment operator’ method for CCValue. 2013-12-09 17:55:56 +08:00