Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
33,388 Commits 3 Branches 31 Tags 1.1 GiB
Commit Graph

4364 Commits

Author SHA1 Message Date
Huabing.Xu b7c624805e fix material parsing crash on WP8.1 because memory exhausted 2015-08-10 15:51:26 +08:00
jianglong0156 9a46b3b3b1 fix js-tests can't use cocos run -p web -m release 2015-08-10 15:10:54 +08:00
pandamicro 940b53e271 Merge pull request #13292 from natural-law/v3 
[ci skip] Add copy resources config of js-tests for web platform.
 2015-08-10 15:09:33 +08:00
Huabing.Xu 0dee83b154 fix shader test crash 2015-08-10 14:40:54 +08:00
zhangbin f91908d651 Add copy resources config of js-tests for web platform. 2015-08-10 12:00:53 +08:00
pandamicro acc5754f5e Merge pull request #13269 from WenhaiLin/v3.8-audioengine-addtestcase 
Add test case for issue 11143.
 2015-08-10 11:39:53 +08:00
子龙山人 f6569f24f4 Merge pull request #13273 from zilongshanren/android-editbox-reimplement-fix 
Re-implement Editbox on Android platform.
 2015-08-09 10:25:19 +08:00
pandamicro e825160750 Merge pull request #13266 from super626/fixtest 
Fix Sprite3D test background to foreground bug
 2015-08-08 19:44:41 +08:00
pandamicro 395b6cb91f Merge pull request #13263 from super626/v3 
avoid to trigger touch event multiple times
 2015-08-08 17:58:41 +08:00
pandamicro 6644b06643 Merge pull request #13271 from WenhaiLin/v3.8-minorproblem-fix 
Fixed minor problems in test cases.
 2015-08-08 12:04:30 +08:00
肖峰 4575587cf7 Fix cocostudio 3d test crash on mobile platform 2015-08-08 11:57:40 +08:00
geron-cn 744fd74b3b make skeleton's debugdraw contorls all subbone's debug draw 2015-08-08 00:39:01 +08:00
WenhaiLin 772dab2002 Fixed minor problems in test cases. 2015-08-07 23:08:49 +08:00
pandamicro 7f215e97ff Merge pull request #13275 from jianglong0156/fixWebinitError 
[ci skip]fix error tips in web
 2015-08-07 20:26:39 +08:00
pandamicro 4fe7c6de2a Revert "remove unused code" 2015-08-07 20:21:24 +08:00
pandamicro 5293dcb5bb Merge pull request #13274 from super626/animate3d 
remove unused code
 2015-08-07 20:05:14 +08:00
jianglong0156 99a52a34cb fix error tips in web 2015-08-07 18:29:45 +08:00
yangxiao d74245bfa9 remove unused code 2015-08-07 18:03:50 +08:00
Vincent Yang 354f64ec51 fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app will no response. 2015-08-07 17:36:35 +08:00
andyque a35e89225e Re-implement Editbox on Android platform. 
This PR also fixed issue:

https://github.com/cocos2d/cocos2d-x/issues/9572

For the new EditBox:

1. Added a ResizeLayout for updating layout when soft keyboard is shown.
This is because some Android devices won't refresh the view and when
the view is panned, the native EditText will turn black. This is really
a hack, but it works for many Android devices from 2.3 to 5.0.

When keyboard is beginning to show, the ResizeLayout's doLayout
method will be called 24 frames per second. Once the keyboard is closed,
or the user begins to input, the doLayout method will be disabled.

2. EditText is working in a different UI thread, so all the data
are passed to GL thread via callbacks in UI thead.

3. It also overrides onKeyDown method in Cocos2dxEditBox.
When the EditText got the focus, users could press back key to exit
the game. This behavior is not allowed. We give developer the choice to
handle back key event manually.
 2015-08-07 17:27:15 +08:00
WenhaiLin 5c33f2f6ed Add test case for issue 11143. 2015-08-07 16:50:54 +08:00
yangxiao 544c96385a fix background to foreground 2015-08-07 16:16:43 +08:00
yangxiao d744554a4b avoid to trigger touch event multiple times 2015-08-07 15:09:01 +08:00
pandamicro c794523613 Merge pull request #13260 from ZhangMenghe/v3-tileMap 
TileMap Testcase abnormal
 2015-08-07 11:52:28 +08:00
ZhangMenghe 7753a07359 TileMap Testcase abnormal 2015-08-07 11:20:17 +08:00
子龙山人 782c9588a4 Merge pull request #13253 from zilongshanren/fix-touch-intercept-issue 
Fix improper touch intercept event propagation.
 2015-08-07 10:28:51 +08:00
pandamicro d182c37f29 Merge pull request #13257 from ZhangMenghe/v3-UItestcase 
UIScene testcase modification
 2015-08-07 09:47:42 +08:00
ZhangMenghe 0ddd4e4a5b UIScene testcase modification 2015-08-07 09:30:22 +08:00
andyque 211dde38e9 Fix improper touch intercept event propagation. 
When the container widget is disabled, it shouldn't intercept touch.

https://github.com/cocos2d/cocos2d-x/issues/8316
 2015-08-06 22:50:53 +08:00
VisualSj ca82f41c1b Add loader tests 2015-08-06 19:03:26 +08:00
pandamicro 7a758bb961 Merge pull request #13243 from jianglong0156/fixExitButton 
[ci skip]fix the close button function in main list frame
 2015-08-06 17:33:47 +08:00
pandamicro ad4c349800 Merge pull request #13245 from ZhangMenghe/v3-1586bugfix 
Fix offset on retina screen in shaderTest
 2015-08-06 17:27:47 +08:00
ZhangMenghe 91ae9e07b6 Fix offset on retina screen in shaderTest 2015-08-06 15:14:13 +08:00
子龙山人 a0a34deb78 Merge pull request #13242 from WenhaiLin/v3.8-cpptests-freeze 
CppTests: Avoid freeze when the program crashed on Android.
 2015-08-06 15:03:30 +08:00
