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

547 Commits

Author SHA1 Message Date
songchengjiang 642e19baef unify (No)Normal Mapping shaders 2015-11-27 13:15:33 +08:00
songchengjiang fc4c3ec650 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-11-27 09:34:31 +08:00
songchengjiang 9241797acb support normal mapping material 2015-11-25 10:45:03 +08:00
yangxiao aa38dfba89 release default fbo 2015-11-24 18:11:16 +08:00
yangxiao 9d2fca6d34 fix cull face for render queue 2015-11-09 10:42:12 +08:00
pandamicro b58e656620 Merge pull request #14264 from super626/v3 
Fix: Mesh::setGLProgramState may modify state block
 2015-10-30 10:11:23 +08:00
yangxiao 16d9cf1af9 setStateBlock implement 2015-10-29 14:21:25 +08:00
mogemimi 9df30d2454 Fix typos in documentation 2015-10-23 16:59:51 +09:00
pandamicro f2898ecf30 Merge pull request #14207 from super626/terrain 
fix shader on pc
 2015-10-22 10:10:10 +08:00
yangxiao cca25f5b5c fix shader on pc 2015-10-22 09:29:12 +08:00
Dale Stammen ce88dbdee4 removed WP8.1 shader code 2015-10-16 14:48:03 -07:00
Dale Stammen 414a34f3f9 removed old WP8.1 shaders for gl_PointSize 2015-10-16 14:47:02 -07:00
yangxiao 907189ed14 correct wrong presion, which leads to failed on some devices 2015-10-15 11:59:38 +08:00
Martin Taylor 62e36e8006 fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
yangxiao ea538cd9da merge cocos 2015-09-16 10:37:24 +08:00
yangxiao ca24e6eba3 fix clone 2015-09-11 15:08:59 +08:00
yangxiao 6fd9784fce setParent for RenderState 2015-09-11 11:47:36 +08:00
yangxiao d5fab0bd38 merge cocos 2015-09-10 10:44:09 +08:00
yangxiao 8f5cd6cdc8 remove setParent 2015-09-10 09:28:01 +08:00
yangxiao 64471fab85 fix material clone 2015-09-10 09:23:02 +08:00
Nathanael Weiss 14b9c2e75c Fix crash in FrameBuffer if no DepthStencil 
This fixes a debug-config crash if a FrameBuffer has no `RenderTargetDepthStencil`.
 2015-09-08 13:13:38 -07:00
yangxiao c3ac446f35 resolve conflict 2015-09-07 14:45:09 +08:00
yangxiao 137d180dc9 fix material clone 2015-09-07 13:59:08 +08:00
WenhaiLin a3b5becb45 Sync v3.8 to v3 2015-08-31 22:05:37 +08:00
yangxiao bc07d7954a fix render state 2015-08-28 23:00:45 +08:00
pandamicro d6045fdbea Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/audio/winrt/Audio.cpp
	cocos/platform/winrt/CCCommon.cpp
	cocos/platform/winrt/CCWinRTUtils.cpp
	cocos/platform/winrt/CCWinRTUtils.h
 2015-08-27 10:40:04 +08:00
Ricardo Quesada d5d1be93cc make it compile on win32 2015-08-26 10:16:50 -07:00
yangxiao d17c04cf0e tmp 2015-08-26 16:35:42 +08:00
Ricardo Quesada dfed33f6f2 Adds `PrimitiveCommand` test 2015-08-25 15:07:03 -07:00
yangxiao 7dcc3dd982 Move CCTextureCube From 3d to renderer to solve compilation issue 2015-08-24 14:01:50 +08:00
fusijie cbd7eed9c4 fixed renderTexture crash bug. 2015-08-21 17:38:56 +08:00
yangxiao 8a6c49b5a3 merge cocos 2015-08-03 09:54:29 +08:00
pandamicro a011fa4c8a Merge pull request #12852 from super626/issue10242 
fix #10242, reload shader when light number changed
 2015-07-30 12:57:32 +08:00
tangziwen e4cf89e1c4 terrain update: can set Light direction manually, set light map, fix a bug which height map is not exist cause crash when destructing. 2015-07-29 13:24:12 +08:00
yangxiao 92ec9ab5f2 add config loaded event 2015-07-24 16:38:30 +08:00
andyque 7c665e6447 remove EMSCRIPTEN related code 2015-07-16 14:15:41 +08:00
yangxiao 69e79ed164 fix #10242, reload shader when light number changed 2015-07-15 11:36:53 +08:00
andyque 91dfb07a8c add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
Vincent Yang d9bc8b7c1b fix bug: don't decrease _asyncRefCount correct in addImageAsyncCallback. 2015-07-09 17:06:55 +08:00
Vincent Yang 1f8b46e911 Fixbug: Need to replace thread unsafe code from TextureCache::addImageAsync. 2015-07-08 15:13:48 +08:00
yangxiao 269feeb1f9 remove stencil from Renderstate 2015-07-01 14:06:37 +08:00
yangxiao 13dbd44250 remove unused variable 2015-06-25 15:05:21 +08:00
yangxiao 63f948c822 modify skybox to projection space 2015-06-25 15:01:39 +08:00
pandamicro cc00cbedbe Merge pull request #12482 from yangws/fixbug_20214 
fixbug: cpp-test -> NewRenderer （drag the layer to test the result of…
 2015-06-23 21:09:59 +08:00
pandamicro 60372056ce Merge pull request #12484 from andyque/fix-nine-patch-image-error 
fix nine patch image parser error on Windows.
 2015-06-23 18:26:16 +08:00
pandamicro 2a0c2b6e32 Merge pull request #12250 from hawkwood/patch-10 
Fails if file does not exist
 2015-06-23 17:32:47 +08:00
andyque 7fff2bd3c4 fix nine patch image parser error on Windows. 2015-06-23 15:42:58 +08:00
Vincent Yang 4b768c5fd8 fixbug: cpp-test -> NewRenderer （drag the layer to test the result of culling）, some object will be culling before out of screen. 2015-06-23 15:22:27 +08:00
pandamicro a2deddcf59 Merge pull request #12361 from dabingnn/v3_androidBugForVertexAttrib 
fix android background and foreground bug with VertexAttributeBinding
 2015-06-17 09:34:47 +08:00
Justin Hawkwood 90db6fe5d6 Added check that callback is set 2015-06-15 23:36:04 -07:00