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

30552 Commits

Author SHA1 Message Date
andyque 2a9984da86 upgrade external version to 61 
Conflicts:
	external/config.json
 2015-06-04 19:57:01 +08:00
pandamicro 2db0f94b14 Merge pull request #12186 from CocosRobot/update_cocosfiles_1433414963 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-04 19:42:01 +08:00
pandamicro 61e3aecdf4 Merge pull request #12190 from cocos2d/revert-12185-update-3rd-libs-version-v3 
Revert "update 3rd party libs to 60"
 2015-06-04 19:39:41 +08:00
pandamicro cf431121c9 Revert "update 3rd party libs to 60" 2015-06-04 19:38:52 +08:00
CocosRobot c722dd76d6 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-04 10:49:25 +00:00
pandamicro e9279a5141 Merge pull request #12185 from andyque/update-3rd-libs-version-v3 
update 3rd party libs to 60
 2015-06-04 18:45:01 +08:00
pandamicro 2da754dcf2 Merge pull request #12157 from chengstory/v2_addOnEnterAndOnExitToCCNode 
Add onEnter and onExit of components to CCNode's onEnter and onExit function
 2015-06-04 18:39:52 +08:00
Jacky afa422d898 fixed copy constructor and operation = bug. 2015-06-04 18:27:58 +08:00
andyque 77826b453d update 3rd party libs to 60 2015-06-04 18:27:03 +08:00
pandamicro ed6d6521ac Add CURLOPT_NOSIGNAL to avoid multithread issue on timeout 2015-06-04 17:59:56 +08:00
pandamicro 9576adeafb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-06-04 17:53:00 +08:00
pandamicro ba1191f98f Merge pull request #12132 from pandamicro/v3_origin 
cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread
 2015-06-04 17:51:11 +08:00
cheng.zhang 28f3d19db8 Merge pull request #156 from pandamicro/compJSB 
Fix jsbinding calls for CCComponent
 2015-06-04 17:49:34 +08:00
pandamicro 6cc0b94404 Merge pull request #12180 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-06-04 17:41:36 +08:00
VisualSJ a91fdd6b8e Synchronization studio parser - (fixed: resPath and custom easing animation) 2015-06-04 16:59:42 +08:00
VisualSJ 587bd475e9 Synchronization studio parser - (fixed: resPath and custom easing animation) 2015-06-04 16:23:06 +08:00
WuHao 5b572ab803 Polyinfo is no longer a pointer 2015-06-04 16:20:00 +08:00
Namezero 19f95c5542 TintBy::clone() incorrect cast 
TintBy::clone() incorrectly casts the GLshort members to GLubyte, resulting in an object that isn't a clone and an incorrect tint.
 2015-06-04 10:13:34 +02:00
pandamicro 2c168130ed Fix jsbinding calls for CCComponent 2015-06-04 15:59:05 +08:00
pandamicro 86d372222c Merge branch 'v2_addOnEnterAndOnExitToCCNode' of https://github.com/chengstory/cocos2d-x into compJSB 2015-06-04 15:54:58 +08:00
Huabing.Xu d35a8a3a9e add default FBO 2015-06-04 15:53:13 +08:00
WuHao 0a51c9bd27 Finished AutoPolygon and Sprite 2015-06-04 15:43:31 +08:00
Bin Zhang 825c89299a Update the reference of submodule cocos2d-console. 2015-06-04 15:30:45 +08:00
pandamicro 83f7f30c1c Fix issue that __JSDownloaderDelegator::onError get called twice 2015-06-04 15:03:20 +08:00
子龙山人 5c804922b8 Merge pull request #12175 from samuele3hu/v3_bug_fix 
issue #10323: Fix the compile error when COCOS2D_DEBUG>=2.
 2015-06-04 14:59:53 +08:00
WenhaiLin bd718bb85f Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body. 2015-06-04 14:57:37 +08:00
zhangcheng 6a53cfdc76 1, modify space format. 2015-06-04 14:08:47 +08:00
zhangcheng 8d3d3a0348 1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer. 2015-06-04 14:06:31 +08:00
pandamicro 9c23126d9e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-06-04 13:14:34 +08:00
yangxiao ded5c36271 Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into navigation2 2015-06-04 12:46:12 +08:00
yangxiao 8b5333a5c9 Merge branch 'newcode' into navigation2 2015-06-04 12:44:39 +08:00
anniruddh.koppal 0d257c4278 Merge remote-tracking branch 'origin/v3-winrt-ogg' into v3-winrt-ogg 2015-06-03 21:07:05 -07:00
yangxiao 73d815b0ab rename syncToNode and syncToPhysics 2015-06-04 12:04:41 +08:00
samuele3hu fbd5a09cfd issue #10323: Fix the compile error when COCOS2D_DEBUG>=2. 2015-06-04 11:58:22 +08:00
anniruddh.koppal 84fad34daf Added ogg support to audio engine. Fixed issues #150 and #151 2015-06-03 20:57:14 -07:00
pajeroquan 956101bb72 Fix JNI object memory leak! 
Fix JNI object memory leak!
 2015-06-04 11:54:53 +08:00
Huabing.Xu ad1f7c472c add render buffer render target for color attachment 2015-06-04 11:18:35 +08:00
子龙山人 831ca47b13 Merge pull request #12158 from WenhaiLin/v3-letter-space 
Label:Fixed letter spacing may be wrong.
 2015-06-04 10:51:25 +08:00
anniruddh.koppal b294dffaa1 Added ogg support to audio engine. Fixed issues #150 and #151 2015-06-03 19:50:57 -07:00
zhangcheng 55995ece1a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v2_addOnEnterAndOnExitToCCNode 2015-06-04 10:38:39 +08:00
XiaoYang d406efcdda Merge pull request #340 from zhukaixy/Branch_navigation2_mru 
configure navi for winodow phone
 2015-06-04 10:06:32 +08:00
zhukaixy f891a0b124 configure navi for winodow phone 2015-06-04 10:00:15 +08:00
子龙山人 111420ebd7 Merge pull request #12167 from yinjimmy/simulator_fix 
fix simulator compile error
 2015-06-04 10:00:07 +08:00
samuele3hu 3bae5620d6 Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation 2015-06-04 09:40:54 +08:00
子龙山人 f97cc0e780 Merge pull request #12171 from CocosRobot/update_cocosfiles_1433381103 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-04 09:35:47 +08:00
CocosRobot 7607b81bfd [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-04 01:25:04 +00:00
子龙山人 95934bf310 Merge pull request #12168 from MSOpenTech/v3-winrt-js-fix 
V3: Fixes for Windows 8.1 Universal App JavaScript
 2015-06-04 09:22:21 +08:00
Ricardo Quesada 19d3a13285 Merge pull request #12169 from CocosRobot/update_lua_bindings_1433362818 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-03 13:33:24 -07:00
CocosRobot 76b151c281 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-03 20:25:32 +00:00
Ricardo Quesada 6a19661a80 Merge pull request #12150 from ricardoquesada/material_custom_uniforms 
Material custom uniforms
 2015-06-03 13:08:04 -07:00