jianglong0156 482b8f3583 fix the close button function in main list frame 2015-08-06 14:14:52 +08:00
WenhaiLin ffda8ace82 CppTests: Avoid freeze when the program crashed on Android. 2015-08-06 13:50:15 +08:00
子龙山人 41afa9695c Merge pull request #13230 from WenhaiLin/v3.8-label-space-lost 
Spaces should not be lost if label created with Fingerpop.ttf
 2015-08-06 11:01:35 +08:00
WenhaiLin e81d5af12d Spaces should not be lost if label created with Fingerpop.ttf 2015-08-05 23:46:41 +08:00
pandamicro 6831e24deb Merge pull request #13198 from ZhangMenghe/v3-UItestcase 
[ci skip]Modify UItestcase structure
 2015-08-05 19:06:11 +08:00
子龙山人 05e88ad279 Merge pull request #13211 from fusijie/v3 
[ci skip]fixed title.
 2015-08-05 16:59:37 +08:00
子龙山人 5aaf9aa1ef Merge pull request #13210 from WenhaiLin/v3.8-FontAtlasCache-crash-fix 
Fixed FontAtlasCache::purgeCachedData might cause crash.
 2015-08-05 16:57:57 +08:00
pandamicro 5faf7a9d76 Merge pull request #13209 from ZhangMenghe/v3-textfield 
[ci skip]textField cc.vertext to cc.p
 2015-08-05 15:48:16 +08:00
fusijie 6072cf9a9d [ci skip]fixed title. 2015-08-05 15:47:59 +08:00
WenhaiLin 2c220092e6 Fixed FontAtlasCache::purgeCachedData might cause crash. 2015-08-05 14:12:02 +08:00
ZhangMenghe 88cb3ab711 textField cc.vertext to cc.p 2015-08-05 11:59:36 +08:00
pandamicro 8cdcade07a Merge pull request #13186 from jianglong0156/addEmotionTest 
fix getStringUTFChars bug
 2015-08-05 10:19:19 +08:00
ZhangMenghe f01f21d06f Modify UItestcase structure 2015-08-04 17:13:17 +08:00
jianglong0156 ee7e7d237f improve the test case 2015-08-04 11:40:10 +08:00
jianglong0156 36e8e9740a improve the test case 2015-08-04 11:30:55 +08:00
pandamicro 8d836dade6 Merge pull request #13181 from pandamicro/v3 
Sync Cocos2d-x v3.7.1
 2015-08-03 22:12:05 +08:00
pandamicro 25cb0d2896 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	web
 2015-08-03 19:47:56 +08:00
pandamicro 6d3a00ad67 Merge pull request #13173 from geron-cn/3.7.1 
fix bug: crash when use bone after erase it form Vector.
 2015-08-03 19:45:54 +08:00
pandamicro 6a2440d6f1 Merge pull request #13176 from VisualSJ/v3-boneTest 
[ci skip][js-tests] add Change skin tests
 2015-08-03 18:13:08 +08:00
VisualSj 479676cbd8 [js-tests] add Change skin tests 2015-08-03 18:10:31 +08:00
pandamicro 4b7b85f113 Merge pull request #12889 from fusijie/fix_clippingRectangle_bug 
remove CCClippingRectangleNode transform error support.
 2015-08-03 18:01:01 +08:00
geron-cn d00e54ad8a remove comment in test case 2015-08-03 16:55:55 +08:00
pandamicro 80a207ae43 Merge pull request #13172 from jianglong0156/addEmotionTest 
add emotion bug test current nothing will show
 2015-08-03 16:36:47 +08:00
jianglong0156 f9b6d6b670 add emotion bug test 2015-08-03 16:09:45 +08:00
pandamicro b13fddb18e Merge pull request #13162 from super626/v3 
Terrain: Add light map support
 2015-08-03 15:37:42 +08:00
yangxiao 0de2a3b33d add terrain test with light map 2015-08-03 14:02: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
pandamicro 9393daaf8f Add test for PhysicsSprite bug#11618 2015-08-03 11:07:27 +08:00
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 46bb4f8aae Merge pull request #13149 from jianglong0156/constructedWith3D_3#12404 
Constructed with3d
 2015-08-01 21:15:08 +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
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
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
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 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 3fa016a280 Fix win32 project and add winrt support 2015-07-30 23:39:52 +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 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
jianglong0156 113233b8df add Camera support constructor 2015-07-30 18:00:51 +08:00
jianglong0156 b016b642ce add Terrain support constructor 2015-07-30 17:17:57 +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
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
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 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 347854e8d3 Add Audio Control test case 2015-07-29 20:48:11 +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
dualface ea594b92b4 add ActionTime lua test 2015-07-29 17:50:50 +08:00
dualface 184225519e add ActionTime lua test 2015-07-29 17:36:54 +08:00
zhangbin e30d84bca0 Solve the error in .cocos-project.json of js-tests. 2015-07-29 17:10:19 +08:00
pandamicro 36b7ba5b75 Merge pull request #13081 from natural-law/v3 
Remove unused config in android project of js-tests.
 2015-07-29 17:00:26 +08:00
WenhaiLin a9f27865d3 Fixed the content size of Label is incorrect with GLOW effect. 2015-07-29 16:30:07 +08:00
pandamicro 16b03f0ebe Merge pull request #13065 from pandamicro/widget_onEnter 
Ensure C++ classes onEnter, onExit can be safely override in JS
 2015-07-29 15:36:12 +08:00
zhangbin 6fe880bee5 Remove unused config in android project of js-tests. 2015-07-29 15:35:59 +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 cc63ff5c03 Fix indent 2015-07-28 18:37:57 +08:00
pandamicro 8e883f9956 Merge pull request #13049 from jianglong0156/constructedWith3D#12404 
Some 3d classes can't be constructed with new in JS
 2015-07-28 18:31:04 +08:00
