Commit Graph

33317 Commits

Author SHA1 Message Date
yangxiao ebd5c1cca7 resolve conflict and fix checktexture bug 2015-12-02 11:26:05 +08:00
xiaofeng11 18666a9b41 Merge pull request from xiaofeng11/v3_combine_3d
Combine Studio change for 3d components
2015-12-02 09:47:12 +08:00
pandamicro b15935b999 Merge pull request from pandamicro/v3
Correct bindings generator ref
2015-12-02 00:21:08 +08:00
pandamicro df62e92d7b Correct bindings generator ref 2015-12-01 23:50:52 +08:00
pandamicro 34429f63a7 Merge pull request from CocosRobot/update_cocosfiles_1448984232
[AUTO][ci skip]: updating cocos2dx_files.json
2015-12-01 23:45:58 +08:00
CocosRobot c0393ece7d [AUTO][ci skip]: updating cocos2dx_files.json 2015-12-01 15:37:14 +00:00
pandamicro 83630d17c9 Merge pull request from xiaofeng11/v3_combine_JsLuaSim
V3 combine lua-binding, jsb, and simulator
2015-12-01 23:34:05 +08:00
yangxiao 1b3cb97b71 fix script binding 2015-12-01 23:05:47 +08:00
XiaoFeng e5d57b4fa2 update binding-generator sub module & code 2015-12-01 22:30:36 +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
XiaoFeng ea077c5141 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim
Conflicts:
	cocos/scripting/js-bindings/manual/js_manual_conversions.h
2015-12-01 15:12:32 +08:00
XiaoFeng 167aa9b648 Update console sub-module, update project template.json to meet file position change 2015-12-01 15:00:45 +08:00
yangxiao 9b371a55bf js not export Mesh::setTexture 2015-12-01 14:35:39 +08:00
zilongshanren 6db6e596bb Merge pull request from CocosRobot/update_lua_bindings_1448944051
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-01 13:42:55 +08:00
CocosRobot e891b03eee [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-01 04:32:19 +00:00
pandamicro 81f590e52a Merge pull request from pandamicro/v3
Improved JS bindings with more secured memory management
2015-12-01 12:24:21 +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
pandamicro 08837955a7 Skip Useless MenuItemToggle::initWithCallback to fix windows compilation issue 2015-11-30 23:54:42 +08:00
xiaofeng11 ea5463927e Merge pull request from liamcindy/pull_14393
fix compile error
2015-11-30 17:37:29 +08:00
Liam 34da2aabb2 fix compile error 2015-11-30 17:34:49 +08:00
xiaofeng11 423726995c Merge pull request from liamcindy/pull_14393
update sprite 3d test
2015-11-30 16:56:33 +08:00
pandamicro 17bdfb4050 Fix android compilation issue 2015-11-30 15:20:57 +08:00
Liam 4d379ed9bd revert ccplane 2015-11-30 14:53:37 +08:00
Liam e0349ae975 update sprite 3d test 2015-11-30 14:48:19 +08:00
XiaoFeng cbbfc69ad4 Add missing studio change for Director::drawScene 2015-11-30 11:19:02 +08:00
XiaoYang b6efd7573a Merge pull request from songchengjiang/v3
support normal mapping material
2015-11-30 09:48:24 +08:00
zilongshanren 9ff7069d2e Merge pull request from zilongshanren/fixIssue14477
fix Keyboard fails to hide on iOS.
2015-11-28 16:22:30 +08:00
zilongshanren e1751db195 Update CHANGELOG 2015-11-28 15:41:42 +08:00
zilongshanren 60624b8fd5 fix Keyboard fails to hide on iOS.
ticket: https://github.com/cocos2d/cocos2d-x/issues/14477
2015-11-28 15:37:58 +08:00
zilongshanren fdfff2205b Merge pull request from CocosRobot/update_cocosfiles_1448692208
[AUTO][ci skip]: updating cocos2dx_files.json
2015-11-28 14:33:43 +08:00
zilongshanren 6939e61397 Merge pull request from CocosRobot/update_cocosfiles_1448692139
[AUTO][ci skip]: updating cocos2dx_files.json
2015-11-28 14:33:34 +08:00
zilongshanren d4f932953f Merge pull request from CocosRobot/update_cocosfiles_1448692279
[AUTO][ci skip]: updating cocos2dx_files.json
2015-11-28 14:33:18 +08:00
CocosRobot 467177f45c [AUTO][ci skip]: updating cocos2dx_files.json 2015-11-28 06:31:21 +00:00
CocosRobot a839e8d307 [AUTO][ci skip]: updating cocos2dx_files.json 2015-11-28 06:30:10 +00:00
zilongshanren 4fbe8a62bf Update CHANGELOG 2015-11-28 14:29:40 +08:00
CocosRobot 3510228659 [AUTO][ci skip]: updating cocos2dx_files.json 2015-11-28 06:29:01 +00:00
zilongshanren 5e02b7f20a Update CHANGELOG 2015-11-28 14:28:44 +08:00
zilongshanren 01e619f686 Merge pull request from cesarpachon/linuxAudioEngine
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudio…
2015-11-28 14:27:15 +08:00
xiaofeng11 fdd3bacde1 Merge pull request from pmaloman/v3_Wrong_assert_in_ComponentContainer
Fixed assert statement. Added name to physic component.
2015-11-28 13:33:38 +08:00
zilongshanren 2571b87bda Merge pull request from xiaofeng11/v3_iOSFix
Fix keyboard won't dismiss on iOS issue
2015-11-28 11:41:41 +08:00
pandamicro 43c68aa16b Fix Chipmunk bindings issue 2015-11-27 22:38:16 +08:00
PavlOm 6e0525156b no message 2015-11-27 23:33:20 +10:00
XiaoFeng 150d907636 Add missing changes to Particle 3d 2015-11-27 19:01:30 +08:00
zilongshanren f1ddef6fd9 Merge pull request from CocosRobot/update_lua_bindings_1448616961
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-11-27 18:37:05 +08:00