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

13997 Commits

Author SHA1 Message Date
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
James Chen c2bccbaf98 issue #2790: Removes unneeded dynamic_cast in CCPhyicsWorld.cpp. 2013-12-11 22:09:59 +08:00
James Chen ce61fa4d9b issue #2790: const_iterator —> iterator to fix android build errors. 2013-12-11 22:09:22 +08:00
James Chen 45dabe305f issue #2790: performance improved for PhysicsWorld. 2013-12-11 18:08:07 +08:00
James Chen 36fd873257 issue #2790: Adds Vector::find. 2013-12-11 18:08:07 +08:00
James Chen cc567a3077 issue #2790: Vector::remove —> Vector::erase. 2013-12-11 18:08:06 +08:00
James Chen 093e310cab issue #2790: Vector::remove —> Vector::erase. 2013-12-11 18:08:06 +08:00
James Chen b66fccb5ab issue #2790: Removes Map::erase(first, last). 2013-12-11 18:08:06 +08:00
James Chen be9bb6998b issue #2790: Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes. 
Also renames Map::remove to Map::erase.
 2013-12-11 18:08:06 +08:00
James Chen 49cc9719a6 issue #2790: log —> CCLOG. 2013-12-11 18:08:06 +08:00
James Chen 6243401404 issue #2790: ConfigurationTest fix. 2013-12-11 18:08:06 +08:00
James Chen 40bc797b1f issue #2790: Configuration::getValue has default value now. 2013-12-11 18:08:06 +08:00
James Chen 1a1cef9342 issue #2790: Addes Value::Null variable. 2013-12-11 18:08:05 +08:00
James Chen 022df4c014 issue #2790: Removes test codes. 2013-12-11 18:08:05 +08:00
James Chen 2cda34d59a issue #2790: Deprecates CCDictionary, uses ValueMap for pure base data. Adds StringUtils class . 2013-12-11 18:08:05 +08:00
James Chen 3297421ba4 Merge pull request #4472 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 #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 431eac78e5 Merge pull request #4470 from dumganhar/warrning-fix 
A warning fix in CCBAnimationManager. Uses CallFuncN::create(std::function) instead.
 2013-12-10 04:35:26 -08:00