Commit Graph

32083 Commits

Author SHA1 Message Date
CocosRobot 9be03891dc [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-30 10:21:08 +00:00
pandamicro 9b5c8d5d12 Merge pull request #12601 from super626/physics3d
3d physics collider
2015-07-30 18:19:23 +08:00
yangxiao 8eac67b806 IsTrigger to isTrigger 2015-07-30 18:18:02 +08:00
yangxiao 99a869b588 IsTrigger to isTrigger 2015-07-30 18:14:46 +08:00
CocosRobot a9b811fee4 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 10:07:13 +00:00
jianglong0156 113233b8df add Camera support constructor 2015-07-30 18:00:51 +08:00
pandamicro 507a094653 Merge pull request #13108 from jianglong0156/constructedWith3D#12404
improve jsval_to_physics3DRigidBodyDes
2015-07-30 17:58:16 +08:00
子龙山人 7a5c91c3d4 Merge pull request #13111 from CocosRobot/update_lua_bindings_1438247801
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 17:33:06 +08:00
CocosRobot ef7318cf00 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 09:23:06 +00:00
jianglong0156 b016b642ce add Terrain support constructor 2015-07-30 17:17:57 +08:00
pandamicro 8d8c7fe14b Complete AudioEngineTest 2015-07-30 17:14:08 +08:00
pandamicro 39721c6eb6 Merge pull request #13105 from fusijie/fix_10487
fix Sprite/Label/FastTMX auto-culling bug.
2015-07-30 17:12:37 +08:00
Wenhai Lin bce279c52e Label:Fixed the edge of character may be cropped. 2015-07-30 16:24:47 +08:00
jianglong0156 0f9483a0e3 add SpotLight support constructor 2015-07-30 15:21:35 +08:00
jianglong0156 8d3ceb7ac2 add PointLight support constructor 2015-07-30 15:11:37 +08:00
fusijie 17c7848e62 fix FastTiledMap auto-culling bug. 2015-07-30 15:07:03 +08:00
jianglong0156 52ed2e8d4e add conversion function declare, use to the physics3d auto conversion the data 2015-07-30 14:56:24 +08:00
jianglong0156 b16ee0e45d add file in project file with android, linux wp8.1 (reverted from commit 948628b800) 2015-07-30 14:46:10 +08:00
jianglong0156 73125f46d2 add file in project file with android, linux wp8.1 (reverted from commit 948628b800) 2015-07-30 14:38:20 +08:00
jianglong0156 a1a9e281a3 add conversion cpp file into iOS project (reverted from commit 439bc8a99f) 2015-07-30 14:37:58 +08:00
jianglong0156 3496fe896d improve the rigidbody conversion function 2015-07-30 14:26:28 +08:00
pandamicro bcaa182bf2 Merge pull request #13107 from CocosRobot/update_lua_bindings_1438235300
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 14:04:47 +08:00
fusijie f91a58c8ff fix Label auto-culling bug. 2015-07-30 13:59:50 +08:00
CocosRobot 7a73c65208 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 05:53:20 +00:00
子龙山人 cd4d8b7880 Merge pull request #13101 from WenhaiLin/v3.8-label-code-style
Improve coding style
2015-07-30 13:44:53 +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
pandamicro cffc05b717 Merge pull request #13098 from CocosRobot/update_lua_bindings_1438220026
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 12:49:09 +08:00
pandamicro 895b603933 Merge pull request #13097 from CocosRobot/update_cocosfiles_1438219932
[AUTO][ci skip]: updating cocos2dx_files.json
2015-07-30 12:48:40 +08:00
pandamicro 89b266d8b5 Auto binding for ctor function support parameter 2015-07-30 12:46:12 +08:00
fusijie ee5e64825a fix Sprite auto-culling bug. 2015-07-30 12:00:57 +08:00
子龙山人 6818a97311 Merge pull request #13104 from fusijie/fix_cpptests_androidstudio_compile
[ci skip]fix android studio compile error.
2015-07-30 11:59:05 +08:00
fusijie d2181e137e fix android studio compile error. 2015-07-30 11:55:33 +08:00
子龙山人 815c8d91f0 Merge pull request #13102 from CocosRobot/update_lua_bindings_1438227193
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 11:40:32 +08:00
CocosRobot f1adc2ffd2 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 03:39:17 +00:00
子龙山人 cbda4bcfaf Merge pull request #13100 from CocosRobot/update_cocosfiles_1438227091
[AUTO][ci skip]: updating cocos2dx_files.json
2015-07-30 11:35:44 +08:00
WenhaiLin 964e7103b5 Improve coding style 2015-07-30 11:33:18 +08:00
CocosRobot 12523e2f4e [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-30 03:31:32 +00:00
子龙山人 c039c7a9bd Merge pull request #13084 from WenhaiLin/v3.8-label-df-contentsize-fix
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-30 11:29:48 +08:00
CocosRobot 0ec43fe603 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-30 01:39:13 +00:00
CocosRobot d86324ac56 [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-30 01:32:14 +00:00
pandamicro 0f3a2ca642 Merge pull request #13062 from ZhangMenghe/Docs
[ci skip]Add framework architecture figure to README
2015-07-30 09:30:10 +08:00
pandamicro 38760d0279 Merge pull request #13095 from CocosRobot/update_lua_bindings_1438202232
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-30 09:29:27 +08:00
CocosRobot bd867311f1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-29 20:42:46 +00:00
Ricardo Quesada 642ccac5dc Merge pull request #12927 from ricardoquesada/spine-2.3
Adds support for Spine runtime 2.3
2015-07-29 13:33:15 -07:00
Ricardo Quesada 7431acf3e0 Merge pull request #2 from pandamicro/spine
Fix manual bindings for changed API in spine
2015-07-29 11:28:42 -07:00
pandamicro 3605eb8ae9 Merge pull request #13093 from pandamicro/v3.7.1
[ci skip]Update web ref
2015-07-29 21:34:59 +08:00
pandamicro e57b285f24 Merge pull request #13088 from dualface/v3.7.1
add ActionTime lua test
2015-07-29 21:33:20 +08:00
pandamicro 9e356e04d2 Update web ref 2015-07-29 21:31:05 +08:00
pandamicro f53ba42b3b Fix test issues and Add audio engine to js templates 2015-07-29 21:22:44 +08:00
pandamicro 9972bfb98c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
# Conflicts:
#	tests/js-tests/src/NativeTest/NativeTest.js
2015-07-29 21:01:56 +08:00