pandamicro 6c16a4b990 Add test cases for extended classes in JSB 2015-07-28 18:25:11 +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
jianglong0156 d5a6522a37 Merge branch 'v3' into constructedWith3D#12404 2015-07-28 09:59:35 +08:00
pandamicro b9968a9dca Merge pull request #13038 from ZhangMenghe/shaderTestCase 
Fix OpenGL testcase 'center' uniform error
 2015-07-28 09:34:09 +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
Zhang Menghe a96ea2342a Update OpenGLTest.js 2015-07-27 15:53:48 +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
ZhangMenghe 232f738bf7 Fix OpenGL testcase 'center' uniform error 2015-07-27 15:08:07 +08:00
jianglong0156 1be5981d6a add Physics3DComponent support new 2015-07-27 14:26:50 +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
jianglong0156 d51f0b1f05 add animate support new 2015-07-27 10:51:53 +08:00
fusijie f2f425d19c fix 13025 wild pointer. 2015-07-27 10:39:31 +08:00
jianglong0156 e25c4f88ae add animation3d support new to create 2015-07-27 10:31:35 +08:00
pandamicro c16cab7e53 Merge pull request #13015 from VisualSJ/v3.7.1-12940 
[ci skip] Moveing ActionTimeline tests
 2015-07-25 14:44:10 +08:00
VisualSj a0bf2c782f Moveing ActionTimeline tests 2015-07-25 14:37:56 +08:00
VisualSj c49053fce4 Moveing ActionTimeline tests 2015-07-25 14:37:44 +08:00
pandamicro 9615545e11 Merge pull request #12890 from jianglong0156/FileUtilsJSB 
[ci skip]add fileUtils writeString,writeValueMap,writeValueVector in jsb
 2015-07-25 14:16:14 +08:00
jianglong0156 c14ca98203 set file name to label.change the file dir 2015-07-25 14:04:41 +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 09550ff742 Issue #12997: Add JS test case (ccs.BoneNode) 2015-07-24 15:57:36 +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
pandamicro 5f57fa942f Merge pull request #12802 from ZhangMenghe/pageTurnDown 
Page turn down
 2015-07-23 18:10:53 +08:00
Vincent Yang 35040e7bb1 Fixed #12249 : Button touch doesn't work with setScale9Enabled. 2015-07-23 17:27:04 +08:00
zhangcheng 012053e163 replace space to tab. 2015-07-23 17:04:08 +08:00
zhangcheng 4b8248c015 Optimization of Custom Data. 
replace ComExtensionData to ObjectExtensionData.
 2015-07-23 16:30:23 +08:00
geron-cn 7255b5308b config for mac 2015-07-23 15:13:14 +08:00
geron-cn d46c8c6802 add lack file 2015-07-23 15:12:09 +08:00
geron-cn 915cefa208 bone node 2015-07-23 11:51:49 +08:00
Ricardo Quesada b2b9bad83d improves the test to reproduce bug 12847 2015-07-22 15:08:36 -07:00
pandamicro 6029ca3edd Merge pull request #12949 from yangws/issue_12906 
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
 2015-07-22 16:17:14 +08:00
Liam 99c1c33c61 update resource 2015-07-22 15:56:35 +08:00
pandamicro 741163db40 Merge pull request #12938 from WenhaiLin/v3.8-deps70 
Update deps for support FullType.
 2015-07-22 15:42:13 +08:00
pandamicro e0e5ae9d99 Merge pull request #12924 from liamcindy/SkyBox_3.7.1 
update for Game3DNodeReader & UserCameraReader
 2015-07-22 15:34:18 +08:00
子龙山人 bb9500769f Merge pull request #12885 from zilongshanren/add-jumpToPage-api 
Fix PageView scrollToPage bug and the curPageIndex bug
 2015-07-22 15:01:57 +08:00
pandamicro dbaf00bca6 Merge pull request #12950 from fusijie/add_texturecoord_bug_test 
add sprite frame flash line bug test case.
 2015-07-22 14:32:26 +08:00
fusijie 92e68cd9dc add sprite frame flash line bug test case. 2015-07-22 13:42:10 +08:00
Vincent Yang 3addf38134 Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. 2015-07-22 12:01:34 +08:00
ZhangMenghe b6c566d87e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into setClearColor 2015-07-22 11:40:30 +08:00
子龙山人 8a8a089ad6 Merge pull request #12947 from zilongshanren/updateCcs-res-submodule 
[ci skip]update ccs-res submodule
 2015-07-22 10:46:02 +08:00
pandamicro f0962669a9 Merge pull request #12946 from pandamicro/v3 
[ci skip] Gen bindings for v3.7.1 branch
 2015-07-22 10:45:23 +08:00
andyque fbfb3a9dac update ccs-res submodule 2015-07-22 10:45:18 +08:00
pandamicro c260783fd0 [JS] Revert const to var to avoid issues on web compilation 2015-07-21 18:23:57 +08:00
WenhaiLin 979a9be1f5 Add test case for test font supported by FullType. 2015-07-21 17:09:27 +08:00
ZhangMenghe 2e72179b91 Remove a space 2015-07-21 15:22:03 +08:00
ZhangMenghe 94aa382669 Add testCase for setClearColor 2015-07-21 15:18:19 +08:00
ZhangMenghe 61e36463cc Modify a space 2015-07-21 14:00:59 +08:00
ZhangMenghe 3c2d68e25c Modify the testcase with coding standards 2015-07-21 13:48:08 +08:00
pandamicro d478c5f8a8 Merge pull request #12923 from ZhangMenghe/ModifytestCase 
Modify testCase for UITextFieldTest
 2015-07-21 12:53:26 +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
pandamicro 641ff2abf4 Merge pull request #12914 from WenhaiLin/v3.8-label-bmfont-opacity 
Label:Fixed opacity setting is invalid with bitmap font.
 2015-07-20 18:02:49 +08:00
