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

21763 Commits

Author SHA1 Message Date
andyque 41ccd5e465 add v1.4 tests 2014-07-10 16:37:15 +08:00
andyque 937b0ab52a add cocostudio parser test template 2014-07-10 16:37:15 +08:00
minggo d2bcf9e9d1 [ci skip] 2014-07-10 15:49:29 +08:00
minggo 831b0b332b Merge pull request #7371 from minggo/enumerateChildren-fix 
Node::enumerateChildren  just searches from itself
 2014-07-10 15:46:04 +08:00
minggo c7856b21fd Merge pull request #7366 from Dhilan007/v3-fixed-warn 
fixed warn and replace NULL with nullptr.
 2014-07-10 15:42:02 +08:00
minggo 0ba3f6c1c9 Merge pull request #7376 from joshuastray/v3 
use CC_CONSTRUCTOR_ACCESS to replace protected/private
 2014-07-10 14:14:08 +08:00
joshuastray 6b22870e27 use CC_CONSTRUCTOR_ACCESS to replace protected 2014-07-10 14:00:23 +08:00
minggo cdc02aea7c Merge pull request #7368 from CocosRobot/update_lua_bindings_1404957724 
[AUTO]: updating luabinding automatically
 2014-07-10 13:54:21 +08:00
minggo 400aa2dec7 Merge pull request #7373 from super626/v3 
use function with less parameter
 2014-07-10 13:50:15 +08:00
gero 01e1508239 Merge pull request #3 from cocos2d/v3 
merge V3
 2014-07-10 11:33:59 +08:00
geron-cn 5b7852c5f6 update ccs-res hd csbs 2014-07-10 11:17:01 +08:00
minggo 316564d58a Node::enumerateChildren just searches from itself 2014-07-10 11:07:39 +08:00
yangxiao 0b4c6b7f7a comment 2014-07-10 11:05:48 +08:00
yangxiao d7b88e86ff add comment 2014-07-10 10:56:52 +08:00
yangxiao ef1f6892e1 deprecated Mesh::create use less parameter ones instead 2014-07-10 10:54:37 +08:00
CocosRobot af460a1530 [AUTO]: updating luabinding automatically 2014-07-10 02:03:40 +00:00
minggo ddb72228d3 [ci skip] 2014-07-10 09:57:16 +08:00
minggo 345fb040e7 Merge pull request #7352 from super626/v3 
adjust api according feedback
 2014-07-10 09:53:27 +08:00
minggo 3ec7ca46cd Merge pull request #7365 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-07-10 09:52:24 +08:00
zhangbin 68bd1c3c76 Update the reference of submodule cocos2d-console. 2014-07-10 09:29:57 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
Dhilan007 dbcb20b886 Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8. 
Make clear EVENT_COME_TO_FOREGROUND event.
 2014-07-09 23:03:04 +08:00
samuele3hu 2bc1cd0486 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller 
Conflicts:
	cocos/scripting/lua-bindings/script/Cocos2dConstants.lua
 2014-07-09 22:31:05 +08:00
minggo 7d74be3158 Merge pull request #7356 from 2youyouo2/v3 
fixed Armature blend func effect
 2014-07-09 18:37:15 +08:00
geron-cn 2a64bd8945 udpate ccs-res 2014-07-09 18:35:10 +08:00
samuele3hu fca4b1dbd8 Update bindings-generaotr submoudle 2014-07-09 18:31:35 +08:00
samuele3hu 243fa49c09 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 2014-07-09 18:08:09 +08:00
samuele3hu 3546c131dd Add Lua bindings for controller and related test case project 2014-07-09 18:05:02 +08:00
geron-cn cd84081c37 udpate ccs-res 2014-07-09 18:02:17 +08:00
minggo bfc9f6ba78 Merge pull request #7355 from CocosRobot/update_lua_bindings_1404884403 
[AUTO]: updating luabinding automatically
 2014-07-09 16:03:27 +08:00
kaile.yin c53cb42e83 fixed Armature blend func effect 2014-07-09 14:25:51 +08:00
yangxiao dbea3a4d04 deprecated functions 2014-07-09 14:07:33 +08:00
CocosRobot ae12030745 [AUTO]: updating luabinding automatically 2014-07-09 05:42:06 +00:00
minggo 3c59cdaf1c Merge pull request #7354 from boyu0/update_tolua_ini 
Skip class Sprite3DMaterialCache in lua binding.
 2014-07-09 13:36:54 +08:00
boyu0 8f6e05bbf5 Skip class Sprite3DMaterialCache in lua binding. 2014-07-09 12:59:01 +08:00
yangxiao 0c28106b48 init playreverse 2014-07-09 09:59:18 +08:00
yangxiao 7b35f36ba3 Merge branch 'newcode' into v3 2014-07-09 09:56:23 +08:00
yangxiao 90b6841e25 adjust api according feedback 2014-07-09 09:53:15 +08:00
minggo a25a54d162 Merge pull request #7350 from chengstory/v3_fixesWarning 
1、fixes warning.
 2014-07-09 09:32:13 +08:00
zhangcheng af0613cf32 1、fixes warning. 2014-07-09 00:09:35 +08:00
minggo fc515428bf [ci skip] 2014-07-08 22:19:54 +08:00
minggo 0f7968de89 Merge pull request #7339 from super626/v3 
fix android, add 3d files to cocos2d.h and remove unused resources
 2014-07-08 22:09:50 +08:00
minggo 3e658216da [ci skip] 2014-07-08 22:08:28 +08:00
minggo f7af8938bd Merge pull request #7277 from darkdukey/fix_rotation3D 
Fix setRotation3D
 2014-07-08 22:05:27 +08:00
minggo 08027a65a7 [ci skip] 2014-07-08 21:21:26 +08:00
minggo eba1735d04 Merge pull request #7347 from Dhilan007/v3-memory-leak 
fixed memory leak cause by singleton.
 2014-07-08 21:13:56 +08:00
minggo c2474ea7c0 Merge pull request #7262 from pandamicro/origin_v3 
Indicate correct button and cursor position infomation in mouse move event
 2014-07-08 21:07:09 +08:00
minggo 81e6fdabba [ci skip] 2014-07-08 20:38:58 +08:00
minggo de1533190e [ci skip] 2014-07-08 20:37:38 +08:00
minggo 08ac5a691a Merge pull request #7337 from chareice/patch-1 
Make Setup.py Support for zsh.
 2014-07-08 20:35:34 +08:00