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

562 Commits

Author SHA1 Message Date
Huabing.Xu 01b69c9e4f Merge branch 'v3' into v3_migrateFastTMX 2014-08-05 17:30:11 +08:00
yangxiao 4452d9579a merge cocos2d, fix lua 2014-08-04 12:07:27 +08:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-01 15:11:34 +08:00
Huabing.Xu f269d7345e original version of PrimitiveCommand 2014-08-01 14:46:35 +08:00
yangxiao e03d284e26 merge cocos2d 2014-07-31 18:55:41 +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
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
Huabing.Xu a5add07fb5 Merge branch 'v3' into v3_renderPrimitive 2014-07-31 14:31:24 +08:00
Huabing.Xu dfee337db1 original version of Primitive 2014-07-31 13:52:39 +08:00
yangxiao 407412e68b remove .xcscheme 2014-07-31 11:54:44 +08:00
yangxiao 44c501ca2a merge cocos2d 2014-07-31 09:56:23 +08:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
yangxiao 9f1cfbfca5 add skeleton and refactor skin 2014-07-30 18:32:34 +08:00
Huabing.Xu 99eed6a0be finish index data 2014-07-30 15:51:41 +08:00
Huabing.Xu 428e9b1b1a Merge branch 'v3' into v3_buildAllTarget 2014-07-30 14:12:28 +08:00
minggo e99879467d Merge pull request #7620 from heliclei/jenkins-ios-build 
remove xcode shared scheme from code base
 2014-07-30 09:48:02 +08:00
heliclei 9c76c59e6f resolve conflits 2014-07-29 18:48:57 +08:00
heliclei 77a8d96f37 remove xcode shared scheme from code base 2014-07-29 18:39:16 +08:00
Huabing.Xu 3bee93a156 add target to build All target 2014-07-29 16:43:20 +08:00
andyque ebf05d1acc add UIScale9Sprite tests 2014-07-29 16:24:27 +08:00
andyque 717f20571b add UIScale9Sprite implementation 2014-07-29 16:24:27 +08:00
andyque 32ed796657 add UIScale9Sprite 2014-07-29 16:24:27 +08:00
Huabing.Xu c722c0fcd0 libcocostudio for windows 2014-07-29 11:31:37 +08:00
Huabing.Xu d53ce4d664 libcocosbuilder rename for windows 2014-07-29 11:09:17 +08:00
Huabing.Xu 6d0b8852d1 libSpine rename for windows 2014-07-29 10:53:39 +08:00
yangxiao da4ba95806 SubMesh and Attachment 2014-07-29 10:49:06 +08:00
Huabing.Xu aaa65dcae4 Merge branch 'v3' into v3_windowChangeModule 2014-07-29 10:20:23 +08:00
Huabing.Xu eacf003eed change libExtensions for windows 2014-07-29 10:07:46 +08:00
Huabing.Xu d6bc2f4998 liuGUI->libui for windows 2014-07-28 22:12:07 +08:00
Huabing.Xu c6956504bf change CocosDenshion to libcocosdenshion 2014-07-28 21:35:16 +08:00
Huabing.Xu 4a4f05c827 change cocos2d to libcocos2d for windows 2014-07-28 20:55:58 +08:00
minggo 98b0797c0e add shared xcscheme 2014-07-28 15:41:33 +08:00
minggo bf6e706ab9 fix xcode project setting 2014-07-28 15:37:00 +08:00
Huabing.Xu 2795c10627 rename box2d->libbox2d 2014-07-28 12:05:58 +08:00
Huabing.Xu b72bffab1f change mac/ios target name 2014-07-25 14:27:52 +08:00
minggo b9d8e84b4d Merge pull request #7581 from andyque/fixEditBoxCompile 
fix mac compile error
 2014-07-24 21:59:31 +08:00
Huabing.Xu 7dc7c95ca3 fix mac compile error 2014-07-24 14:47:54 +08:00
Huabing.Xu b110296e53 reverse win32 sln 2014-07-24 10:09:38 +08:00
Huabing.Xu e274b38a16 change mac cocosNetwork deps to relative path 2014-07-24 09:36:21 +08:00
minggo abe0166f60 fix the bug that cocos2d_libs.xcodeproj can not be opened in cocos2d_tests.xcodeproj 2014-07-22 23:41:30 +08:00
Sergey 2acce6771f software per decompression support 2014-07-22 15:49:36 +04:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
Huabing.Xu 1dc3552916 rename product name to $(TARGET_NAME) 2014-07-18 14:41:21 +08:00
Huabing.Xu dbb3e0ac2e copy dylib to *.app bundle 2014-07-18 14:00:14 +08:00
Huabing.Xu 21b3e55339 Mac dylib version works now 2014-07-17 20:58:50 +08:00
Huabing.Xu 52ac47aea8 Merge branch 'v3' into v3_dll 2014-07-17 18:27:36 +08:00
samuele3hu a9031154e0 Fix the actionTimelineTest crash on mac platform 2014-07-17 17:38:53 +08:00
Huabing.Xu 0f89c6c8b5 add dependency for lua iOS targets 2014-07-17 13:58:50 +08:00
Huabing.Xu 02c61af9fd add cocosStudio cocosBuilder cocosGUI iOS target 2014-07-17 12:06:20 +08:00