ZhangMenghe 14c1862f7e Modify testCase for UITextFieldTest 2015-07-20 18:01:41 +08:00
WenhaiLin 63326c2826 Label:Fixed opacity setting is invalid with bitmap font. 2015-07-20 11:10:17 +08:00
yangxiao beda48124c merge cocos 2015-07-17 17:54:00 +08:00
yangxiao ef49e5a169 merge cocos 2015-07-17 17:43:32 +08:00
子龙山人 22ef262295 Merge pull request #12894 from zilongshanren/fixXcode5Warning 
fix xcode 5.1.1 warnings
 2015-07-17 17:33:13 +08:00
子龙山人 309b563c5b Merge pull request #12896 from yangws/v3 
[ci skip] Fix bug: the Back button in Node: UI->UIEditBoxTests click area has p…
 2015-07-17 15:57:19 +08:00
Vincent Yang f9e90f31f6 Fix bug: the Back button in Node: UI->UIEditBoxTests click area has positoin offset. 2015-07-17 15:52:58 +08:00
andyque 8c31d70211 fix xcode 5.1.1 warnings 2015-07-17 15:20:49 +08:00
jianglong0156 7f0167785d add back label 2015-07-17 13:46:00 +08:00
jianglong0156 c844a77786 add fileUtils writeString,writeValueMap,writeValueVector 2015-07-17 12:04:47 +08:00
fusijie d828c030cb remove CCClippingRectangleNode transform error support. 2015-07-17 11:56:23 +08:00
子龙山人 89e5307f0c Merge pull request #12867 from WenhaiLin/v3.8-label-letter-color 
Label:Fixed the color of letter will be overridden by fade action.
 2015-07-17 11:29:58 +08:00
yangxiao bf20145e35 animate3d callback and test 2015-07-17 11:08:27 +08:00
WenhaiLin a6f8031af9 Label:support font that contains GB2312 char map.[except android] 2015-07-16 17:10:05 +08:00
andyque 96f6c44281 fix auto scrolling and curPageIdx issue 2015-07-16 16:50:47 +08:00
WenhaiLin d5d5af5ac3 change ‘auto’ to ‘auto&&’ 2015-07-16 14:08:59 +08:00
子龙山人 40f4e0b27b Merge pull request #12864 from zilongshanren/add-jumpToPage-api 
add setCurPageIndex API to PageView.
 2015-07-16 13:56:05 +08:00
andyque 517221a0df add jumpToPage API to PageView. 
1. This commit also fix the default font size issue in ui::Button.
 2015-07-16 11:33:57 +08:00
WenhaiLin 1c9a181c35 Label:Fixed the color of letter will be overridden by fade action. 2015-07-15 20:17:05 +08:00
songchengjiang 282dc23bb2 modify interfaces of Animate3DCallback 2015-07-15 17:34:14 +08:00
pandamicro bcd20b1bf0 Merge pull request #12861 from pandamicro/v3 
Sync Cocos2d-x v3.7 RC1
 2015-07-15 17:16:44 +08:00
pandamicro 99e504e668 Merge pull request #12854 from yangws/issue_11310 
fixed #11310 : multiple camera case utils::captureScreen bug.
 2015-07-15 15:00:29 +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
andyque 2f31f6baa6 fixed Scale9Sprite gray state issue. 
When call `setCapInsets`, the Scale9Sprite's inner sprite will be
rebuild and it's state will be lose.

This commit reset the shader state.
 2015-07-15 14:35:13 +08:00
Vincent Yang 7a105ce1e1 fixed #11310 : multiple camera case utils::captureScreen bug. 2015-07-15 12:09:08 +08:00
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
songchengjiang 6c83e8d81c Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
 2015-07-15 11:13:27 +08:00
pandamicro efffea5b91 Fixed #12834 Invoke cleanup function when override in JS 2015-07-14 15:35:29 +08:00
andyque 91dfb07a8c add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
andyque ef5d4ddf86 Merge remote-tracking branch 'upstream/v3' into v3 
# Conflicts:
#	tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
 2015-07-14 11:24:38 +08:00
Vincent Yang 0589c14302 Restructure CCFileUtils class, move platform related functions to CCFileUtilsXXX. 
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
 2015-07-14 09:44:36 +08:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
Vincent Yang 74227eaf16 Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test. 2015-07-13 22:44:40 +08:00
子龙山人 cdc7e5205b Merge pull request #11995 from MAUSMAUSgames/v3 
using Action::_tag as flag field
 2015-07-13 22:19:03 +08:00
子龙山人 c151ba89e5 Merge pull request #12774 from WenhaiLin/v3-label-createfail 
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
 2015-07-13 21:58:39 +08:00
子龙山人 db71e073dd Merge pull request #12742 from WenhaiLin/v3-audioengine-preload 
AudioEngine:support preload for audio
 2015-07-13 17:06:17 +08:00
Vincent Yang e65b01bdc0 Merge pr11866: FileUtilsWin32 correct use all unicode version winapi. 2015-07-13 17:06:01 +08:00
WenhaiLin adfa6d4f0d Add test case for issue 12775 2015-07-13 15:38:33 +08:00
ZhangMenghe aca7914d86 Modify testcase for page Turndown 2015-07-13 13:44:58 +08:00
ZhangMenghe 3396da508f pageTurnDown in WebGL testCase 2015-07-13 12:45:07 +08:00
songchengjiang 5a16748273 optimize Animate3DCallback 
add Animate3DCallbackTest
 2015-07-13 11:43:13 +08:00
WenhaiLin 80dff7f1c4 Rollback pr12299 2015-07-13 11:32:25 +08:00
pandamicro c167e249cd Merge pull request #12790 from pandamicro/shaderNormal 
Use shader with normal while creating mesh with normals
 2015-07-12 21:47:05 +08:00
