XiaoYang
395f4f2f96
Merge pull request #362 from tangziwen/v3
...
terrain Update
2015-08-03 09:16:43 +08:00
pandamicro
b034268331
Merge pull request #13159 from CocosRobot/update_lua_bindings_1438560493
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 09:16:41 +08:00
CocosRobot
c281630fa6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 00:13:29 +00:00
pandamicro
7d14768109
Merge pull request #13157 from pandamicro/v3
...
Sync Cocos2d-x v3.7.1
2015-08-03 08:04:30 +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
pandamicro
8ce8f8616e
Merge pull request #13154 from CocosRobot/update_lua_bindings_1438435111
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-02 09:26:15 +08:00
pandamicro
6cdde3e434
Merge pull request #13153 from CocosRobot/update_lua_bindings_1438424818
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-02 09:25:47 +08:00
andyque
63822566d2
refactor PageView implementation
2015-08-01 23:33:25 +08:00
CocosRobot
29208156d9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-01 13:23:21 +00:00
pandamicro
46bb4f8aae
Merge pull request #13149 from jianglong0156/constructedWith3D_3#12404
...
Constructed with3d
2015-08-01 21:15:08 +08:00
CocosRobot
5dbdfa89c6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-01 10:31:20 +00:00
jianglong0156
09c3da3247
skip init funciton in lua physics3d.ini
2015-08-01 18:30:06 +08:00
jianglong0156
5d281d45ef
recover the physics3DShape initHeightfield api
2015-08-01 18:29:48 +08:00
pandamicro
00a3d572d1
Merge pull request #12899 from super626/v3
...
Animate3D Callback and Bug fix
2015-08-01 18:24:05 +08:00
andyque
5f34c1f072
add PageView vertical scroll support
2015-08-01 18:18:46 +08:00
pandamicro
5f9469ac7b
Merge pull request #12239 from pandamicro/PhysicsSpriteFix
...
Fix transform issue of PhysicsSprite itself and its children
2015-08-01 18:08:57 +08:00
HuaYang Huang
abbf7eabfc
Update AppController.h
2015-08-01 17:49:12 +08:00
pandamicro
81f77b0010
Improve sync transform logic using custom listener
2015-08-01 16:50:16 +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
0ca48a32f5
Merge pull request #13110 from WenhaiLin/v3.8-label-cropped-fix
...
Label:Fixed the edge of character may be cropped.
2015-08-01 15:36:47 +08:00
pandamicro
f995ed8634
Merge pull request #13079 from zilongshanren/v3.7.1
...
fix Mac system font crash issue
2015-08-01 15:27:36 +08:00
pandamicro
c39186aaef
Merge pull request #13145 from CocosRobot/update_lua_bindings_1438395130
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-01 14:59:14 +08:00
CocosRobot
90d578c6e5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-01 02:16:33 +00:00
pandamicro
d52a5da1d8
Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404
...
Constructed with3d
2015-08-01 10:09:08 +08:00
pandamicro
93c40d01c5
Merge pull request #13144 from WenhaiLin/v3.8-gradle-update
...
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
2015-08-01 09:59:54 +08:00
pandamicro
3bdc7e4e1e
Merge pull request #13138 from fusijie/fix_spritepolygon_setflip
...
fix polygon sprite setFlipped bug.
2015-08-01 09:59:25 +08:00
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