WenhaiLin
|
875d01573a
|
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
|
2015-07-31 21:20:42 +08:00 |
pandamicro
|
f74438372c
|
Merge pull request #11293 from perminovVS/v3-dev-screen-size-bug
GLViewImpl initWithRect bug size
|
2015-07-31 18:43:23 +08:00 |
jianglong0156
|
dcda083efa
|
rename the initTerrain to initWithTerrainData
|
2015-07-31 18:35:47 +08:00 |
pandamicro
|
8c186c876c
|
Merge pull request #13141 from VisualSJ/v3-follow
[ci skip] [JS-TESTS] Div should be black
|
2015-07-31 18:35:23 +08:00 |
jianglong0156
|
80e812e5a0
|
add Physics3DShape support constructor
|
2015-07-31 18:17:35 +08:00 |
VisualSj
|
04b05776a6
|
[JS-TESTS] Div should be black
|
2015-07-31 17:16:57 +08:00 |
fusijie
|
dcef1e9d31
|
fix polygon sprite setflipped bug.
|
2015-07-31 15:49:44 +08:00 |
pandamicro
|
aa1a3bb6b7
|
Merge pull request #13137 from yangws/issue_9507
Fixed #9507 : logic error in isMaxLengthEnabled handling in UITextFie…
|
2015-07-31 15:43:46 +08:00 |
jianglong0156
|
4439b02a84
|
rename the init function name
|
2015-07-31 15:21:54 +08:00 |
pandamicro
|
aed6b0719e
|
Merge pull request #13089 from yangws/issue_12692
Fixed #12692 : UILayout viewing area cutting position calculation error
|
2015-07-31 12:02:00 +08:00 |
pandamicro
|
52fdea265a
|
Merge pull request #13133 from CocosRobot/update_lua_bindings_1438308093
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-31 10:17:32 +08:00 |
CocosRobot
|
0851363532
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-31 02:06:41 +00:00 |
pandamicro
|
ede9195d14
|
Merge pull request #13073 from super626/fixtest
Bug Fix
|
2015-07-31 09:58:14 +08:00 |
yangxiao
|
fc14efa034
|
update comment
|
2015-07-31 09:55:57 +08:00 |
pandamicro
|
c9d23805e7
|
Merge pull request #12978 from yangws/issue_12249
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
|
2015-07-31 09:54:38 +08:00 |
pandamicro
|
6b9ca70e02
|
Merge pull request #13051 from yangws/issue_9400
Fixed #9400 : Widget::setHighlighted does not work after setBright
|
2015-07-31 09:50:20 +08:00 |
pandamicro
|
16eb88bf57
|
Merge pull request #13055 from yangws/issue_10082
Fixed #10082 : Label and Text have different types for fontSize
|
2015-07-31 09:49:48 +08:00 |
pandamicro
|
9394b77810
|
Merge pull request #13129 from CocosRobot/update_cocosfiles_1438306251
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-31 09:37:30 +08:00 |
CocosRobot
|
08a44e818b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-31 01:30:53 +00:00 |
pandamicro
|
94023ebfc5
|
Merge pull request #13126 from takaken1994/bugfix/remove-using-namespace-from-header
remove "using namespace cocos2d;" from header file
|
2015-07-31 09:28:58 +08:00 |
pandamicro
|
9786bcabde
|
Merge pull request #13128 from CocosRobot/update_lua_bindings_1438273529
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-31 00:32:40 +08:00 |
CocosRobot
|
c0d6ec1946
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 16:30:01 +00:00 |
pandamicro
|
4c206a4c6e
|
Merge pull request #13127 from CocosRobot/update_cocosfiles_1438273426
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-31 00:27:20 +08:00 |
CocosRobot
|
9b969598bf
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-30 16:23:47 +00:00 |
pandamicro
|
34724e41b2
|
Merge pull request #13092 from pandamicro/audioengine
Add AudioEngine js bindings
|
2015-07-31 00:22:04 +08:00 |
pandamicro
|
3fa016a280
|
Fix win32 project and add winrt support
|
2015-07-30 23:39:52 +08:00 |
takaken1994
|
93c47390c8
|
Fix : remove using namespace cocos2d from header file
|
2015-07-31 00:02:57 +09:00 |
pandamicro
|
537927c34b
|
Tiny improvement for bindings generator
|
2015-07-30 20:52:21 +08:00 |
pandamicro
|
3524af1ad6
|
Merge pull request #13059 from geron-cn/3.7.1
fix bug: BoneNode 's debugdraw can not be controlled by ancestor's vi…
|
2015-07-30 20:31:34 +08:00 |
pandamicro
|
253d9c4d31
|
Merge pull request #13122 from CocosRobot/update_lua_bindings_1438253104
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 20:26:54 +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
|
cf806913e3
|
Auto bind public members of AudioProfil
|
2015-07-30 20:19:53 +08:00 |
geron-cn
|
0955b0f9de
|
fix comment by pandamicro
|
2015-07-30 19:28:00 +08:00 |
CocosRobot
|
56b58a5839
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 10:50:00 +00:00 |
pandamicro
|
104bd3bbfc
|
Merge pull request #13113 from CocosRobot/update_lua_bindings_1438250510
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 18:46:37 +08:00 |
pandamicro
|
2aca86d646
|
Merge pull request #13121 from CocosRobot/update_cocosfiles_1438253022
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-30 18:46:05 +08:00 |
pandamicro
|
5aa8647309
|
Merge pull request #13117 from CocosRobot/update_lua_bindings_1438251761
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 18:45:15 +08:00 |
pandamicro
|
e1566194dd
|
Merge pull request #13115 from CocosRobot/update_cocosfiles_1438251666
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-30 18:44:51 +08:00 |
CocosRobot
|
e75f15ebb1
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-07-30 10:43:43 +00:00 |
pandamicro
|
8542f8a7a9
|
Merge pull request #13067 from pandamicro/scrollviewbar
Bind UIScrollViewBar
|
2015-07-30 18:42:08 +08:00 |
pandamicro
|
f3f05a2518
|
Merge pull request #13118 from natural-law/v3
[ci skip] Support generate prebuilt libs of engine with debug mode.
|
2015-07-30 18:32:59 +08:00 |
CocosRobot
|
b167d29a80
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-07-30 10:27:28 +00:00 |
zhangbin
|
77b3facd7c
|
Support generate prebuilt libs of engine with debug mode.
|
2015-07-30 18:27:20 +08:00 |
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 |