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

15784 Commits

Author SHA1 Message Date
lihex 56654c0ffb issue #3781, js not generate cocos2dx physics now. 2014-01-21 18:09:21 +08:00
minggo b0163b503e closed #3713:add test case in vs project 2014-01-21 18:00:34 +08:00
James Chen 7712ab7406 Update CHANGELOG [ci skip] 2014-01-21 17:56:24 +08:00
Dhilan007 697b0289c7 close #3805:fix wrap error and alignment error. 2014-01-21 17:55:49 +08:00
samuele3hu 77b5d4c772 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix 2014-01-21 17:52:13 +08:00
James Chen b647659c9e Merge pull request #5138 from natural-law/develop 
closed #2572, Amend the arithmetic of child's position in ParallaxNode::addChild().
 2014-01-21 01:51:57 -08:00
samuele3hu 2338d773dc fix:Add the “setZOrder” and “getZOrder” deprecated functions of the Node class in the lua’s script and update the related test cases 2014-01-21 17:51:49 +08:00
lihex 1a6b36184d issue #3781, Add windows bat script. 2014-01-21 17:48:49 +08:00
minggo 6378d10d5d issue #3713:add test case for autorelease pool 2014-01-21 17:47:59 +08:00
lihex a392a709cd issue #3781: Fix the variable name. 2014-01-21 17:40:20 +08:00
James Chen b9e5484e57 Merge pull request #5139 from samuele3hu/developPerf 
closed #3802:Add some manual lua-binding functions for the cocos2d::Lable and update the related test cases
 2014-01-21 01:11:53 -08:00
James Chen ccecaeb94f Merge pull request #5125 from Dhilan007/develop_label 
close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
 2014-01-21 00:58:21 -08:00
lihex 0109ebd707 issue #3781, Update genbinding script to fit new bindings-generator. 2014-01-21 16:53:07 +08:00
samuele3hu 88be8606b9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerf 2014-01-21 16:46:28 +08:00
samuele3hu da8e208f47 close #3802: Add some manual lua-binding functions for the Lable and update the related test cases 2014-01-21 16:36:29 +08:00
zhangbin 6c0ccea547 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-21 16:33:53 +08:00
zhangbin 89c8e7e2fb closed #2572, The arithmetic of child's position in ParallaxNode::addChild() is wrong. 2014-01-21 16:25:35 +08:00
James Chen 12fb55a291 Merge pull request #5137 from Dhilan007/develop_crash 
fix crash cause by string(null).
 2014-01-20 21:59:38 -08:00
minggo 5fd35c3bab Merge https://github.com/cocos2d/cocos2d-x into iss3713-replace_CCObject 2014-01-21 13:46:40 +08:00
Dhilan007 b8adba4c64 fix crash cause by string(null). 2014-01-21 11:59:43 +08:00
James Chen 8af2ac76df Merge pull request #5136 from dumganhar/iss3789-dispatcher-global-z 
closed #3789: EventDispatcher supports sorting listeners by global Z and local Z order. And adds relevant test case.
 2014-01-20 18:54:51 -08:00
Dhilan007 f22e4d474f move some method to FontFreeType that only relating to FontFreeType from Font. 2014-01-21 10:36:32 +08:00
minggo 386ba88974 issue #3713: remove unneeded codes to fix compiling error 2014-01-21 10:33:45 +08:00
James Chen 0f9c3fa59c closed #3789: EventDispatcher supports sorting listeners by global Z and local Z order. And adds relevant test case. 2014-01-21 10:23:05 +08:00
minggo ee06a5908c issue #3713:invoke static member function to destroy singleone object 2014-01-21 10:14:00 +08:00
James Chen d05ed0ac0e Merge pull request #5135 from Dhilan007/develop_crash 
fix compiling error cause by undefined ssize_t on vs.
 2014-01-20 18:05:18 -08:00
