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

143 Commits

Author SHA1 Message Date
Huabing.Xu 5e7b75c5c7 fix android background and foreground crash for primitive 2014-08-15 14:05:17 +08:00
yangxiao 6ce3b5c20a add mirror test 2014-08-13 17:38:16 +08:00
Huabing.Xu 6cf2e7d091 add CC_DLL for primitive classes 2014-08-12 11:56:21 +08:00
Huabing.Xu 1145859d38 remove commented codes 2014-08-12 11:44:06 +08:00
Huabing.Xu c1a71453d5 Merge branch 'v3_renderPrimitive' into v3 2014-08-11 14:39:16 +08:00
Huabing.Xu be4bcf7c36 add init value for flag 2014-08-08 13:47:50 +08:00
Huabing.Xu e7e94ffe70 add const constrain for getVertexData() and getIndexData() 2014-08-07 17:59:36 +08:00
Huabing.Xu 274140fbf8 linux work now 2014-08-07 02:35:04 -07:00
Huabing.Xu 9891f438ba change copyright 2014-08-07 15:53:20 +08:00
Huabing.Xu ba2ae6826c Merge branch 'v3_migrateFastTMX' into v3_renderPrimitive 2014-08-07 15:36:41 +08:00
Huabing.Xu 9978065d00 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_renderPrimitive 2014-08-07 15:13:47 +08:00
Huabing.Xu 16842b4a69 android work now, add shadowBuffer to recreate VBO 2014-08-07 14:15:49 +08:00
martell 75911658aa Make CMake More Robust 2014-08-06 15:43:19 +01:00
Huabing.Xu 64c2ede765 IOS work now 
reset binding buffer to 0 after drawing
 2014-08-06 15:46:35 +08:00
Huabing.Xu b1954ef516 clean up primitive code 2014-08-05 17:49:35 +08:00
Huabing.Xu 01b69c9e4f Merge branch 'v3' into v3_migrateFastTMX 2014-08-05 17:30:11 +08:00
Huabing.Xu 7fbd81aeca add NORMAL, BLEND_WEIGHT, BLEND_INDEX flag to be correspondent to GLProgram::VertexAttrib 2014-08-05 15:15:17 +08:00
Huabing.Xu 56551e6787 fast_tmx migrate to primitive command 2014-08-05 15:08:01 +08:00
Huabing.Xu 95a8b23d64 fix draw bug in primitive when using indices 2014-08-04 17:56:56 +08:00
Huabing.Xu a0d1b0dad8 allow null index buffer when create primitive 2014-08-04 17:21:23 +08:00
Huabing.Xu 2dca0a4809 remove IndexData class 2014-08-04 17:00:08 +08:00
Huabing.Xu bbf11f5d06 refactor vertex data 
using vertex data in fast_tmx
 2014-08-04 16:08:54 +08:00
Huabing.Xu f269d7345e original version of PrimitiveCommand 2014-08-01 14:46:35 +08:00
Huabing.Xu dfee337db1 original version of Primitive 2014-07-31 13:52:39 +08:00
Huabing.Xu 99eed6a0be finish index data 2014-07-30 15:51:41 +08:00
Huabing.Xu 23406c6463 Merge branch 'v3' into v3_renderPrimitive 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-07-30 15:09:25 +08:00
boyu0 85b9765b8f Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha() 2014-07-28 10:38:22 +08:00
boyu0 34a8d26124 Deprecate Texture2D::PVRImagesHavePremultipliedAlpha(), move Texture2D::PVRImagesHavePremultipliedAlpha() to Image. 2014-07-25 18:19:04 +08:00
Huabing.Xu 68894e622f add indexData 2014-07-25 11:58:54 +08:00
Huabing.Xu a4cd61f30a compiles OK: raw version of vertex Index buffer, half version of vertex data 2014-07-25 09:58:24 +08:00
Huabing.Xu b281c38c20 init version of VertexIndexBuffer 2014-07-23 09:20:33 +08:00
Sergey 59cbc153d4 Copyright & small fixes 2014-07-22 15:49:38 +04:00
Huabing.Xu 0350186589 Merge branch 'v3' into v3_dll 2014-07-16 11:15:16 +08:00
Huabing.Xu 952ca0eb75 add CC_DLL in Renderer folder 2014-07-14 17:02:06 +08:00
Dhilan007 d8cdb75851 Fix compile errors on WP8 2014-07-11 15:10:19 +08:00
minggo 6c37541657 Merge pull request #7363 from Dhilan007/v3-event-clear 
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
 2014-07-11 13:36:52 +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
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
yangxiao e9d3bc1b76 remove unused code 2014-07-08 13:36:22 +08:00
yangxiao b19ca902ce Merge branch 'newcode' into v3 2014-07-08 11:19:26 +08:00
Huabing.Xu 9fb85e303f change the logic of texture loading 2014-07-08 10:08:02 +08:00
Huabing.Xu d935b5db38 roll back initWithImage logic 2014-07-07 17:35:05 +08:00
yangxiao 4304d740b4 delete call back 2014-07-04 17:22:39 +08:00
yangxiao 0af286c3be fix android background to foreground 2014-07-04 16:10:43 +08:00
yangxiao d2cd2449d8 adjust code 2014-07-04 10:42:02 +08:00
yangxiao 05d20d59d4 change position attributes to vec3 2014-07-04 09:25:06 +08:00
boyu0 6db8ec8aad fix crash when load pvr bgra8888 image in android. 2014-06-30 20:58:26 +08:00
Huabing.Xu 47471e202d Merge branch 'v3' into fast_tmx 
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
 2014-06-29 20:23:43 +08:00
minggo 7f28e81d09 Merge pull request #7226 from super626/v3 
Animation3D
 2014-06-29 16:41:13 +08:00