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

14079 Commits

Author SHA1 Message Date
CocosRobot 4114b682ca [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-13 09:10:37 +00:00
James Chen ca4e7049ac Merge pull request #4484 from dumganhar/pr4479 
Merge PR 4479
 2013-12-13 01:03:43 -08:00
James Chen 189cf1a076 Some fixes for XXX:getDescription. 2013-12-13 16:51:57 +08:00
James Chen ed93c114e5 Reverts CCSpriteBatchNode.h 2013-12-13 16:47:42 +08:00
James Chen bb5ef615dd Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479 
Conflicts:
	cocos/2d/CCSpriteBatchNode.h
 2013-12-13 16:44:22 +08:00
James Chen 7a8f2ae235 size_t —> ssize_t in CCTMXLayer.cpp 2013-12-13 16:41:03 +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
boyu0 4befb50307 issue #2771: add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc 2013-12-13 16:26:26 +08:00
James Chen a52eafc3b8 Merge pull request #4483 from samuele3hu/developConversion 
Fix:Add more lua binding functions of ScriptHandlerMgr and some constants define
 2013-12-13 00:23:28 -08:00
youyou 6a3aff0861 fixed change animation internal, animation speed not right 2013-12-13 15:58:58 +08:00
samuele3hu 6c49131ed6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-13 15:51:03 +08:00
samuele3hu 98bd84c436 Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define 2013-12-13 15:50:12 +08:00
youyou 1bdf1a44a1 1.change blendfunc method 
2.support custom easing
 2013-12-13 15:02:09 +08:00
Dhilan007 8b9cfd7d35 fix compiling error on linux and android. 2013-12-13 12:58:16 +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 6ca6068cb7 Merge branch 'develop' into newRenderer 2013-12-12 14:58:47 -08:00
Ricardo Quesada 4c1acfe841 Merge pull request #4481 from CocosRobot/updategeneratedsubmodule_1386888533 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-12 14:58:11 -08:00
CocosRobot 644e2d923c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-12 22:48:57 +00:00
Ricardo Quesada 61cc365d9e Merge branch 'develop' into newRenderer 
Conflicts:
	cocos/2d/CCGLProgram.h
	cocos/2d/CCLabelTTF.h
 2013-12-12 14:41:42 -08:00
Ricardo Quesada 015d51b1ac Merge pull request #4480 from ricardoquesada/console_improvements 
Console improvements
 2013-12-12 14:39:54 -08:00
Ricardo Quesada f4c68e4eef More renames of description() to getDescription() 2013-12-12 14:38:12 -08:00
Ricardo Quesada a8c317bd83 getDescription() works as expected 
renames `description` to `getDescription`. Adds `virtual`  to it.
Adds `getDescription` to missing nodes.
 2013-12-12 14:30:22 -08:00
Ricardo Quesada ff57d9fa35 Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer 2013-12-12 11:44:21 -08:00
Ricardo Quesada 29a15c885a Merge branch 'develop' into newRenderer 2013-12-12 11:44:09 -08:00
Ricardo Quesada 4ab98ee8e7 Merge branch 'develop' into newRenderer 2013-12-12 09:14:30 -08:00
James Chen 3721ffde64 Merge pull request #4478 from samuele3hu/developConversion 
Fix:Remove some needless lua binding functions and resolve a bug
 2013-12-12 02:04:00 -08:00
minggo 21e2b341f1 fix compiling error after fixing conflicts 2013-12-12 14:59:33 +08:00
minggo 16efe94946 fix compiling error after fixing conflicts 2013-12-12 14:48:27 +08:00
minggo 040c42ebfd use ssize_t for index 2013-12-12 14:48:26 +08:00
minggo 1e9c763b40 use ssize_t for index and capacity 2013-12-12 14:48:26 +08:00
minggo ab23b47043 use ssize_t for capacity and index in containers 2013-12-12 14:48:26 +08:00
samuele3hu edfebce42c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-12 14:48:21 +08:00
samuele3hu 4ccceea230 Fix:Remove some needless lua binding functions and resolve a bug 2013-12-12 14:47:35 +08:00
James Chen 8ad45c458f Merge pull request #4477 from dumganhar/iss2790-container-comments 
issue #2790: Compilation error fix in CCMap.h.
 2013-12-11 22:38:42 -08:00
James Chen 3649c12d37 issue #2790: Compilation error fix in CCMap.h. 2013-12-12 14:36:59 +08:00
James Chen b40d799178 Merge pull request #4476 from dumganhar/iss2790-container-comments 
issue #2790: Updates comments for Map<K, V> and Vector<T> container.
 2013-12-11 22:24:13 -08:00
James Chen 93bd45cefd issue #2790: Adds comments for Vector<T>. 
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
 2013-12-12 14:22:49 +08:00
James Chen 3fc9c93102 issue #2790: Comment fix for Map<K, V>::clear. 
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
 2013-12-12 12:58:01 +08:00
James Chen 6264336809 issue #2790: Updates comments for Map<K, V> container. 
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
 2013-12-12 11:54:03 +08:00
James Chen 24d8cf0872 Merge pull request #4475 from CocosRobot/updategeneratedsubmodule_1386819162 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-11 19:41:21 -08:00
CocosRobot f12895a020 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-12 03:32:44 +00:00
James Chen 3375779f2d Merge pull request #4473 from dumganhar/iss2790-deprecate-ccdict 
issue #2790: Deprecates CCDictionary, uses ValueMap for pure base data. Adds StringUtils class .
 2013-12-11 19:26:21 -08:00
James Chen 320ae15db4 issue #2790: Lua compilation fix. 2013-12-12 10:54:41 +08:00
James Chen b5bab598b3 issue #2790: Disables deprecated warning for android to make Travis-CI happy. 2013-12-12 10:35:13 +08:00
James Chen 5c62fe8f3f issue #2790: Reverts comments in CCString.h 2013-12-12 10:34:41 +08:00
James Chen 92a7aa03de issue #2790: Reverts comments in CCDictionary.h 2013-12-12 09:53:50 +08:00
James Chen b2e8bdce1e issue #2790: Uses StringUtils::format for Node::description(). 2013-12-12 09:47:35 +08:00
James Chen 976bef8b68 issue #2790: StringUtils::toStringWithFormat —> StringUtils::format. 2013-12-12 09:37:56 +08:00
Ricardo Quesada 6d1abc7d4d Merge branch 'develop' into newRenderer 2013-12-11 15:28:05 -08:00
James Chen 9e637a3a3b issue #2790: GLProgram::getXXXLog return `std::string` to prevent using CCString which was deprecated. 2013-12-11 22:35:37 +08:00