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

22781 Commits

Author SHA1 Message Date
kaile.yin 2fc082cac1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-31 17:52:49 +08:00
samuele3hu 6bb21c0f4d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	tools/tolua/cocos2dx.ini
 2014-07-31 17:52:22 +08:00
zhangbin d224c77bd4 Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8. 2014-07-31 17:51:06 +08:00
kaile.yin 170e1a5d7b init widget properties 2014-07-31 17:48:45 +08:00
minggo d44a359a1f Merge pull request #7635 from samuele3hu/v3_new_module 
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
 2014-07-31 17:39:01 +08:00
samuele3hu 27b98ee237 Update cocos2d-console submodule 2014-07-31 17:31:59 +08:00
samuele3hu 2b562ace1a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-07-31 17:22:33 +08:00
minggo 2851bd9193 Merge pull request #7627 from andyque/fixScale9Sprite 
refactor ui::widgets to use ui::Scale9Sprite instead of extension::Scale9Sprite
 2014-07-31 16:58:56 +08:00
samuele3hu 5b620e610f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_module 2014-07-31 16:44:29 +08:00
samuele3hu ee4e479ce1 Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting 2014-07-31 16:38:55 +08:00
minggo 8d8176737a Merge pull request #7634 from dabingnn/v3_mac_fix 
fix some misc issues for mac
 2014-07-31 16:28:33 +08:00
zhangbin 741e82af87 Optimize the implementation of hen-prebuilt tools. 2014-07-31 16:07:15 +08:00
Huabing.Xu 2bf2bbeed7 1. remove mac 32bit 
2. remove copy files for mac(because of mac use .a instead of dylib)
 2014-07-31 15:46:16 +08:00
samuele3hu a47e52b5bc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-07-31 15:22:46 +08:00
samuele3hu 9666f1ad7f Split luabindings module to some independent modules 2014-07-31 15:20:23 +08:00
Huabing.Xu a5add07fb5 Merge branch 'v3' into v3_renderPrimitive 2014-07-31 14:31:24 +08:00
minggo 0e7eb3614e Merge pull request #7618 from dabingnn/v3_buildAllTarget 
add target to build All target
 2014-07-31 14:25:37 +08:00
minggo 35d50e873d Merge pull request #7633 from CocosRobot/update_lua_bindings_1406785652 
[AUTO]: updating luabinding automatically
 2014-07-31 14:23:01 +08:00
XiaoYang 71c0212318 Merge pull request #72 from songmiao/v3 
windows works
 2014-07-31 14:11:05 +08:00
songmiao 58c32e52c7 windows works 2014-07-31 14:08:05 +08:00
Huabing.Xu dfee337db1 original version of Primitive 2014-07-31 13:52:39 +08:00
CocosRobot 095d4ed3c5 [AUTO]: updating luabinding automatically 2014-07-31 05:49:25 +00:00
minggo eb3b58edc4 [ci skip] 2014-07-31 13:44:22 +08:00
minggo a77b8e7320 Merge pull request #7608 from andyque/fixTextFieldUtf8Issue 
add utf8 support for TextField widget
 2014-07-31 13:41:57 +08:00
minggo f6985058b7 Merge pull request #7628 from dabingnn/v3_removeConstructAccessMacro 
remove CC_CONSTUCTOR_ACCESS fow win32 release
 2014-07-31 13:35:32 +08:00
minggo 5f34c14938 Merge pull request #7629 from heliclei/fix-ios-code-sign 
fix ios build code sign
 2014-07-31 13:34:54 +08:00
yangxiao 407412e68b remove .xcscheme 2014-07-31 11:54:44 +08:00
yangxiao f6ad1df092 android work 2014-07-31 11:47:47 +08:00
yangxiao cd379ab412 add axe model 2014-07-31 11:26:27 +08:00
andyque 1de2b78d61 refactor, optimize Scale9Sprite 2014-07-31 11:07:20 +08:00
yangxiao 38c86f7697 skeleton retain 2014-07-31 10:57:19 +08:00
yangxiao 2c29560514 add CC_DLL 2014-07-31 10:28:39 +08:00
yangxiao 44c501ca2a merge cocos2d 2014-07-31 09:56:23 +08:00
Huabing.Xu 2a1f934dd4 Merge branch 'v3' into v3_renderPrimitive 2014-07-31 09:23:15 +08:00
AppleJDay f9ebcf2671 Merge pull request #2 from cocos2d/v3 
update
 2014-07-31 08:20:06 +08:00
maltium 3d44439e2a added 3D rotation support to the RotateTo action 2014-07-30 21:42:47 +02:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
heliclei 26cf4321d2 fix ios build code sign 2014-07-30 23:59:19 +08:00
yangxiao 9f1cfbfca5 add skeleton and refactor skin 2014-07-30 18:32:34 +08:00
andyque 03368d42f2 refactor, improve imageView stability 2014-07-30 17:29:22 +08:00
andyque e6b85fbd77 fix minor bugs of UISlider and remove unused header include in ListView 2014-07-30 16:55:16 +08:00
Huabing.Xu 65775f2d30 remove CC_CONSTUCTOR_ACCESS fow win32 release 2014-07-30 16:39:21 +08:00
andyque 83298171d9 refactor Layout 2014-07-30 16:33:37 +08:00
Ningyu d53cdc39df tab to spaces 2014-07-30 16:20:58 +08:00
Ningyu 52ca596b3d code tidy 2014-07-30 16:19:05 +08:00
minggo 7bd68c35d0 Merge pull request #7626 from heliclei/jenkins-pull-request-builder 
fix a typo:V3->v3
 2014-07-30 16:11:39 +08:00
heliclei add9e3a63e fix typo:V3->v3 2014-07-30 16:11:07 +08:00
andyque 7bcb31f225 refactor loadingBar 2014-07-30 16:08:29 +08:00
andyque c5d2585049 refactor Slider control 2014-07-30 15:52:27 +08:00
minggo e640450104 Merge pull request #7625 from CocosRobot/update_cocosfiles_1406706675 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-30 15:52:18 +08:00