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 |
CocosRobot
|
7a73c65208
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 05:53:20 +00: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 |
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 |
pandamicro
|
da4e062614
|
Add js wrapper for audio engine
|
2015-07-29 20:47:28 +08:00 |
VisualSJ
|
179266240f
|
Update js parser (timelineParser-2.x.js)
|
2015-07-29 19:49:54 +08:00 |
pandamicro
|
3089ac302e
|
Refine ui bindings and JS constants
|
2015-07-29 13:06:49 +08:00 |
CocosRobot
|
ac7729332a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-28 10:39:16 +00:00 |
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 |
pandamicro
|
3fa9463ec7
|
Fix manual bindings for changed API in spine
|
2015-07-28 15:11:20 +08:00 |
pandamicro
|
ca54340982
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-07-28 13:00:10 +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
|
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 |
jianglong0156
|
48147ff08a
|
add the Animate3D and Animation3D js implements
|
2015-07-27 10:53:34 +08:00 |
pandamicro
|
5be905c181
|
Merge pull request #13017 from pandamicro/v3.7.1
[ci skip] Release docs for v3.7.1
|
2015-07-25 15:17:52 +08:00 |
pandamicro
|
a2a32ef58c
|
Release docs for v3.7.1
|
2015-07-25 15:16:39 +08:00 |
pandamicro
|
33007e832f
|
Merge pull request #13014 from CocosRobot/update_lua_bindings_1437802542
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-25 13:40:55 +08:00 |
CocosRobot
|
f7fced7b70
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-25 05:40:05 +00:00 |
pandamicro
|
fba892f4aa
|
Merge pull request #13002 from VisualSJ/v3.7.1-12940
[ci skip]Issue #12940: Fixed a bug that is removing SimpleAudio play
|
2015-07-25 13:20:27 +08:00 |
pandamicro
|
fa46a0abb4
|
Merge pull request #12992 from yangws/v3.7.1
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-25 09:52:00 +08:00 |
pandamicro
|
a666658764
|
Merge pull request #12998 from pandamicro/v3.7.1
Add BoneNode/SkeletonNode/SkinNode JS bindings
|
2015-07-24 23:42:38 +08:00 |
pandamicro
|
05bb775438
|
Sync timelineParser and fix issue
|
2015-07-24 20:16:56 +08:00 |
pandamicro
|
54330576e6
|
Fix JS binding issues for skeleton animation
|
2015-07-24 20:16:01 +08:00 |
VisualSj
|
cf70cb9c40
|
Issue #12940: Fixed a bug that is removing SimpleAudio play
|
2015-07-24 17:41:01 +08:00 |
VisualSj
|
2b05ca731c
|
Issue #12941: Fixed a bug that is ccs.Skin ctor error in jsb
|
2015-07-24 17:34:04 +08:00 |
pandamicro
|
29b9ed685f
|
Add BoneNode/SkeletonNode/SkinNode JS bindings
|
2015-07-24 15:48:34 +08:00 |
Vincent Yang
|
e4a8aeee45
|
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-24 11:16:45 +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 |
pandamicro
|
739befdc08
|
Add audio engine bindings in JSB
|
2015-07-23 14:43:01 +08:00 |
pandamicro
|
5b8371aaa2
|
Merge pull request #12958 from VisualSJ/v3.7.1-bindCallback
[ci skip] Parse Touch/Click callback in JS Studio parser
|
2015-07-23 09:30:40 +08:00 |
VisualSj
|
d4900493e2
|
JS Studio parser (Modify callback method)
|
2015-07-22 17:56:35 +08:00 |
VisualSj
|
b282d75346
|
Parse Touch/Click callback in JS Studio parser
|
2015-07-22 16:51:44 +08:00 |
VisualSj
|
1496224c6d
|
Add cc.affineTransformConcatIn
|
2015-07-22 15:21:13 +08:00 |
Vincent Yang
|
3addf38134
|
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 12:01:34 +08:00 |
XiaoFeng
|
fcd7388936
|
Synchronize skybox parser with C++ version
|
2015-07-22 09:45:35 +08:00 |
pandamicro
|
25dff88ff4
|
Merge pull request #12922 from xiaofeng11/v3.7-release
[ci skip]Add Skybox parser to js
|
2015-07-22 09:12:38 +08: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 |
CocosRobot
|
0a23e4a305
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-20 07:08:12 +00: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 |
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 |
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 |
XiaoFeng
|
a68835733f
|
Add Skybox parser to js
|
2015-07-13 16:02:19 +08:00 |
CocosRobot
|
0e8a3f14f0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-10 09:11:50 +00:00 |
pandamicro
|
69cdaca306
|
Auto add extend to jsb need to extend classes
|
2015-07-10 09:49:39 +08:00 |
CocosRobot
|
2065e5b4a7
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-09 07:45:43 +00:00 |
VisualSj
|
9f52b1e6fb
|
Fixed a bug that is SingleNode setColor is null
|
2015-07-09 11:49:11 +08:00 |
CocosRobot
|
9638ae628a
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-08 05:48:55 +00:00 |
pandamicro
|
e717155930
|
Merge pull request #12715 from VisualSJ/v3.7-release2
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
|
2015-07-07 14:13:31 +08:00 |
CocosRobot
|
4a486077c0
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-07 06:05:39 +00:00 |
pandamicro
|
5970f56e1f
|
Merge pull request #12714 from VisualSJ/v3.7-release2
[ci skip] Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
|
2015-07-07 13:55:12 +08:00 |
VisualSj
|
dd0edac171
|
Constant value error (ccui.Layout.BACKGROUND_IMAGE_ZORDER )
|
2015-07-07 13:36:47 +08:00 |
andyque
|
6238ddebf3
|
Merge remote-tracking branch 'upstream/v3.7-release' into v3
|
2015-07-07 10:18:43 +08:00 |
CocosRobot
|
4c88db3fb2
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-07 00:44:47 +00:00 |
VisualSj
|
3b69a1726f
|
Fixed a bug that action texture address error
|
2015-07-06 17:17:20 +08:00 |
CocosRobot
|
ae860bd6ee
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-06 08:29:03 +00:00 |
CocosRobot
|
91dc2d22de
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-03 10:37:33 +00:00 |
pandamicro
|
1f48beee1e
|
Reorganize code
|
2015-07-03 12:55:55 +08:00 |
pandamicro
|
155b9b918c
|
Add retain/release for XMLHTTPReqest in JSB
|
2015-07-03 11:01:43 +08:00 |
pandamicro
|
1b22438792
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
Conflicts:
cocos/ui/UICheckBox.cpp
|
2015-07-03 10:23:49 +08:00 |
pandamicro
|
dbd72d0123
|
Merge pull request #12646 from VisualSJ/v3.7-release
[ci skip] Fixed a bug that is don't analytical frame
|
2015-07-02 17:22:13 +08:00 |
Sijie.Wang
|
7818bfcc7a
|
Fixed a bug that is don't analytical frame
|
2015-07-02 14:30:44 +08:00 |