pandamicro 600568fdba Migrate test case from #10692 @babcca 2015-07-12 11:33:22 +08:00
WenhaiLin 5c9e8848bf [ci skip]Add missing configuration for Nibiru. 2015-07-10 21:16:21 +08:00
WenhaiLin 205e77a4fb Add missing configuration for Nibiru. 2015-07-10 21:09:15 +08:00
WenhaiLin 7f3e0b2a8c [ci skip]Replace tab with spaces. 2015-07-10 20:56:21 +08:00
WenhaiLin c68469a611 Update Nibiru SDK. 2015-07-10 20:42:05 +08:00
Liam 4a53afc798 update for error resource,just for build 2015-07-10 17:24:35 +08:00
songchengjiang 21a8a8d567 fix mirrored Effect3DOutline 2015-07-10 16:30:45 +08:00
pandamicro c30ce38cb5 Merge pull request #12766 from super626/v3.7-release 
Set default 3d animation quality to low
 2015-07-10 15:35:22 +08:00
pandamicro 2d27091398 Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge 
add write api in FileUtils
 2015-07-10 15:13:21 +08:00
songchengjiang a1956e2210 fix issue#9310 issue#10151 issue#12551 2015-07-09 18:05:47 +08:00
yangxiao 10fe728eee animation quality default to low, do not interpolation 2015-07-09 17:54:21 +08:00
Liam e50fc4f184 merge code 2015-07-09 17:12:48 +08:00
WenhaiLin 41bc3a1900 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8 
Conflicts:
	AUTHORS
 2015-07-09 11:11:34 +08:00
Liam c6ebaa19ec add scene 3d test 2015-07-09 10:19:07 +08:00
Jacky 02597eb369 Completed test case and comment. 2015-07-08 22:34:33 +08:00
Jacky 34d1cc0b1d refactory Effects test case. 2015-07-08 21:56:14 +08:00
Jacky 4a9e9f3744 completed api. 2015-07-08 17:26:29 +08:00
子龙山人 155ac8c07e Merge pull request #11583 from hannon235/v3-update-sio 
Updates socket.io network extension to correctly detect and manage connection to socket.io server versions 0.9.x - 1.x
 2015-07-08 16:11:05 +08:00
Jacky 260ce177d7 refine GridNode with rect. 2015-07-08 15:57:27 +08:00
WenhaiLin b395ef06d8 AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1] 2015-07-08 10:48:20 +08:00
XiaoFeng 8429cc1d90 Update CCDrawNode bug test 2015-07-08 09:35:29 +08:00
XiaoFeng 707b4d8b90 Fix windows universal project file 2015-07-07 19:44:18 +08:00
WenhaiLin 581f1ab42b Add test case 2015-07-07 15:41:54 +08:00
jianglong0156 abee4a376a add write api in FileUtils 
bool writeStringToFile(std::string dataStr, const std::string& fullPath);
bool writeDataToFile(Data retData, const std::string& fullPath);
bool writeValueMapToFile(ValueMap& dict, const std::string& fullPath);
bool writeValueVectorToFile(ValueVector vecData, const std::string& fullPath);
and
formate the FileUtils code
 2015-07-07 14:06:59 +08:00
子龙山人 f28fbdd0c4 Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view 
Add scroll bar feature into ScrollView
 2015-07-07 13:56:09 +08:00
肖峰 37674c3689 Add bug test to Mac & iOS cpp-test project 2015-07-07 11:17:08 +08:00
XiaoFeng a9dfd8012c Add new bug test to Android, Win 10, Win Universal, Linux project file 2015-07-07 11:02:00 +08:00
XiaoFeng 9a6ffd8904 Add bug test for PageView layout & CCNodeDraw::onDrawGLLine 2015-07-07 09:54:42 +08:00
jianglong0156 6f3b977c1e add UserDefault api deleteValueForKey 2015-07-06 17:01:17 +08:00
Neo Kim 3ab4285960 Refactor code 2015-07-04 16:06:05 +09:00
Neo Kim ceeca575f3 Replace 'margin' of scroll bar with 'positionFromCorner' 2015-07-04 14:05:47 +09:00
Neo Kim 60c32f6fb5 Refactor some codes 2015-07-04 09:56:53 +09:00
Neo Kim c093bb18e2 Add scroll bar manipulation methods into ScrollView 2015-07-04 09:56:52 +09:00
Neo Kim 2cae17b462 Add scroll bar feature into ScrollView 2015-07-04 09:56:52 +09:00
pandamicro 99bad19cff Merge pull request #12660 from pandamicro/merge-v3.7 
Merge v3.7-release
 2015-07-03 11:08:50 +08:00
pandamicro 48c99d2ac4 Merge pull request #12635 from yangws/v3_scene3dtest 
Fix bug: spine animition can't show in Scene3DTest.
 2015-07-03 11:04:23 +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
子龙山人 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
pandamicro d155d42c0e Merge pull request #12617 from yangws/issue_8194 
Fixbug :EventDispatcher wrong dispatch order
 2015-07-02 14:42:30 +08:00
