Commit Graph

92 Commits

Author SHA1 Message Date
minggo 46cdd6f8dd Merge pull request #7701 from dabingnn/v3_renderPrimitive
V3 render primitive
2014-08-12 16:11:40 +08:00
zhangbin 88382994b9 Modify the gen-prebuilt tools for the lua-bindings modules. 2014-08-12 09:37:51 +08:00
Huabing.Xu 031efaf242 Merge branch 'v3_renderPrimitive' of github.com:dabingnn/cocos2d-x into v3 2014-08-11 14:37:43 +08:00
yangxiao 97edd303b5 remove DrawNode3D 2014-08-08 15:06:45 +08:00
yangxiao 3c9483899e camera, cameratest, drawNode3D squash 2014-08-07 15:23:31 +08:00
Huabing.Xu 64c2ede765 IOS work now
reset binding buffer to 0 after drawing
2014-08-06 15:46:35 +08:00
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 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
Huabing.Xu 3bee93a156 add target to build All target 2014-07-29 16:43:20 +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
yangxiao da4ba95806 SubMesh and Attachment 2014-07-29 10:49:06 +08:00
Huabing.Xu b72bffab1f change mac/ios target name 2014-07-25 14:27:52 +08:00
Huabing.Xu 7dc7c95ca3 fix mac compile error 2014-07-24 14:47:54 +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 02c61af9fd add cocosStudio cocosBuilder cocosGUI iOS target 2014-07-17 12:06:20 +08:00
Huabing.Xu 4c609e11f0 add cocosSpin iOS target 2014-07-17 10:44:13 +08:00
Huabing.Xu d030c8aed3 add cocosNetwork ios target 2014-07-17 10:06:23 +08:00
Huabing.Xu add4caca5a add cocosNetwork target for mac 2014-07-16 18:21:21 +08:00
Huabing.Xu ab76be8d47 add cocosSpine target for mac 2014-07-16 17:51:42 +08:00
Huabing.Xu 778f1983b1 add cocosStudio target for mac 2014-07-16 17:35:35 +08:00
Huabing.Xu b7f6ba84c6 add cocosGUI and cocosBuilder target for mac 2014-07-16 16:37:29 +08:00
boyu0 0c4f4efc0b merge iOS arm64 lib to fat lib, change the project setting. 2014-07-14 19:27:19 +08:00
LinWenhai 2ca5c01902 issue #4689: Refactoring game controller API[ios] 2014-07-04 21:24:32 +08:00
minggo 3b13855374 fix compiling error on iOS 2014-06-30 17:20:13 +08:00
Dhilan007 ef5da0649a issue #4895:Add test case[ios] 2014-06-30 12:53:26 +08:00
minggo 7f28e81d09 Merge pull request #7226 from super626/v3
Animation3D
2014-06-29 16:41:13 +08:00
andyque 1eab15ea41 add MarginZero as an external variable 2014-06-27 15:56:29 +08:00
yangxiao 392a769c8f merge cocos2d v3 2014-06-26 22:48:42 +08:00
andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
2014-06-23 09:37:39 +08:00
yangxiao 1e319bc1f8 fix compile bug 2014-06-20 22:38:09 +08:00