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

33038 Commits

Author SHA1 Message Date
yangxiao 1b3cb97b71 fix script binding 2015-12-01 23:05:47 +08:00
yangxiao 01e0803587 not export Sprite3DMaterial::setTexture 2015-12-01 20:27:31 +08:00
yangxiao 2e38dcb1a0 add normalmaping test 2015-12-01 18:13:50 +08:00
yangxiao 84068c5189 not export Mesh::getTexture and Mesh::setTexture 2015-12-01 18:05:03 +08:00
yangxiao 54e13c3acd update comment 2015-12-01 17:47:34 +08:00
yangxiao f298e49bf3 not export lua Mesh::getTexture and Mesh::setTexture 2015-12-01 17:39:00 +08:00
yangxiao 6fe361f06e not export Mesh::getTexture 2015-12-01 15:13:51 +08:00
yangxiao 9b371a55bf js not export Mesh::setTexture 2015-12-01 14:35:39 +08:00
yangxiao 23f03bc65f update comment 2015-12-01 10:47:25 +08:00
yangxiao 11f1bd6e28 builtin material normal map support 2015-12-01 10:37:53 +08:00
XiaoYang b6efd7573a Merge pull request #374 from songchengjiang/v3 
support normal mapping material
 2015-11-30 09:48:24 +08:00
songchengjiang b55f040ec6 fix macro definition error 2015-11-27 14:23:17 +08:00
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 dcfdfd3a78 LUA tests: add Sprite3DNormalMappingTest 2015-11-26 11:27:33 +08:00
songchengjiang 64f082ab7c add bumped testing model 2015-11-26 10:14:27 +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 e8d853934b terrain lua bindings 2015-11-23 14:33:39 +08:00
yangxiao 39a6f1e8f1 char* to string 2015-11-12 18:08:29 +08:00
XiaoYang 3061f1597a Merge pull request #373 from songchengjiang/v3 
fix the bug of keeplocal of PUParticleSystem3D
 2015-11-11 13:51:37 +08:00
songchengjiang 18940d06ba fix the bug of keeplocal of PUParticleSystem3D 2015-11-11 11:40:50 +08:00
yangxiao 9d2fca6d34 fix cull face for render queue 2015-11-09 10:42:12 +08:00
yangxiao 3016bf696a fix updateVerticesForLOD 2015-11-05 15:18:46 +08:00
pandamicro ac0a0ed3bb Merge pull request #14319 from CocosRobot/update_lua_bindings_1446635086 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-05 10:53:12 +08:00
CocosRobot f7803cba19 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-04 11:09:49 +00:00
pandamicro 9d9e5370d0 Merge pull request #14314 from yinjimmy/template_bugfix 
Template : fix link libraries for iOS
 2015-11-04 19:01:23 +08:00
pandamicro b4277e77d5 Merge pull request #14317 from chengstory/UpdateSubmodule 
[ci skip][AUTO]:Update web submodule to latest.
 2015-11-04 19:00:55 +08:00
zhangcheng 08f104079e Update web submodule to latest.(include https://github.com/cocos2d/cocos2d-html5/pull/3172) 2015-11-04 18:53:25 +08:00
pandamicro 78ae7d15ea Merge pull request #14315 from mogemimi/fix-docs-grammar 
Fix minor grammar and typo in documentation
 2015-11-04 18:49:43 +08:00
yinjimmy 7f10d6d894 Template: keep compatibility 2015-11-04 18:26:59 +08:00
mogemimi a31cce9a80 Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
pandamicro 7d93b419fd Merge pull request #14303 from xiaofeng11/v3_fix 
Fix ComponentTest in la-test can not load lua file under iOS & Android
 2015-11-04 13:52:14 +08:00
pandamicro e13c9a8d8d Merge pull request #14313 from super626/v3 
Function genMaterial keeps old state block
 2015-11-04 13:45:36 +08:00
yinjimmy 517567c56c Template : fix link libraries 
1. GameController.framework in JS template
2. CFNetwork.framework in Lua template
 2015-11-04 12:19:29 +08:00
yangxiao 16a79ed9df function genMaterial keeps old state block 2015-11-04 11:10:28 +08:00
pandamicro 0469379d66 Merge pull request #14308 from MSOpenTech/v3-win10-fix 
V3 win10 fix
 2015-11-04 10:49:25 +08:00
pandamicro 01fdb60b7d Merge pull request #14311 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-11-04 10:45:35 +08:00
zhangbin 47ea0dfb02 Update the reference of submodule cocos2d-console. 2015-11-04 10:43:30 +08:00
Dale Stammen 11b63fb28a cpp template update 2015-11-03 08:05:32 -08:00
Dale Stammen dfe56769a1 added missing Light3DReader files 2015-11-03 08:04:55 -08:00
pandamicro 4d0098c6be Merge pull request #14299 from mogemimi/fix-docs-typo 
Fix typos in documentation
 2015-11-03 18:12:21 +08:00
pandamicro a74c8ccded Merge pull request #14292 from xiaofeng11/v3 
Fix "BillBoard Test->Rotation Test" won't resume after switch back from background.
 2015-11-03 17:46:34 +08:00
pandamicro 0dabb4cfb7 Merge pull request #14295 from xiaofeng11/v3_xf 
Fix CodeIDE  can not start js project with simulator
 2015-11-03 17:37:01 +08:00
pandamicro 6010879ecf Merge pull request #14305 from pandamicro/v3 
[ci skip] Fix SocketIO test on iOS 9
 2015-11-03 17:27:21 +08:00
pandamicro 6a454d3eba Fix SocketIO test on iOS 9 2015-11-03 17:26:37 +08:00
pandamicro ba96714289 Merge pull request #14302 from liamcindy/v3.9_lightReader 
update for light3d reader
 2015-11-03 16:42:50 +08:00
pandamicro 73a1a8808e Merge pull request #14304 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-11-03 16:13:33 +08:00
zhangbin bfa50de768 Update the reference of submodule cocos2d-console. 2015-11-03 16:06:12 +08:00
XiaoFeng 3223a97b26 Fix ComponentTest in la-test can not load lua file under iOS & Android 2015-11-03 15:49:46 +08:00