Neo Kim 6550a9ccc2 Replace all tabs to 4 spaces to comply with the convention 2015-07-02 11:30:14 +09:00
Neo Kim 4b2bff4674 Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case. 2015-07-02 11:28:14 +09:00
Vincent Yang 7794bc9d46 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest 2015-07-02 10:27:55 +08:00
Vincent Yang 46d25a45a0 Merge branch 'v3_scene3d_fixspineani' into v3_scene3dtest 2015-07-02 10:27:25 +08:00
Neo Kim a3cbd13402 Update the resource sub module reference 2015-07-01 18:44:59 +09:00
Vincent Yang dc6e966501 [ci skip] remove a unnecessary CCLOG info. 2015-07-01 14:55:31 +08:00
yangxiao d35bf2305f add clipping test 2015-07-01 14:48:37 +08:00
Vincent Yang 276ed46c01 Fixbug : issue 8194. 2015-07-01 14:39:35 +08:00
Neo Kim 00e360f438 Add the missing file into CMake and Windows project configurations. 2015-07-01 15:36:53 +09:00
yangxiao 269feeb1f9 remove stencil from Renderstate 2015-07-01 14:06:37 +08:00
jianglong0156 9e9625feca add bool parm in android 2015-07-01 10:57:43 +08:00
jianglong0156 2ef2016c39 add call reflection with bool test case 2015-07-01 10:41:24 +08:00
Neo Kim 3f05ad2b98 Replace all tabs to 4 spaces to comply with the convention 2015-06-30 20:31:31 +09:00
Neo Kim f5e7184f0b Add new cpp files into Android.mk 2015-06-30 18:50:13 +09:00
Neo Kim bed90606d3 Add RadioButton feature and a test case for it. 2015-06-30 18:50:13 +09:00
yangxiao 538daf5bce add empty line 2015-06-30 14:19:58 +08:00
yangxiao 2ed5ee123e improve collider 2015-06-30 14:16:05 +08:00
Vincent Yang 1105111fab Merge v3 branch. 2015-06-30 11:59:56 +08:00
子龙山人 29cccf631e Merge pull request #12550 from kompjoefriek/v3-vibrate 
Vibrate support in v3
 2015-06-30 10:28:59 +08:00
子龙山人 265c9b55e0 Merge pull request #12586 from fusijie/add-autoculling-bug-testcase 
add auto culling test case.
 2015-06-30 09:33:36 +08:00
Jacky 0be9763a9c add auto culling test case. 2015-06-29 17:25:13 +08:00
pandamicro 08bdf84183 Merge pull request #12584 from jianglong0156/tilemapTestCaseConflict 
resolve the conflict that the 3d testcase show error after click the the titlemap testcase
 2015-06-29 17:07:13 +08:00
子龙山人 c997284825 Merge pull request #12352 from andyque/add-two-events-to-ui-slider 
Improve ui::Slider
 2015-06-29 17:01:27 +08:00
jianglong0156 fd54b9941d resolve the titlemap testcase conflict with the 3d testcase. 2015-06-29 16:34:54 +08:00
andyque cc1e126a84 Merge branch 'v3.7-release' into v3 2015-06-29 10:35:23 +08:00
songchengjiang 7befab0f7b add Physics3DCollider 2015-06-29 10:26:09 +08:00
pandamicro b9a6e8c051 Merge pull request #12579 from jianglong0156/videoplayer 
[ci skip]improve Videoplayer test
 2015-06-29 10:19:08 +08:00
