Wenhai Lin
|
70628c9dec
|
Fixed link errors on iOS/Mac
|
2015-07-29 13:59:58 +08:00 |
pandamicro
|
3089ac302e
|
Refine ui bindings and JS constants
|
2015-07-29 13:06:49 +08:00 |
pandamicro
|
81842417c4
|
Merge pull request #13032 from xiaofeng11/v3
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
|
2015-07-29 09:54:43 +08:00 |
dualface
|
d9c5600f41
|
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1
|
2015-07-29 09:17:53 +08:00 |
pandamicro
|
f48dae09db
|
Bind UIScrollViewBar
|
2015-07-29 00:11:52 +08:00 |
zhangbin
|
8bc96a10b4
|
Update the reference of submodule cocos2d-console.
|
2015-07-28 15:06:28 +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
|
d5a6522a37
|
Merge branch 'v3' into constructedWith3D#12404
|
2015-07-28 09:59:35 +08:00 |
XiaoFeng
|
09d9fcf4d6
|
Fix lua binding
|
2015-07-27 21:24:52 +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 |
XiaoFeng
|
e0aef73306
|
Fix lua binding
|
2015-07-27 17:31:09 +08:00 |
XiaoFeng
|
63f8b941c9
|
Fix setting file
|
2015-07-27 16:03:05 +08:00 |
XiaoFeng
|
8421ff7149
|
Disable new function bind to lua to avoid compile error
|
2015-07-27 15:09:34 +08:00 |
dualface
|
6d16d1674d
|
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1
|
2015-07-27 11:50:14 +08:00 |
zhangbin
|
e73fc94345
|
Remove the unused files in tools/gen-prebuilt.
|
2015-07-27 11:38:41 +08:00 |
pandamicro
|
632b36fa43
|
Fix bindings generator for Lua
|
2015-07-27 10:21:18 +08:00 |
pandamicro
|
08e3d8d533
|
Gen bindings for BoneNode and SkeletonNode
|
2015-07-27 09:56:55 +08:00 |
dualface
|
4c7e4c654a
|
update cocos2dx.ini for luabinding
|
2015-07-26 17:16:50 +08:00 |
pandamicro
|
a2a32ef58c
|
Release docs for v3.7.1
|
2015-07-25 15:16:39 +08:00 |
pandamicro
|
93c1cb70c4
|
Gen bindings and cocos2dx_files for v3.7.1
|
2015-07-25 13:31:52 +08:00 |
pandamicro
|
c1bc03b342
|
Gen bindings for v3.7.1
|
2015-07-25 13:28:02 +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
|
54330576e6
|
Fix JS binding issues for skeleton animation
|
2015-07-24 20:16:01 +08:00 |
pandamicro
|
6e8edc401c
|
Revert changes to lua ini
|
2015-07-24 17:19:40 +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 |
zhangcheng
|
ef6ada5bf4
|
Fix cocos2dx_studio.ini format error.
|
2015-07-24 09:28:55 +08:00 |
zhangcheng
|
3945ce7a4e
|
Add ComExtensionData to luabinding.
|
2015-07-23 18:27:19 +08:00 |
zhangcheng
|
6a1bf83fce
|
Merge branch 'OptimizationExtensionData' of https://github.com/chengstory/cocos2d-x into OptimizationExtensionData
|
2015-07-23 18:11:57 +08:00 |
zhangcheng
|
19e078da19
|
Add ComExtensionData lua binding.
|
2015-07-23 18:11:47 +08:00 |
pandamicro
|
ae2a966458
|
Fix jsb issue for refactor ObjectExtensionData to ComExtensionData
|
2015-07-23 17:49:32 +08:00 |
pandamicro
|
739befdc08
|
Add audio engine bindings in JSB
|
2015-07-23 14:43:01 +08:00 |
Bin Zhang
|
0a6186d68f
|
Solve the error in Xcode project of simulator.
|
2015-07-22 13:44:34 +08:00 |
Vincent Yang
|
3addf38134
|
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 12:01:34 +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 |
yangxiao
|
e5ac3ee090
|
ignore Animate getKeyFrameUserInfo
|
2015-07-20 14:54:11 +08:00 |
yangxiao
|
583d82c1e8
|
ignore Animate getKeyFrameUserInfo
|
2015-07-20 11:49:30 +08:00 |
andyque
|
042a3dc2ec
|
add xcpretty to framework mac build
|
2015-07-17 10:48:05 +08:00 |
Bin Zhang
|
a5e3267c98
|
Update the reference of submodule cocos2d-console.
|
2015-07-17 10:08:35 +08:00 |
pandamicro
|
490d5a3747
|
Remove cleanup from auto bindings add made it support override in JS
|
2015-07-16 14:09:26 +08: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 |
pandamicro
|
3c08b497ba
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-07-15 14:26:19 +08:00 |
pandamicro
|
7f7cf92da3
|
Update bindings-generator
|
2015-07-15 14:21:47 +08:00 |
andyque
|
15b0fea530
|
fix win32&win8.1 template compile
|
2015-07-15 10:00:35 +08:00 |
Bin Zhang
|
55890f6206
|
Update the JS templates to keep the directory structure is same with before.
|
2015-07-14 18:07:17 +08:00 |
andyque
|
97168fa139
|
add cocos framework build on linux platform.
|
2015-07-14 16:25:54 +08:00 |
andyque
|
ac1bf36208
|
update submodule
|
2015-07-14 10:10:20 +08:00 |
Bin Zhang
|
569695d844
|
Update the reference of submodule cocos2d-console.
|
2015-07-14 09:40:42 +08:00 |
andyque
|
fc673ee502
|
Merge branch 'v3.7-release' into v3
|
2015-07-13 22:44:54 +08:00 |
Bin Zhang
|
75920b8e11
|
Update the reference of submodule cocos2d-console.
|
2015-07-13 12:05:17 +08:00 |
pandamicro
|
15bb633adb
|
Revert "add lua-binding of EventDispacher::dispatchCustomEvent()"
|
2015-07-12 20:19:52 +08:00 |
pandamicro
|
0d9da2f500
|
Merge pull request #12773 from minggo/bind-missing-function
add lua-binding of EventDispacher::dispatchCustomEvent()
|
2015-07-11 17:17:32 +08:00 |
Bin Zhang
|
8ca9e10a22
|
Use msbuild to generating engine prebuilt libs on win32.
|
2015-07-10 17:01:08 +08:00 |
pandamicro
|
2d27091398
|
Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge
add write api in FileUtils
|
2015-07-10 15:13:21 +08:00 |
minggo
|
3911e1d696
|
add lua-binding of EventDispacher::dispatchCustomEvent()
|
2015-07-10 10:29:21 +08:00 |
andyque
|
9857a4acc4
|
fix template daily build
|
2015-07-09 14:17:49 +08:00 |
andyque
|
6cf38586c2
|
fix template daily build
|
2015-07-09 13:50:58 +08:00 |
andyque
|
32171c491a
|
fix slave scripts path
|
2015-07-09 11:34:37 +08:00 |
andyque
|
0d0787b212
|
fix pr build scripts
|
2015-07-09 11:26:55 +08:00 |
andyque
|
c83a398381
|
fix win32 and winrt build error
|
2015-07-09 10:27:13 +08:00 |
andyque
|
4bdbca829b
|
fix scripts path error
|
2015-07-09 10:15:27 +08:00 |
andyque
|
7098261523
|
unassigned shouldn't trigger jenkins rebuild
|
2015-07-09 10:10:37 +08:00 |
andyque
|
3f07b0c67a
|
refactor daily build into one
|
2015-07-09 09:53:20 +08:00 |
andyque
|
2df9ce8909
|
fix runtime ios build error
|
2015-07-08 18:05:12 +08:00 |
pandamicro
|
30c79fea02
|
Add auto bindings for Frame::g|setTweenType
|
2015-07-08 17:19:30 +08:00 |
andyque
|
dda07bebf5
|
fix ios/mac/win32/win8.1 compile error
|
2015-07-08 07:36:26 +08:00 |
andyque
|
a18116aaa4
|
minor improvements
|
2015-07-07 16:56:38 +08:00 |
andyque
|
0ca645f744
|
add runtime daily build script
|
2015-07-07 16:54:03 +08:00 |
andyque
|
47bae38168
|
finish template daily build
|
2015-07-07 16:27:38 +08:00 |
andyque
|
04ade7c16e
|
remove xcode scheme
|
2015-07-07 14:57:25 +08:00 |
jianglong0156
|
13d00d129d
|
fix the jsb and lua ini error, ignore writeDataToFile
|
2015-07-07 14:54:31 +08:00 |
andyque
|
a5115bd739
|
improve
|
2015-07-07 14:34:02 +08:00 |
andyque
|
494036be1a
|
fix linux build
|
2015-07-07 14:34:02 +08:00 |
andyque
|
d8bf9c8a2a
|
improve template daily build scripts
|
2015-07-07 14:34:02 +08:00 |
andyque
|
6238ddebf3
|
Merge remote-tracking branch 'upstream/v3.7-release' into v3
|
2015-07-07 10:18:43 +08:00 |
pandamicro
|
a9f98aefea
|
[Simulator JSB] Fix issue caused by video and web view binding
|
2015-07-07 09:38:38 +08:00 |
andyque
|
92585d3a8e
|
fix python syntax error
|
2015-07-06 17:09:55 +08:00 |
andyque
|
881a388892
|
add framework daily build scripts
|
2015-07-06 16:43:37 +08:00 |
Bin Zhang
|
0bcdf898bf
|
Solve the error in simulator.
|
2015-07-04 10:17:40 +08:00 |
pandamicro
|
aeeb6eb683
|
Merge pull request #12661 from pandamicro/v3.7-release
Fixed #12652 Add retain/release for XMLHTTPReqest in JSB
|
2015-07-04 08:40:55 +08:00 |
pandamicro
|
6f3fc302e6
|
Fix web view and video player in simulator
|
2015-07-04 08:39:49 +08:00 |
andyque
|
4704d38c13
|
add v3 to travis build
|
2015-07-03 18:27:42 +08:00 |
andyque
|
698f70f5b6
|
fix runtime template compilation
|
2015-07-03 15:38:53 +08:00 |
andyque
|
f37d4d226b
|
fix templates daily build issue
|
2015-07-03 15:18:33 +08:00 |
Bin Zhang
|
f27b370b94
|
Add argument --ios to compile Mac & iOS platforms separately.
|
2015-07-03 11:31:40 +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 |
Bin Zhang
|
558e9c3d61
|
Solve the error when generating simulator on win32.
|
2015-07-03 10:14:20 +08:00 |
Bin Zhang
|
c713708e4d
|
Not compile the scripts when generating simulator.
|
2015-07-02 17:13:35 +08:00 |
子龙山人
|
5b971ee93d
|
Merge pull request #12607 from neokim/add_radio_button_and_group
Add RadioButton and RadioButtonGroup widgets
|
2015-07-02 17:12:59 +08:00 |
Bin Zhang
|
7ffb5edc27
|
Update the bundle version when generating simulator.
|
2015-07-02 14:37:42 +08:00 |
Bin Zhang
|
e24975f0fe
|
Add python script for generate cocos simulator.
|
2015-07-02 13:43:52 +08:00 |
andyque
|
dce583db93
|
fix jsb bindings error
|
2015-07-01 18:28:22 +08:00 |
子龙山人
|
8f7098e2c8
|
Merge pull request #12611 from andyque/add-project-template-to-jenkins
finish template daily build.
|
2015-07-01 17:26:12 +08:00 |
Bin Zhang
|
8d928e60c8
|
Update the version displayed in simulator about dialog.
|
2015-07-01 17:23:34 +08:00 |
Bin Zhang
|
d0fc1e9d34
|
Add link libs config in simulator project for framework.
|
2015-07-01 15:31:03 +08:00 |
andyque
|
53817618b7
|
finish template daily build.
1. daily build doesn't clean when build finished.
2. add options to template daily build
|
2015-07-01 11:24:46 +08:00 |
子龙山人
|
077241eecf
|
Merge pull request #12599 from jianglong0156/jsbProjectMerge
merge the jsb project into cocos2d project
|
2015-06-30 17:04:12 +08:00 |
Bin Zhang
|
0726b2be9c
|
Generate prebuilt Android.mk when compiling prebuilt libs for android.
|
2015-06-30 16:53:11 +08:00 |
Bin Zhang
|
78c5f2e77e
|
Build simulator project when generating prebuilt libs for android.
|
2015-06-30 16:45:55 +08:00 |
Bin Zhang
|
bb77101f0b
|
Solve the error when building simulator for android.
|
2015-06-30 16:45:13 +08:00 |