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

17165 Commits

Author SHA1 Message Date
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
CaiWenzhi 7d6dda5727 Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone 2014-01-20 17:14:45 +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
Hanju Kim a8f21761a7 Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	cocos/2d/CCFontAtlas.cpp
	cocos/2d/CCFontDefinition.cpp
	cocos/base/CCConsole.cpp
 2014-01-20 16:03:16 +09: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
CaiWenzhi 000d68b8b7 Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone 2014-01-20 13:46:33 +08:00
CaiWenzhi 223857398d Add "override" 2014-01-20 13:44:44 +08:00
CaiWenzhi f10e1ee04c optimize scissor clipping 2014-01-20 13:38:13 +08:00
bmanGH 7513e8d643 Merge remote-tracking branch 'upstream/develop' into develop 
Conflicts:
	cocos/scripting/auto-generated
	tools/bindings-generator
 2014-01-20 12:18:36 +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
CaiWenzhi a3f9a636e2 Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone 2014-01-20 11:54:11 +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
Dhilan007 b8943da99e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label 2014-01-20 11:24:42 +08:00
James Chen b116a11c3c issue #2789: Adds performance test for Map<K, V> and Dictionary. 2014-01-20 11:13:30 +08:00
James Chen 0d4d4c53f4 issue #2789: Improves performance for Map<K,V>::keys. 2014-01-20 11:13:29 +08:00
James Chen 5018c9ba6c Removes unused cast in CCTMXTiledMap.cpp. 2014-01-20 11:13:29 +08:00
James Chen b11ef3069f issue #2789: Adds Map, Dictionary perf test, not yet finished. 2014-01-20 11:13:29 +08:00
liang8305 bf99e10c10 get number of cpu, using multiple concurrent job processes; 2014-01-20 10:37:01 +08:00
Dhilan007 a0b86abcf4 close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage. 2014-01-20 10:32:12 +08:00
minggo a328579238 [ci skip] 2014-01-20 09:43:45 +08:00
minggo 3ba0e1418b Merge pull request #5121 from liang8305/use_multiple_build_process 
When android project build native, using multiple concurrent job process...
 2014-01-19 17:38:05 -08:00
Ricardo Quesada 52d1816828 Merge pull request #5124 from CocosRobot/updategeneratedsubmodule_1390074821 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-18 11:56:04 -08:00
CocosRobot 47c8243812 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-18 19:53:43 +00:00
Ricardo Quesada d2b3a3e2ca Merge pull request #5123 from ricardoquesada/global_z_order 
GlobalZOrder is used for render priority...
 2014-01-18 11:43:32 -08:00
Ricardo Quesada d5858806dd Merge branch 'global_z_order' of github.com:ricardoquesada/cocos2d-x into global_z_order 
Conflicts:
	CHANGELOG
 2014-01-18 11:38:40 -08:00
Ricardo Quesada 5fcbf42356 GlobalZOrder is used for render priority... 
...and not vertexZ

Node::setGlobalZOrder() is used to change that.

Node::setZOrder() -> Node::setLocalZOrder();
 2014-01-18 11:38:06 -08:00
Ricardo Quesada b32ff0ed49 GlobalZOrder is used for render priority... 
...and not vertexZ

Node::setGlobalZOrder() is used to change that.

Node::setZOrder() -> Node::setLocalZOrder();
 2014-01-18 11:35:27 -08:00
liang8305 ac50e3f792 When android project build native, using multiple concurrent job processes; 
android项目编译时,默认利用"-j"参数,启用跟cpu数相同的多进程编译
 2014-01-18 15:27:59 +08:00
Ricardo Quesada b23dfeed5d Merge pull request #5120 from ricardoquesada/renderer_no_sort_z_0 
Renderer: Don't sort z=0 Commands
 2014-01-17 23:11:16 -08:00
Ricardo Quesada 069a4fb170 Renderer: Don't sort z=0 Commands 
If Command has z==0, then those elements won't be sorted.
Only Z !=0 will be sorted, and it will use `sort` instead of `stable_sort`
for z!=0, since it is faster
 2014-01-17 23:10:04 -08:00
James Chen ca58cc06b7 Merge pull request #5119 from edwardzhou/updateSpineLuaNamespaceManual 
fix namespace in spine lua manual binding
 2014-01-17 19:01:41 -08:00
edwardzhou 86e102ab16 fix namespace in spine lua manual binding 2014-01-18 10:58:17 +08:00
James Chen 08bb3b1060 Update CHANGELOG [ci skip] 2014-01-18 10:55:15 +08:00
James Chen 3c74044929 Merge pull request #5117 from samuele3hu/test-rebase 
close #3626:Add the “override “ keyword
 2014-01-17 18:49:33 -08:00
Ricardo Quesada cedda81baa Merge pull request #5118 from ricardoquesada/renderer_float_key 
Renderer uses a float as a key
 2014-01-17 16:10:19 -08:00
Ricardo Quesada 8931d968c0 Renderer uses a float as a key 
Instead of using a 64-bit int key with viewport, opaque and depth,
it only uses a 32-bit float with only the depth.
Saves time in:
 - No need to convert the 32-bit float into 24-bit int
 - keys are shorter
 2014-01-17 16:08:29 -08:00
James Chen 24130b2fed Merge pull request #5116 from CocosRobot/updategeneratedsubmodule_1389968060 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-17 06:31:44 -08:00
samuele3hu 9d040ff09c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into test-rebase 2014-01-17 22:23:57 +08:00
samuele3hu 85539e7548 issue #3626:Add the “override “ keyword 2014-01-17 22:20:21 +08:00
CocosRobot d485ade977 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-17 14:14:30 +00:00