jianglong0156 b9cccc8a4d Merge branch 'v3.7-release' into videoplayer 2015-06-29 10:07:19 +08:00
pandamicro f1528b728c Merge pull request #12565 from WenhaiLin/v3-37-tests-runFix 
[ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32.
 2015-06-26 18:43:14 +08:00
WenhaiLin 24eca337ca [ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32. 2015-06-26 17:12:39 +08:00
pandamicro 88aeaa36f4 Merge pull request #12534 from super626/skybox 
Skybox improvement
 2015-06-26 17:05:17 +08:00
pandamicro d29c5643bc Merge pull request #12559 from WenhaiLin/v3-37-crashfix 
[Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` again after a auto-tested.
 2015-06-26 12:51:07 +08:00
Wenhai Lin 94c0c0c3fc [Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` test case again after a auto-tested. 2015-06-26 12:02:15 +08:00
jianglong0156 ef51fc46ed add videoplayer state, modify play label 2015-06-26 10:44:43 +08:00
pandamicro ddb982246f Merge pull request #12553 from VisualSJ/v3-aa 
Encoded into AVC
 2015-06-26 10:15:02 +08:00
pandamicro d2764918b9 Merge pull request #12545 from WenhaiLin/v3-37-removeUInclude 
Remove unneeded include files and fixed warns.
 2015-06-26 09:31:51 +08:00
kompjoefriek 6eca03fdd2 Merged changes from "Vibrate support in v4" into v3 branch. 2015-06-26 01:02:44 +02:00
WenhaiLin 1494f09f06 Remove unneeded include files and fixed warns. 2015-06-25 23:15:39 +08:00
pandamicro 1ab369a70b Merge pull request #12542 from andyque/fix-v3.7-stuio-percent-mode 
Fix v3.7 cocosStudio percent position bug
 2015-06-25 21:37:12 +08:00
pandamicro a81d7aa8b4 Merge pull request #12541 from VisualSJ/v3-aa 
[ci skip] Encoded into AVC
 2015-06-25 20:32:53 +08:00
andyque 516d45db62 update submodule 2015-06-25 20:16:43 +08:00
VisualSJ 110e51d0bc Encoded into AVC 2015-06-25 19:01:55 +08:00
andyque 8f7b439dfe add cocostudio 1.6 tests 2015-06-25 18:06:45 +08:00
samuele3hu 7feaa18d82 Fix the compile error for cpp-tests based on android studio 2015-06-25 16:08:48 +08:00
samuele3hu ad4f5b8ec0 Fix the some lua tests case bug 2015-06-25 15:13:01 +08:00
yangxiao 63f948c822 modify skybox to projection space 2015-06-25 15:01:39 +08:00
pandamicro 117a72fa07 Merge pull request #12514 from WenhaiLin/v3-37-autotest-timeoutfix 
[Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.
 2015-06-24 23:07:38 +08:00
pandamicro f9db471026 Merge pull request #12495 from super626/v3 
Fix terrain getIntersectionPoint
 2015-06-24 18:36:52 +08:00
WenhaiLin a7632a962f [Cpp-tests]Fixed cannot start auto test again if the timeout has occurred. 2015-06-24 18:24:16 +08:00
pandamicro 6638a53d69 Merge pull request #12509 from xiaofeng11/v3_xiaofeng 
Add a text label to Node3DReader Test, notice user there has no content to show
 2015-06-24 17:10:08 +08:00
Bin Zhang c9c212d0e1 Solve the error when run tests projects with `cocos run`. 2015-06-24 15:33:13 +08:00
XiaoFeng 0846dadbc3 Add a text label to Node3DReader Test, notice user there has no content to show 2015-06-24 14:58:14 +08:00
pandamicro fb852046e1 Merge pull request #12508 from jianglong0156/AccelerometerCrash 
reduce the accelerometer log num, avoid log too much in vs
 2015-06-24 13:45:53 +08:00
jianglong0156 9b31e8ed16 reduce the accelerometer log num, avoid log too much in vs 2015-06-24 12:03:16 +08:00
pandamicro 7ddb6308e9 Merge pull request #12503 from jianglong0156/hidepluginx 
hide facebook testcase
 2015-06-23 22:19:10 +08:00
江龙 f3eb455669 hide facebook testcase 2015-06-23 22:14:27 +08:00
samuele3hu 5c5f3dcc79 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test 2015-06-23 20:03:14 +08:00
samuele3hu e2aa669b8d Fix the LayerTest error about Lua 2015-06-23 20:02:26 +08:00
pandamicro 32accbf21b Merge pull request #12488 from WenhaiLin/v3-37-androidApplicationFix 
Fixed Application may be created more than once on Android.
 2015-06-23 19:43:39 +08:00
pandamicro 0b26f966b5 Merge pull request #12497 from VisualSJ/v3-aa 
[ci skip]add info into BlendFunc tests on canvas and tests data problem
 2015-06-23 19:43:08 +08:00
VisualSJ 5472928aaa add info into BlendFunc tests on canvas and tests data problem 2015-06-23 18:54:18 +08:00
yangxiao c3593c9d64 merge cocos 2015-06-23 18:29:39 +08:00
yangxiao 251c81d7be Merge branch 'newcode' into v3 2015-06-23 18:25:41 +08:00
WenhaiLin f95245312a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0 2015-06-23 17:08:25 +08:00
pandamicro ce508bab87 Merge pull request #12487 from pandamicro/v3 
Fix TransitionTest issue that depth test haven't been disabled after transition
 2015-06-23 16:59:08 +08:00
WenhaiLin cbb073e905 Fixed Application may be created more than once on Android. 2015-06-23 16:58:38 +08:00
pandamicro cd1233f801 Fix TransitionTest issue that depth test haven't been disabled after transition 2015-06-23 16:58:15 +08:00
Vincent Yang 27d011dd50 Fixbug: LabelTestNew New Label + CharMap's effect is wrong. 2015-06-23 16:02:38 +08:00
子龙山人 fca9b89a4c Merge pull request #12480 from andyque/fix-rapidjson-assert-error 
fix rapidjson assert error
 2015-06-23 15:34:47 +08:00
andyque 70b709f4a8 fix rapidjson assert error 2015-06-23 13:54:11 +08:00
pandamicro 4823cc3bc2 Merge pull request #12476 from super626/fps 
show fps in scene3d demo
 2015-06-23 13:42:26 +08:00
子龙山人 d8a2695620 Merge pull request #12473 from WenhaiLin/v3-37-ParticleDemo-crashfix 
[cpp-tests] ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
 2015-06-23 13:36:36 +08:00
pandamicro b08325dd5b Merge pull request #12475 from samuele3hu/v3_7_test 
[ci skip]Fix the some test cases error about Lua
 2015-06-23 13:15:21 +08:00
yangxiao a433d57807 show fps 2015-06-23 11:56:50 +08:00
WenhaiLin a68874d3cb Node: Particles --> ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case. 2015-06-23 11:00:23 +08:00
andyque 931011809d fixed unintended spaces in string 2015-06-23 10:38:43 +08:00
samuele3hu 3b766e5236 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test 2015-06-23 10:20:05 +08:00
samuele3hu 683c5b4cb2 Fix the LabeLTestNew error. 2015-06-22 22:32:21 +08:00
pandamicro 0f5c343e1e Merge pull request #12460 from MSOpenTech/v3-winrt-readme 
Added Windows 10.0 UWP info to Readme
 2015-06-22 13:05:51 +08:00
pandamicro b1e24ee8f2 Merge pull request #12455 from natural-law/v3 
Solve the error when build tests projects with cocos command on win32.
 2015-06-22 13:04:17 +08:00
samuele3hu bc964c96da Fix the error about the Camera3D Test 2015-06-22 09:28:18 +08:00
samuele3hu 0181a84883 Fix the bugs about the particle3DTest 2015-06-22 09:27:34 +08:00
WenhaiLin 6bd46fcfcc [ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App. 2015-06-20 17:07:11 +08:00
Dale Stammen d438bd6f49 added app name to 150x150 windows tile 2015-06-19 09:23:50 -07:00
Bin Zhang 85fe9e8816 Solve the error when build tests projects with cocos command on win32. 2015-06-19 18:32:32 +08:00
子龙山人 8ca0f18575 Merge pull request #12446 from pandamicro/v3 
Add auto bindings for navmesh
 2015-06-19 17:21:00 +08:00
子龙山人 776dd1dd09 Merge pull request #12449 from WenhaiLin/v3-37-resoucesfix 
[ci skip]Fixed resources.
 2015-06-19 16:30:05 +08:00
WenhaiLin 45de0b650a [ci skip]Fixed resources. 2015-06-19 16:26:03 +08:00
子龙山人 869e3c5243 Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix 
Label:Fixed line wrap error without space.
 2015-06-19 15:08:13 +08:00
WenhaiLin d32a317ea0 Label:Fixed line wrap error without space. 2015-06-19 13:39:19 +08:00
pandamicro ca989e2aed Fix physics3d js test issue 2015-06-19 10:35:45 +08:00
pandamicro c6d4f283bb Fix compilation issue in navmesh conversion 2015-06-19 08:11:45 +08:00
江龙 91bc19fb29 Merge branch 'v3_origin' into navmesh 
Conflicts:
	tests/js-tests/src/Physics3DTest/Physics3DTest.js
 2015-06-18 23:50:19 +08:00
pandamicro b757837239 Move NavMesh to jsb namespace 2015-06-18 22:57:41 +08:00
Bin Zhang a4ecfdb7e2 Build engine with LOCAL_ARM_MODE=arm when building JS projects for android. 2015-06-18 22:00:57 +08:00
VisualSJ 3da67d3358 change the seek to time 2015-06-18 22:00:55 +08:00
samuele3hu a98b493151 Update UIS9NinePatchTest for jsb 2015-06-18 22:00:55 +08:00
samuele3hu cbfa92d3fd Add a new line. 2015-06-18 22:00:55 +08:00
samuele3hu 496ce50ff5 issue #12414:Add UIS9NinePatchTest for js 2015-06-18 22:00:55 +08:00
samuele3hu 77c3e9bdde issue #12414:Add UIS9NinePatchTest for Lua and js 2015-06-18 22:00:54 +08:00
VisualSJ 0a526875a8 Fixed a bug that xhr cross-domain error 2015-06-18 22:00:54 +08:00
VisualSJ 82c09e8d0c Fixed a bug that xhr cross-domain error 2015-06-18 22:00:54 +08:00
pandamicro cd7252014a Merge pull request #12432 from pandamicro/v3 
Change physics3d api to jsb namespace
 2015-06-18 21:53:39 +08:00
pandamicro 10a8adad53 Change physics3d api to jsb namespace 2015-06-18 20:39:40 +08:00
pandamicro 491d89baec Merge pull request #12429 from natural-law/v3 
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
 2015-06-18 20:28:52 +08:00
jianglong0156 4fe1542d17 add navmesh tests 2015-06-18 19:22:27 +08:00
Bin Zhang d288b13957 Build engine with LOCAL_ARM_MODE=arm when building JS projects for android. 2015-06-18 17:22:30 +08:00
pandamicro aa566a3722 Merge pull request #12424 from pandamicro/physics3d 
Fix Physics3D test and js bindings
 2015-06-18 16:09:49 +08:00
jianglong0156 85c40b6580 Merge pull request #8 from pandamicro/physics3d 
Physics3d
 2015-06-18 14:54:32 +08:00
pandamicro 811173ea3b Fix Physics3D test and js bindings 2015-06-18 14:33:16 +08:00
pandamicro 9dc52ba72f Merge pull request #12403 from VisualSJ/v3-aa 
[ci skip]Fixed some bug
 2015-06-18 12:31:27 +08:00
pandamicro 000be8316b Merge pull request #12415 from samuele3hu/v3_7_ui 
[ci skip]issue #12414:Add UIS9NinePatchTest for Lua and js
 2015-06-18 12:30:28 +08:00
tangziwen 1989de7a04 fix terraintest and Terrain::getInstersectionPoint() 2015-06-18 12:20:44 +08:00
pandamicro 7952477469 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d 2015-06-18 12:05:01 +08:00
VisualSJ 44c37c676e change the seek to time 2015-06-18 11:54:25 +08:00
Vincent Yang 27bf636eab Fix bug: spine animition can't show in Scene3DTest. 2015-06-18 11:45:17 +08:00
samuele3hu 6c749a77f2 Fix the bugs about the Physics3DTest for Lua. 2015-06-18 11:17:08 +08:00
tangziwen 4187ea2241 fix Scene3D test 2015-06-18 10:17:46 +08:00
samuele3hu 7f21731bb1 Update UIS9NinePatchTest for jsb 2015-06-18 10:08:13 +08:00
Vincent Yang 0e0c8cf72e Modify Scene3DTest to composite 2D/3D scene by moving UI and camera far away. 2015-06-18 09:54:48 +08:00
samuele3hu 31ce264c6a Add a new line. 2015-06-18 09:44:47 +08:00
samuele3hu 8c01d94945 issue #12414:Add UIS9NinePatchTest for js 2015-06-18 09:43:05 +08:00
samuele3hu 31aae38fac issue #12414:Add UIS9NinePatchTest for Lua and js 2015-06-18 09:41:16 +08:00
VisualSJ 400b2d7663 Fixed a bug that xhr cross-domain error 2015-06-18 09:23:15 +08:00
pandamicro 3ffc0e6be6 Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d 2015-06-18 09:20:37 +08:00
pandamicro 3975d44d3b Chain NavMeshTest 2015-06-18 00:58:03 +08:00
pandamicro bcf9659408 Merge branch 'v3' into navmesh 2015-06-18 00:36:37 +08:00
pandamicro 5b23e8b381 Fix resource issue 2015-06-18 00:24:01 +08:00
pandamicro 85e8a407b1 Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3 
# Conflicts:
#	tests/js-tests/project/Classes/AppDelegate.cpp
#	tools/tojs/genbindings.py
 2015-06-17 19:58:24 +08:00
samuele3hu 683812d817 Update Physics3D test for js. 2015-06-17 18:50:55 +08:00
jianglong0156 b265033a41 add testcase and manual bindings 2015-06-17 18:38:18 +08:00
jianglong0156 897b5fd0e9 add navmesh test project file and binding file 2015-06-17 18:37:19 +08:00
VisualSJ 010cb23ead Fixed a bug that xhr cross-domain error 2015-06-17 17:10:31 +08:00
pandamicro 4fa1cdc302 Update submodules 2015-06-17 15:43:35 +08:00
pandamicro ddc820eb42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-06-17 15:33:34 +08:00
子龙山人 fd508a0198 Merge pull request #12381 from VisualSJ/v3-aa 
[ci skip]Fix some simple bug
 2015-06-17 15:11:08 +08:00
VisualSJ 0a223adf7c After exiting should restore settings 2015-06-17 14:43:41 +08:00
子龙山人 dc33a8d66e Merge pull request #12243 from Wu-Hao/fix_spritepolygon2 
Fix spritepolygon
 2015-06-17 14:40:30 +08:00