yangxiao
|
8a6c49b5a3
|
merge cocos
|
2015-08-03 09:54:29 +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
|
00a3d572d1
|
Merge pull request #12899 from super626/v3
Animate3D Callback and Bug fix
|
2015-08-01 18:24:05 +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 |
fusijie
|
dcef1e9d31
|
fix polygon sprite setflipped bug.
|
2015-07-31 15:49:44 +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
|
ede9195d14
|
Merge pull request #13073 from super626/fixtest
Bug Fix
|
2015-07-31 09:58:14 +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
|
c0066f9afd
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
|
2015-07-30 20:25:57 +08:00 |
pandamicro
|
9b5c8d5d12
|
Merge pull request #12601 from super626/physics3d
3d physics collider
|
2015-07-30 18:19:23 +08:00 |
pandamicro
|
8d8c7fe14b
|
Complete AudioEngineTest
|
2015-07-30 17:14:08 +08:00 |
pandamicro
|
39721c6eb6
|
Merge pull request #13105 from fusijie/fix_10487
fix Sprite/Label/FastTMX auto-culling bug.
|
2015-07-30 17:12:37 +08:00 |
fusijie
|
17c7848e62
|
fix FastTiledMap auto-culling bug.
|
2015-07-30 15:07:03 +08:00 |
fusijie
|
f91a58c8ff
|
fix Label auto-culling bug.
|
2015-07-30 13:59:50 +08:00 |
子龙山人
|
6818a97311
|
Merge pull request #13104 from fusijie/fix_cpptests_androidstudio_compile
[ci skip]fix android studio compile error.
|
2015-07-30 11:59:05 +08:00 |
fusijie
|
d2181e137e
|
fix android studio compile error.
|
2015-07-30 11:55:33 +08:00 |
子龙山人
|
c039c7a9bd
|
Merge pull request #13084 from WenhaiLin/v3.8-label-df-contentsize-fix
Fixed the content size of Label is incorrect with GLOW effect.
|
2015-07-30 11:29:48 +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
|
07fdea50de
|
Refine C++ test case
|
2015-07-29 20:47:38 +08:00 |
Vincent Yang
|
e1d4d22353
|
Fixed #12692 : UILayout viewing area cutting position calculation error
|
2015-07-29 18:43:11 +08:00 |
WenhaiLin
|
a9f27865d3
|
Fixed the content size of Label is incorrect with GLOW effect.
|
2015-07-29 16:30:07 +08:00 |
tangziwen
|
cee43ccebb
|
update terrain again
|
2015-07-29 14:32:36 +08:00 |
yangxiao
|
ad80c11235
|
sync render state
|
2015-07-29 10:35:37 +08:00 |
geron-cn
|
7e05538521
|
ADD SKELETON NEST TEST CASE
|
2015-07-29 10:23:03 +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 |
geron-cn
|
d2de5b1c85
|
add test case for bug: #13060 and #13005
|
2015-07-28 19:18:58 +08:00 |
pandamicro
|
66b21fb2a8
|
Merge pull request #12972 from yangws/issue_12145
Fixed #12145 : formarRenderers in RichText doesn’t update container s…
|
2015-07-28 17:13:26 +08:00 |
XiaoFeng
|
bca6934786
|
Normalization function names
|
2015-07-28 14:05:56 +08:00 |
Vincent Yang
|
b92733c402
|
Add items as protected children.
|
2015-07-28 11:38:21 +08:00 |
子龙山人
|
3a58668d71
|
Merge pull request #12744 from fusijie/fix_pageturndown
Fix PageTurn3D
|
2015-07-28 11:35:15 +08:00 |
pandamicro
|
3cc039b063
|
Merge pull request #13036 from fusijie/fix_12505
fix shader-basic testcase 'center' uniform error.
|
2015-07-27 15:40:44 +08:00 |
fusijie
|
f8de67a0c4
|
fix shader-basic testcase 'center' uniform error.
|
2015-07-27 14:18:17 +08:00 |
子龙山人
|
7f383f961a
|
Merge pull request #13026 from fusijie/fix_13025
fix 13025 wild pointer.
|
2015-07-27 13:38:38 +08:00 |
XiaoFeng
|
f410fcd737
|
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
|
2015-07-27 11:55:18 +08:00 |
子龙山人
|
bd0bdae530
|
Merge pull request #12993 from WenhaiLin/v3.8-label-layout-refine
Label:refine the implementation about text layout and support debug draw.
|
2015-07-27 11:10:31 +08:00 |
fusijie
|
f2f425d19c
|
fix 13025 wild pointer.
|
2015-07-27 10:39:31 +08:00 |
pandamicro
|
7ae3dd12a1
|
Merge pull request #12995 from fusijie/fix_12505
fix blur shader compliant on win8 universal.
|
2015-07-25 12:42:35 +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 |
WenhaiLin
|
a1e682ca65
|
Improves the test to reproduce issue 12996
|
2015-07-24 21:34:59 +08:00 |
fusijie
|
647848e843
|
fix blur sprite shader on win8 universal.
|
2015-07-24 21:04:44 +08:00 |
pandamicro
|
05bb775438
|
Sync timelineParser and fix issue
|
2015-07-24 20:16:56 +08:00 |
VisualSj
|
64d247d91b
|
Issue #12997: Add JS test case (ccs.BoneNode)
|
2015-07-24 15:45:19 +08:00 |
fusijie
|
bd0a57242b
|
refine blur shader test case.
|
2015-07-24 13:52:40 +08:00 |
fusijie
|
d550dace35
|
fix blur shader compliant on win8 universal.
|
2015-07-24 12:47:38 +08:00 |
geron-cn
|
0b09fd5bcb
|
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
|
2015-07-24 11:38:09 +08:00 |
Vincent Yang
|
e4a8aeee45
|
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-24 11:16:45 +08:00 |
Dale Stammen
|
6669fec648
|
added missing bug test
|
2015-07-23 12:34:37 -07:00 |