Dhilan007 d0e3a81d18 fix compiling error cause by undefined ssize_t on vs. 2014-01-21 09:52:43 +08:00
James Chen 4098380100 Update AUTHORS [ci skip] 2014-01-21 09:52:37 +08:00
James Chen 179ff7d981 Merge pull request #5134 from Pisces000221/patch-4 
Correct a mistake in README
 2014-01-20 17:51:27 -08:00
Pisces000221 27811768d4 Correct a mistake in README 2014-01-21 09:33:20 +08:00
James Chen 8fbe47cf55 Merge pull request #5133 from dumganhar/warning-fix 
Two fixes: 1) Warning fixes:  getZOrder —> getLocalZOrder, int -> long, 2) #include “cocos2d.h” was FORBIDDEN in cocos modules. Reduces the dependence when header file changes.
 2014-01-20 07:03:11 -08:00
James Chen 1c31871543 Compilation fixes in LocalStorage. include localStorage.h. 2014-01-20 23:01:44 +08:00
James Chen 84479b5df0 Reverts run-script.sh. add -j10 to improve build. 2014-01-20 22:47:23 +08:00
James Chen e5f723774d Updates jsbindings and localStorage. 2014-01-20 22:45:40 +08:00
James Chen b6be58482a [Travis CI] Removes -j10. 2014-01-20 22:32:20 +08:00
James Chen 8b6763a6ac LocalStorage: const char* —> const std::string&. 2014-01-20 22:31:56 +08:00
James Chen 43b2217fcf Include fix: CCFileUtils.h —> platform/CCFileUtils.h 2014-01-20 21:30:32 +08:00
James Chen 432534d857 #include “cocos2d.h” was FORBIDDEN in cocos modules. Reduces the dependence when header file changes. 2014-01-20 17:31:12 +08:00
minggo 3e5fbb2422 issue #3713: remove Object::_autoReleaseCount 2014-01-20 17:08:22 +08:00
James Chen 9f793f8a9b Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int 2014-01-20 15:03:30 +08:00
James Chen 39cd6d5cbf Merge pull request #5130 from dumganhar/develop 
A typo fix in EventDispatcher, DirtyFlag::FIXED_PRITORY —> DirtyFlag::FIXED_PRIORITY.
 2014-01-19 22:24:14 -08:00
James Chen 0468a1234b A typo fix in EventDispatcher, DirtyFlag::FIXED_PRITORY —> DirtyFlag::FIXED_PRIORITY. 2014-01-20 14:22:30 +08:00
James Chen 87c3f533ea Update CHANGELOG [ci skip] 2014-01-20 12:05:06 +08:00
James Chen a0c0954063 Merge pull request #5128 from dumganhar/iss2789-perf-container 
closed #2789: Adds a macro ‘’USE_STD_UNORDERED_MAP” for switching the implementation of Map<K, V> between using std::unordered_map and std::map.
 2014-01-19 20:03:23 -08:00
James Chen f97b40187c closed #2789: Adds a macro ‘’USE_STD_UNORDERED_MAP” for switching the implementation of Map<K, V> between using std::unordered_map and std::map. 2014-01-20 12:01:40 +08:00
minggo a6ec66c340 Merge pull request #5126 from liang8305/use_multiple_build_process 
get number of cpu, using multiple concurrent job processes;
 2014-01-19 19:50:48 -08:00
Dhilan007 802fc092be fix compiling error cause by miss include header file. 2014-01-20 11:43:13 +08:00
Dhilan007 7d44da43c4 fix compiling error cause by include a non-existent file. 2014-01-20 11:34:31 +08:00
James Chen ba57a9dec5 Merge pull request #5127 from dumganhar/iss2789-perf-container 
issue #2789: Adds performance test for Map<K, V> and Dictionary.
 2014-01-19 19:32:22 -08:00
Dhilan007 9f9e289f8c update xcode project. 2014-01-20 11:30:35 +08:00