pandamicro
c80f523637
Merge pull request #14269 from pandamicro/v3
...
[ci skip]Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser
2015-10-30 17:20:58 +08:00
pandamicro
246eab11a1
Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser
2015-10-30 17:19:21 +08:00
pandamicro
c0ecf7f7aa
Merge pull request #14262 from liamcindy/3.9_light_js
...
update for light3d js reader
2015-10-29 13:52:33 +08:00
unknown
f2f6d25408
update for light3d js reader
2015-10-29 10:04:56 +08:00
pandamicro
7d832b0753
Merge pull request #14238 from pandamicro/v3
...
Add cc.Director.EVENT_BEFORE_UPDATE
2015-10-28 15:50:37 +08:00
Kvial
27773b6f1a
fix cc.game.config['showFPS'] bug
...
```javascript
//project.json
{
...
'showFPS' : false,
...
}
```
```javascript
//CCBoot.js
...
config[CONFIG_KEY.showFPS] = config[CONFIG_KEY.showFPS] || true;// this property will be set to true
...
```
2015-10-27 20:36:05 +08:00
pandamicro
616eae2b6d
Add cc.Director.EVENT_BEFORE_UPDATE
2015-10-27 17:32:57 +08:00
pandamicro
a3c2904e7f
Fix cc.DrawNode.drawPoly
2015-10-27 16:46:25 +08:00
pandamicro
d3664b9616
#14128 Fix cc.loader.getRes crash caused by null type
2015-10-22 01:16:56 +08:00
pandamicro
9eeda122e9
Fix Scheduler API inconsistency
2015-10-21 22:10:48 +08:00
XiaoFeng
428db9c458
update js binding version info
2015-10-20 17:04:31 +08:00
pandamicro
cfb1ee2b11
Improved logic of jsb_boot.js to sync with the web engine behavior
2015-10-18 22:45:53 +08:00
pandamicro
5ae2812bf8
Sync with CCBoot for web
2015-10-10 10:15:36 +08:00
pandamicro
0ea54868e2
Add opacity/color cascade test case for Scale9Sprite
2015-10-09 21:01:49 +08:00
pandamicro
7b85211cfe
Remove ScriptComponent
...
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
pandamicro
91928aa23d
Add ComponentJS test case and fix windows platforms
2015-09-26 19:43:36 +08:00
江龙
9eb05707fb
add custom spine skeletonAnimation test
2015-09-25 13:36:48 +08:00
Nick
003920f826
fix loading pluginx when compile Android with --compile-script flag
2015-09-24 11:41:18 +07:00
pandamicro
d3504a9216
Update versions and html5 engine
2015-09-22 02:31:21 +08:00
pandamicro
4aaf017e4c
Merge pull request #13890 from jianglong0156/addsetUniformLocationWithMatrix
...
add CCGLProgram function binding setUniformLocationWithMatrix
2015-09-17 17:45:16 +08:00
江龙
1b320ac248
add CCGLProgram function binding setUniformLocationWithMatrix
2015-09-17 15:34:41 +08:00
zhangcheng
fb104189d4
Multiplexing ccs.load.
2015-09-15 13:04:45 +08:00
zhangcheng
fa7f97b26e
Adjustment spaces.
2015-09-15 11:35:43 +08:00
zhangcheng
83f5f85f56
add loadWithVisibleSize js function.
2015-09-15 11:16:02 +08:00
pandamicro
dc607a1784
Merge pull request #13726 from jianglong0156/actionExtendSquash
...
support custom action, and rewrite update function
2015-09-09 10:25:56 +08:00
江龙
badd80bf3a
support custom action, and rewrite update function
...
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
ctor:function (duration, deltaPos, deltaY) {
this._super(duration, deltaPos, deltaY);
},
update:function (dt) {
this._super(dt);
if (this.getTarget()) { // rand color
this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
}
}
});
2015-09-09 10:08:07 +08:00
pandamicro
4fb34ba190
Merge pull request #13703 from cocos2d/v3.8
...
Sync v3.8 to v3
2015-09-07 14:56:37 +08:00
pandamicro
86fb0fc3bc
[JS] Add common APIs for compatibility with web engine
2015-09-06 08:57:43 +08:00
WenhaiLin
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
pandamicro
8f6f5c1191
Update engine versions
2015-08-31 13:52:15 +08:00
Liam
69da65d7a4
update for jsb_opengl_constants
2015-08-28 08:42:55 +08:00
Liam
ed49250b9b
update for reader
...
1.update for sprite3d cullface
2.sync js code
2015-08-27 18:29:45 +08:00
pandamicro
032bc590b7
Merge pull request #13593 from jianglong0156/fixActionParamError
...
fix Action:Place, RotateTo param wrong number error
2015-08-27 17:44:46 +08:00
江龙
a060a82d88
fix Action:Place, RotateTo param wrong number error
2015-08-27 17:35:09 +08:00
pandamicro
6ee33499b4
Update changelog and versions for v3.8 rc0
2015-08-22 11:56:25 +08:00
pandamicro
006f300ac9
Add JS and Lua bindings for CCCameraBackgroundBrush
2015-08-21 12:42:36 +08:00
VisualSj
a4fec3a5e0
Update Studio js parser
2015-08-20 17:02:41 +08:00
pandamicro
81d5a8377f
Merge pull request #13418 from jianglong0156/fixTMXTileFlagsError
...
Remove duplicate function definition, Add function adaptation
2015-08-17 22:56:59 +08:00
pandamicro
be165ef900
Permit webp image loading
2015-08-17 18:55:53 +08:00
jianglong0156
b19e02bdf6
Remove duplicate function definition, Add function adaptation
2015-08-17 18:18:38 +08:00
pandamicro
f2edb1c8f9
Merge pull request #13410 from ZhangMenghe/v3-retinaEffect
...
[ci skip] Fix invisiable testcase of effects
2015-08-17 17:51:04 +08:00
ZhangMenghe
eaa5643c7c
Fix invisiable testcase of effects
2015-08-17 17:26:25 +08:00
VisualSj
c52a81a2c2
Update JS parser
2015-08-17 17:25:17 +08:00
XiaoFeng
72d21ff810
Update reader, add BlendFrame supporting to Skeleton Animation
...
Update json parser to prepare compatible for both current version output json description file and future optimized version json description file.
2015-08-17 13:05:29 +08:00
江龙
06ab98b0ac
improve the comment
2015-08-15 17:04:32 +08:00
jianglong0156
ae8332eb85
add NodeGrid bind
2015-08-14 17:46:34 +08:00
andyque
82f597ce98
Merge branch 'v3.7.1' into v3
...
# Conflicts:
# cocos/scripting/lua-bindings/auto/api/CheckBox.lua
# cocos/ui/UICheckBox.cpp
# cocos/ui/UICheckBox.h
2015-08-12 17:59:50 +08:00
jianglong0156
2c3b9009cb
fix the node color property can not use
...
code example:
````
node.color = xxxx // fix it
````
2015-08-07 17:26:35 +08:00
XiaoFeng
91c88ec535
Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247
2015-08-06 18:12:08 +08:00
VisualSj
b9b565e64a
Update JSON parser
2015-08-04 16:04:35 +08:00
VisualSj
04465ac4f4
Update JSON parser
2015-08-04 15:15:46 +08:00
pandamicro
702e667143
Merge pull request #13152 from zilongshanren/addVerticalPageView
...
add PageView vertical scroll support
2015-08-03 13:00:48 +08:00
andyque
2427c15b60
modify vertical scroll direction
2015-08-03 11:38:23 +08:00
pandamicro
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
andyque
5f34c1f072
add PageView vertical scroll support
2015-08-01 18:18:46 +08:00
jianglong0156
69040ef472
add Physics3DHingeConstraint support constructor
...
add Physics3DSliderConstraint support constructor
add Physics3DConeTwistConstraint support constructor
add Physics3D6DofConstraint support constructor
add PhysicsSprite3D support constructor
2015-08-01 16:18:00 +08:00
jianglong0156
bcec599993
Merge branch 'v3' into constructedWith3D_3#12404
2015-08-01 15:38:26 +08:00
pandamicro
d52a5da1d8
Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404
...
Constructed with3d
2015-08-01 10:09:08 +08:00
jianglong0156
dcda083efa
rename the initTerrain to initWithTerrainData
2015-07-31 18:35:47 +08:00
jianglong0156
80e812e5a0
add Physics3DShape support constructor
2015-07-31 18:17:35 +08:00
pandamicro
c0066f9afd
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
2015-07-30 20:25:57 +08:00
pandamicro
8542f8a7a9
Merge pull request #13067 from pandamicro/scrollviewbar
...
Bind UIScrollViewBar
2015-07-30 18:42:08 +08:00
jianglong0156
113233b8df
add Camera support constructor
2015-07-30 18:00:51 +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
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
jianglong0156
f71f9b2b15
improve the code
2015-07-28 16:32:56 +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
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
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
pandamicro
6110700615
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend
2015-07-23 15:25:33 +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
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
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
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
pandamicro
c126aac35f
v3.7 rc1 release doc
2015-07-14 23:21:34 +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