pandamicro
|
8e883f9956
|
Merge pull request #13049 from jianglong0156/constructedWith3D#12404
Some 3d classes can't be constructed with new in JS
|
2015-07-28 18:31:04 +08:00 |
CocosRobot
|
c8f2514758
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-28 09:21:06 +00:00 |
jianglong0156
|
f71f9b2b15
|
improve the code
|
2015-07-28 16:32:56 +08:00 |
jianglong0156
|
439bc8a99f
|
add conversion cpp file into iOS project
|
2015-07-28 10:48:18 +08:00 |
jianglong0156
|
948628b800
|
add file in project file with android, linux wp8.1
|
2015-07-28 10:26:45 +08:00 |
jianglong0156
|
ec4d53fcf7
|
add 3d conversion
|
2015-07-28 10:08:58 +08:00 |
jianglong0156
|
d5a6522a37
|
Merge branch 'v3' into constructedWith3D#12404
|
2015-07-28 09:59:35 +08:00 |
jianglong0156
|
6d83a3cea4
|
add Physics3DWorld support new
|
2015-07-27 18:22:56 +08:00 |
jianglong0156
|
cb2b427eed
|
add Physics3DRigidBodyDes support new , add new file jsb_cocos2dx_3d_conversions.h and jsb_cocos2dx_3d_conversions.cpp
|
2015-07-27 18:19:10 +08:00 |
jianglong0156
|
9c6b5730d0
|
add Physics3DPointToPointConstraint support new
|
2015-07-27 16:02:13 +08:00 |
jianglong0156
|
1be5981d6a
|
add Physics3DComponent support new
|
2015-07-27 14:26:50 +08:00 |
jianglong0156
|
4005ef6588
|
add skybox support new
|
2015-07-27 11:19:17 +08:00 |
CocosRobot
|
d9b5ce8d28
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-27 03:17:29 +00:00 |
jianglong0156
|
48147ff08a
|
add the Animate3D and Animation3D js implements
|
2015-07-27 10:53:34 +08:00 |
Ricardo Quesada
|
2deb492d36
|
compiles and runs on Xcode 7
|
2015-07-23 14:28:23 -07:00 |
pandamicro
|
6110700615
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend
|
2015-07-23 15:25:33 +08:00 |
Vincent Yang
|
3addf38134
|
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 12:01:34 +08:00 |
CocosRobot
|
6630157377
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-21 04:40:43 +00:00 |
pandamicro
|
85d4ce0d5a
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
docs/RELEASE_NOTES.md
tools/cocos2d-console
tools/tojs/cocos2dx.ini
|
2015-07-21 11:39:24 +08:00 |
pandamicro
|
65f647ce00
|
Merge pull request #12879 from pandamicro/v3.7-release
[ci skip] Update versions and docs for v3.7
|
2015-07-16 16:55:24 +08:00 |
pandamicro
|
e2068ab84a
|
Update versions and docs for v3.7
|
2015-07-16 16:53:43 +08:00 |
CocosRobot
|
f2567f498c
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-16 08:22:58 +00:00 |
pandamicro
|
b094367c94
|
Merge pull request #12874 from pandamicro/v3.7-release
Remove cleanup from auto bindings add made it support override in JS
|
2015-07-16 16:15:26 +08:00 |
pandamicro
|
949eca2846
|
Improve some manual binding code
|
2015-07-16 14:34:14 +08:00 |
pandamicro
|
490d5a3747
|
Remove cleanup from auto bindings add made it support override in JS
|
2015-07-16 14:09:26 +08:00 |
CocosRobot
|
8442fe5f89
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-16 06:04:17 +00:00 |
pandamicro
|
0b1d105803
|
Merge pull request #12870 from VisualSJ/v3.7-release-parser
[ci skip] Fixed parser's bug
|
2015-07-16 13:04:06 +08:00 |
VisualSj
|
0bb385f37c
|
Check texture for existence
|
2015-07-16 11:54:45 +08:00 |
VisualSj
|
ef70e1f996
|
Fixed a bug that is Armature parser
|
2015-07-16 10:30:22 +08:00 |
CocosRobot
|
be71b6d563
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-15 08:23:23 +00:00 |
pandamicro
|
436564f922
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
docs/RELEASE_NOTES.md
web
|
2015-07-15 14:39:40 +08:00 |
CocosRobot
|
4b418fe823
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-15 05:46:42 +00:00 |
pandamicro
|
c126aac35f
|
v3.7 rc1 release doc
|
2015-07-14 23:21:34 +08:00 |
pandamicro
|
eb56ad6d60
|
Merge pull request #12836 from pandamicro/v3.7-release
Fixed #12834 Invoke cleanup function when override in JS
|
2015-07-14 17:37:00 +08:00 |
pandamicro
|
a90a8b12c6
|
Merge pull request #12840 from pandamicro/path
[ci skip] Add cc.path.mainFileName
|
2015-07-14 16:41:16 +08:00 |
子龙山人
|
7e4e82da2c
|
Merge pull request #12835 from zilongshanren/improve-coding-style
add more descriptive message to ASSET macro.
|
2015-07-14 16:36:59 +08:00 |
pandamicro
|
41778f35fb
|
Add cc.path.mainFileName
|
2015-07-14 16:33:38 +08:00 |
pandamicro
|
658fe74141
|
Merge pull request #12838 from VisualSJ/v3.7-release-parser
[ci skip] Remove getRes (parser)
|
2015-07-14 16:20:42 +08:00 |
pandamicro
|
efffea5b91
|
Fixed #12834 Invoke cleanup function when override in JS
|
2015-07-14 15:35:29 +08:00 |
andyque
|
91dfb07a8c
|
add more descriptive message to ASSET macro.
|
2015-07-14 15:28:36 +08:00 |
VisualSj
|
a9deb6dda5
|
Remove getRes (parser)
|
2015-07-14 15:26:13 +08:00 |
pandamicro
|
09775d6f2a
|
Ensure backward compatibility
|
2015-07-14 14:14:36 +08:00 |
CocosRobot
|
6b9a5b8264
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-14 05:41:48 +00:00 |
pandamicro
|
43a5b6f020
|
Fix jsb loaders issues
|
2015-07-14 13:40:09 +08:00 |
子龙山人
|
e1ae3631fc
|
Merge pull request #12818 from zilongshanren/v3
merge v3.7 back to v3
|
2015-07-14 13:32:56 +08:00 |
andyque
|
ef5d4ddf86
|
Merge remote-tracking branch 'upstream/v3' into v3
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
|
2015-07-14 11:24:38 +08:00 |
Vincent Yang
|
0a6933cc8c
|
Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have a memory leak.
|
2015-07-14 10:46:17 +08:00 |
andyque
|
fc673ee502
|
Merge branch 'v3.7-release' into v3
|
2015-07-13 22:44:54 +08:00 |
CocosRobot
|
9e60713322
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-13 14:41:58 +00:00 |
CocosRobot
|
300da3e3fc
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-13 12:57:03 +00:00 |