samuele3hu
|
2a59180da3
|
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6_test1
|
2015-04-28 11:30:01 +08:00 |
samuele3hu
|
c801d1868c
|
Update Sprite3DTest and VideoPlayerTest about Lua
|
2015-04-28 11:27:50 +08:00 |
andyque
|
854fcdf2bf
|
fix spritepolygon
|
2015-04-28 11:26:21 +08:00 |
Dale Stammen
|
4d7e6567ea
|
Use TextBMFont when text is updated from slider for faster performance
|
2015-04-27 19:48:15 -07:00 |
minggo
|
1ac0c8c0b1
|
Merge pull request #11616 from WenhaiLin/v3.6
TransitionsTests:Fixed Transition not work when switch between test cases
|
2015-04-28 09:35:45 +08:00 |
minggo
|
ce9f40fb9a
|
Merge pull request #11619 from samuele3hu/v3.6_test1
Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygon
|
2015-04-28 09:32:30 +08:00 |
samuele3hu
|
dc765aee25
|
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6_test1
|
2015-04-28 09:19:03 +08:00 |
samuele3hu
|
51bcac9e84
|
Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygonTest
|
2015-04-28 09:17:00 +08:00 |
WuHao
|
597d2289c0
|
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6
|
2015-04-27 17:31:50 +08:00 |
WuHao
|
a046f74c4d
|
fix anchor point bug
|
2015-04-27 17:30:38 +08:00 |
WenhaiLin
|
70a641e2b3
|
TransitionsTests:Fixed Transition not work when switch between test cases.
|
2015-04-27 17:22:20 +08:00 |
minggo
|
c9bacd58e8
|
Merge pull request #11591 from Wu-Hao/v3.6
V3.6
|
2015-04-27 14:22:21 +08:00 |
WuHao
|
9f2ea5fbb9
|
fixed some SpritePolygon create, added more tests
|
2015-04-27 13:34:47 +08:00 |
minggo
|
0a8f533e80
|
Merge pull request #11590 from super626/v3
Animate3D Quality control
|
2015-04-27 10:58:10 +08:00 |
samuele3hu
|
bd5ca083e9
|
Fix the compile error of SpritePolygonTest on the win32 and wp8.1
|
2015-04-26 23:08:14 +08:00 |
WuHao
|
c1d10ffa1c
|
fixed poly2tri creation method, added testCase
|
2015-04-24 18:28:28 +08:00 |
WuHao
|
5620da1adf
|
fixed anchor point issue, removed rect rotated property
|
2015-04-24 18:17:12 +08:00 |
WuHao
|
0e318dd8dc
|
fixed UV issue, also taking account of contentScaleFactor, made test case better
|
2015-04-24 17:39:43 +08:00 |
WenhaiLin
|
5e5cd5faa1
|
[js-tests]Fixed crash on Win32/Universal.
|
2015-04-24 17:12:46 +08:00 |
lvlong
|
59dc646c17
|
modify test
|
2015-04-24 14:12:24 +08:00 |
lvlong
|
8e51a561b1
|
modify some about animate3D quality!
|
2015-04-24 11:49:28 +08:00 |
WuHao
|
07349ff588
|
initial cpp test
|
2015-04-23 18:03:03 +08:00 |
lvlong
|
d7fc85eb97
|
remove model ~~ !!!
|
2015-04-23 16:10:01 +08:00 |
zhangbin
|
61cf0ad28b
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
|
2015-04-23 15:46:19 +08:00 |
WenhaiLin
|
55d3cc1252
|
Update the js-tests CMake files.
|
2015-04-23 10:42:44 +08:00 |
samuele3hu
|
8d9064b4e4
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test
Conflicts:
tests/cpp-tests/Classes/AppDelegate.cpp
|
2015-04-22 10:31:39 +08:00 |
samuele3hu
|
47e2698986
|
Fix the cocos3.6beta0 bugs
|
2015-04-22 10:20:21 +08:00 |
Dale Stammen
|
e4ae0f9c2c
|
disable INCREMENTAL for ARM builds. Fixes lnk2013 error
|
2015-04-21 08:50:43 -07:00 |
lvlong
|
4f96037e15
|
1. Merge branch 'v3' of github.com:super626/cocos2d-x into v3
2. fix bug: memory leak!
|
2015-04-21 19:38:38 +08:00 |
zhangbin
|
f75bf93706
|
Update the js-tests project files.
|
2015-04-21 15:30:47 +08:00 |
Dale Stammen
|
6c7ecf0b18
|
removed CC_PLATFORM_WINRT messagebox code
|
2015-04-20 10:32:11 -07:00 |
Dale Stammen
|
e00b0dfbd9
|
Merge branch 'v3' into v3-winrt-backbutton
|
2015-04-20 08:17:16 -07:00 |
WenhaiLin
|
f453235ce3
|
Add missing resource
|
2015-04-20 15:38:56 +08:00 |
samuele3hu
|
067ad6ad60
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2
Conflicts:
cocos/scripting/lua-bindings/proj.android/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
|
2015-04-20 10:05:02 +08:00 |
Dale Stammen
|
e3e79475f7
|
added ExitApp() for winrt
|
2015-04-19 16:30:51 -07:00 |
Dale Stammen
|
aae82c24f9
|
removed CC_PLATFORM_WP8
|
2015-04-19 16:28:54 -07:00 |
Milos Jakovljevic
|
a13c519882
|
Adding FloatAction to animate any property over time.
|
2015-04-18 14:35:14 +02:00 |
samuele3hu
|
b72034a3f6
|
Add Lua bindings for WebView and related test case
|
2015-04-17 14:08:47 +08:00 |
Wenhai Lin
|
7860f57ef0
|
Fixed compile errors
|
2015-04-17 14:00:53 +08:00 |
Wenhai Lin
|
03ef9b962a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge
|
2015-04-17 11:47:09 +08:00 |
minggo
|
3c7d5afce2
|
Merge pull request #11465 from WenhaiLin/v3-videoplayer-iosfix
Fix crash when play streamed MP4 file.
|
2015-04-16 18:16:28 +08:00 |
WenhaiLin
|
e50b14b7fb
|
Add js-tests
|
2015-04-16 18:07:35 +08:00 |
WenhaiLin
|
fc75f46abb
|
Fix crash when play streamed MP4 file.
|
2015-04-16 16:27:09 +08:00 |
minggo
|
408d164fea
|
Merge pull request #11458 from andyque/fix-a-side-effect-of-button-memory-optimization
fix side effect of ui::button clone
|
2015-04-16 16:15:25 +08:00 |
andyque
|
8a9f420735
|
fix side effect of ui::button clone
|
2015-04-16 14:38:00 +08:00 |
Dale Stammen
|
b700798287
|
removed WP8 project files
|
2015-04-15 07:13:54 -07:00 |
minggo
|
d54ddbd010
|
Merge pull request #11440 from WenhaiLin/v3-TextFieldTTFDefaultTest
TextFieldTTFDefaultTest: Fixed can't take input from the keyboard.
|
2015-04-14 22:36:32 +08:00 |
WenhaiLin
|
5f4fd20b06
|
TextFieldTTFDefaultTest: Fixed can't take input from the keyboard.
|
2015-04-14 18:04:35 +08:00 |
andyque
|
3c3d76fd9e
|
remove listview focus test
|
2015-04-14 17:48:43 +08:00 |
minggo
|
fbb1c578a2
|
Merge pull request #11430 from minggo/update-spine
update spine runtime to v2.1.25
|
2015-04-14 17:01:11 +08:00 |
minggo
|
0559b96a8e
|
Merge pull request #11428 from samuele3hu/v3_studio2
[ci skip]Remove useless classes configuration for Lua binding and fix two minor bugs.
|
2015-04-14 16:38:05 +08:00 |
minggo
|
cdd7acc537
|
add spine test case
|
2015-04-14 16:14:51 +08:00 |
samuele3hu
|
dd3b6ced34
|
Fix the bugs that title and button disappeared because of camera setting
|
2015-04-14 15:40:12 +08:00 |
XiaoYang
|
5ed65e13c9
|
Merge pull request #303 from zhukaixy/texturecube
bugfix for cubemap
|
2015-04-14 14:25:35 +08:00 |
zhukaixy
|
451a560200
|
bugfix for cubemap
|
2015-04-14 14:20:31 +08:00 |
yangxiao
|
8c8058a9be
|
merge cocos resolve conflict
|
2015-04-14 13:56:05 +08:00 |
zhukaixy
|
6684491249
|
1: update cube texture for sky box
2: add mouse-controled camera for test case (skybox)
|
2015-04-14 01:39:23 +08:00 |
samuele3hu
|
24654a4847
|
synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
|
2015-04-13 16:29:44 +08:00 |
minggo
|
da69dbd133
|
Merge pull request #11388 from xiaofeng11/v3
Reader update
|
2015-04-13 11:20:53 +08:00 |
samuele3hu
|
8896190d9b
|
Fix the bindings-generator error and add related Action Timeline test case.
|
2015-04-12 22:20:53 +08:00 |
pipu
|
755134ba3f
|
Update parse animation easing
|
2015-04-10 17:05:55 +08:00 |
minggo
|
698d93a42b
|
Merge pull request #11379 from WenhaiLin/v3-physics-fix
Physics: Fixed position of physics body is wrong when the position of parent node changes
|
2015-04-10 16:45:45 +08:00 |
Wenhai Lin
|
97082cb169
|
Physics: Fixed position of physics body is wrong when the position of parent node changes
|
2015-04-10 15:39:39 +08:00 |
andyque
|
10c90b06aa
|
fix ui::Text outline don't change content size
|
2015-04-10 15:33:48 +08:00 |
pipu
|
7a67b6ccce
|
Test samples
|
2015-04-10 14:52:54 +08:00 |
andyque
|
c8d8a0d220
|
add disableEffect API for ui::Text
|
2015-04-10 14:18:16 +08:00 |
Ricardo Quesada
|
967f35ad82
|
removes warning
warnings are treated as errors on Mac.
Why this was even merged? Do we have a Mac builder? The Mac builder
should fail.
|
2015-04-09 15:15:15 -07:00 |
minggo
|
2c08ae9549
|
Merge pull request #11363 from WenhaiLin/v3-autotest
[ci skip]Update the reference of submodule ccs-res.
|
2015-04-09 17:09:05 +08:00 |
WenhaiLin
|
b5ae74c52b
|
[ci skip]Update the reference of submodule ccs-res.
|
2015-04-09 17:07:37 +08:00 |
minggo
|
96f446ad93
|
Merge pull request #11362 from WenhaiLin/v3-autotest
Test automation support: Fixed may not to restore TestList to the original position.
|
2015-04-09 16:51:59 +08:00 |
WenhaiLin
|
8b839edfde
|
Test automation support: Fixed may not to restore TestList to the original position.
|
2015-04-09 16:46:35 +08:00 |
minggo
|
4e4b8bcea0
|
Merge pull request #11361 from WenhaiLin/v3-autotest
Remove unneeded code.
|
2015-04-09 16:29:56 +08:00 |
WenhaiLin
|
f502c5900b
|
[ci skip]Remove unwanted code.
|
2015-04-09 16:23:29 +08:00 |
WenhaiLin
|
c5ff21f7c6
|
[ci skip]Remove unwanted code.
|
2015-04-09 16:18:24 +08:00 |
minggo
|
a4bcb82983
|
Merge pull request #11359 from WenhaiLin/v3-autotest
Fixed crashes in test case of Scene/Node.
|
2015-04-09 15:58:08 +08:00 |
WenhaiLin
|
16bce0bfd3
|
Fixed crashes in test case of Scene/Node.
|
2015-04-09 15:43:01 +08:00 |
minggo
|
d9acaa444a
|
Merge pull request #11358 from WenhaiLin/v3-autotest
Fixed the test case of BillBoard not respond touch event as expected.
|
2015-04-09 15:11:17 +08:00 |
WenhaiLin
|
2e24f302d6
|
Fixed the test case of BillBoard not respond click event as expected.
|
2015-04-09 15:08:49 +08:00 |
minggo
|
5938fce905
|
Merge pull request #11357 from WenhaiLin/v3-autotest
Test automation support:Make test cases didn't need to care about TestSuite when invoking Director::getInstance()->replaceScene.
|
2015-04-09 15:05:44 +08:00 |
WenhaiLin
|
e5bd611604
|
Test automation support:Make test cases didn't need to care about TestSuite when invoking Director::getInstance()->replaceScene.
|
2015-04-09 14:59:34 +08:00 |
minggo
|
961d00a94d
|
Merge pull request #11356 from WenhaiLin/v3-autotest
Fixed some test cases of action not respond click event as expected.
|
2015-04-09 14:36:03 +08:00 |
minggo
|
e9c88a61da
|
Merge pull request #11354 from samuele3hu/v3_terrain
Update the Lua bindings for terrain and TerrainTest.lua
|
2015-04-09 14:22:19 +08:00 |
WenhaiLin
|
a378651320
|
Fixed some test cases of action not respond click event as expected.
|
2015-04-09 14:20:59 +08:00 |
samuele3hu
|
9bf2a920b4
|
Update the Lua bindings for terrain and TerrainTest.lua
|
2015-04-09 13:41:52 +08:00 |
minggo
|
c022b7d615
|
Merge pull request #11351 from WenhaiLin/v3-autotest
Test automation support:
|
2015-04-09 13:41:20 +08:00 |
Ricardo Quesada
|
510d502631
|
Merge remote-tracking branch 'cocos2d/v3' into xcode_6_3_tests_compiles
|
2015-04-08 21:59:22 -07:00 |
WenhaiLin
|
57508b3c12
|
Fixed compile errors
|
2015-04-09 12:49:32 +08:00 |
Ricardo Quesada
|
49e2e8964e
|
more compilations issues.
compiles on Android
|
2015-04-08 21:40:39 -07:00 |
Ricardo Quesada
|
23b0d4d2f6
|
more fixes with the namespaces
|
2015-04-08 21:23:47 -07:00 |
WenhaiLin
|
565a79022b
|
Test automation support:
1.TestList support mouse scroll.
2.TestList respond click event in the right response area.
|
2015-04-09 11:56:49 +08:00 |
tangziwen
|
0649f9709c
|
remove unnecessary reload in terrain test
|
2015-04-09 10:20:06 +08:00 |
tangziwen
|
4ca6b559e6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
|
2015-04-09 09:40:22 +08:00 |
tangziwen
|
58a9e43c9c
|
update terrain test
|
2015-04-09 09:39:27 +08:00 |
Ricardo Quesada
|
51374eb822
|
tests compiles on xcode 6.3
no more USING_NS in the header files.
it creates conflict with xcode 6.3
|
2015-04-08 17:37:30 -07:00 |
tangziwen
|
0c2c8b072a
|
terrain update terrain test update ,resource update
|
2015-04-08 15:13:24 +08:00 |
minggo
|
4bcfcb1d09
|
Merge pull request #11320 from samuele3hu/v3_terrain
#issue 10819:Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 11:45:46 +08:00 |
samuele3hu
|
3a2601a1f8
|
Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 10:03:50 +08:00 |
minggo
|
8f52d950de
|
Merge pull request #11309 from WenhaiLin/v3-autotest
Test automation support:Catch crash event on WIN32/MAC/IOS/ANDROID
|
2015-04-08 09:59:13 +08:00 |
andyque
|
9f5932ceeb
|
resolve the chipmunk compile issue
|
2015-04-07 23:20:02 +08:00 |
minggo
|
50fa15c0cd
|
Merge pull request #11301 from samuele3hu/v3_lua_jit
Add luajit support for iOS 64bit devices and related test cases
|
2015-04-07 18:17:09 +08:00 |
WenhaiLin
|
6bcddbc779
|
Test automation support:Catch crash event on WIN32/MAC/IOS/ANDROID
|
2015-04-07 16:14:27 +08:00 |
minggo
|
eb928432ce
|
Merge pull request #11302 from WenhaiLin/v3-label-shadowcolor
Label: Fixed shadow color is incorrect.
|
2015-04-07 15:27:19 +08:00 |
minggo
|
b85d26b2f6
|
Merge pull request #11303 from WenhaiLin/v3-autotest
Add missing test
|
2015-04-07 14:28:05 +08:00 |
minggo
|
420ace04e5
|
Merge pull request #11304 from tangziwen/terrain
terrain test update
|
2015-04-07 14:02:01 +08:00 |
tangziwen
|
176f7dd879
|
slightly modified the camera's default position & terrain's Lod distance in the terrain test
|
2015-04-07 11:50:09 +08:00 |
WenhaiLin
|
a6699058a0
|
Add missing test
|
2015-04-07 11:43:02 +08:00 |
WenhaiLin
|
c5c5d3e39d
|
Label: Fixed shadow color is incorrect.
|
2015-04-07 11:17:01 +08:00 |
minggo
|
deaa6a19f0
|
Merge pull request #11257 from super626/terrain
Terrain
|
2015-04-07 09:32:35 +08:00 |
samuele3hu
|
fd554c07da
|
Rename the file names
|
2015-04-07 09:31:04 +08:00 |
Ricardo Quesada
|
a782eb022d
|
fixes warnings on Xcode 6.3
instead of using `abs()` it uses `std::abs()`
|
2015-04-06 12:08:30 -07:00 |
samuele3hu
|
a64e90d469
|
Update the related project setting for Luajit and related test cases
|
2015-04-06 22:41:34 +08:00 |
tangziwen
|
14b94a6aac
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
Resolve Conflicts:
tests/cpp-tests/Classes/controller.cpp
|
2015-04-03 17:50:08 +08:00 |
tangziwen
|
d79c38e17a
|
add WP8 support
|
2015-04-03 16:50:09 +08:00 |
tangziwen
|
0193420dfc
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
Resovle Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-04-03 15:45:51 +08:00 |
tangziwen
|
ee41c9b3f1
|
add win rt support
|
2015-04-03 14:36:29 +08:00 |
WenhaiLin
|
0d51c13743
|
Make all test cases work fine with new test framework.
|
2015-04-03 14:31:03 +08:00 |
tangziwen
|
8a7b318c1a
|
Add some helper function to detect the heightMap size,refact Terrain::Create, fix typo ,add doxygen comment
|
2015-04-03 13:49:07 +08:00 |
WenhaiLin
|
6f47006324
|
Add new test framework.
|
2015-04-03 11:54:39 +08:00 |
yangxiao
|
cfbfe3b676
|
add to linux
|
2015-04-02 16:57:38 +08:00 |
yangxiao
|
784c68f9a0
|
modify test title
|
2015-04-02 14:18:22 +08:00 |
XiaoYang
|
984babc9c9
|
Merge pull request #281 from tangziwen/terrain
update terrain
|
2015-04-02 10:19:11 +08:00 |
tangziwen
|
6cd1077cb0
|
update terrain
|
2015-04-01 18:24:05 +08:00 |
minggo
|
eefd06415b
|
Merge pull request #11229 from xiaofeng11/v3
Add destroyCocosStudio()
|
2015-04-01 10:49:49 +08:00 |
pipu
|
bc7d8f0a09
|
Add method destroyCocosStudio() for CocoStudio
|
2015-03-31 19:55:56 +08:00 |
minggo
|
c1cd041912
|
Merge pull request #11221 from super626/v3
3d animation quality control
|
2015-03-31 17:23:58 +08:00 |
pipu
|
a0a461f319
|
Supplement some Reader.
|
2015-03-31 11:22:34 +08:00 |
yangxiao
|
4e03c62b03
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2015-03-31 11:09:59 +08:00 |
yangxiao
|
a6c1d15120
|
fix warning
|
2015-03-31 11:09:38 +08:00 |
XiaoYang
|
45987b6a60
|
Merge pull request #276 from tangziwen/terrain
update Terrain, support skirt
|
2015-03-31 09:14:27 +08:00 |
tangziwen
|
1a93f87a15
|
update terrain
|
2015-03-30 18:25:22 +08:00 |
lvlong
|
4bc44c207d
|
modify config-example.plist
|
2015-03-30 18:07:32 +08:00 |
lvlong
|
cbdfd77400
|
modify some name.
|
2015-03-30 17:46:45 +08:00 |
lvlong
|
f967fef7d0
|
modify Sprite3DWithSkinTest, can switch animation quality.
|
2015-03-30 17:08:49 +08:00 |
lvlong
|
ccb5039411
|
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
Conflicts:
cocos/base/CCConfiguration.h
|
2015-03-30 11:50:01 +08:00 |
minggo
|
d437ce3e59
|
Merge pull request #11208 from samuele3hu/v3_5_comment
Update Sprite3DCubeMap lua test case and the related bindings-generator submodule
|
2015-03-30 10:48:36 +08:00 |
minggo
|
59441adc2c
|
Merge pull request #11213 from super626/texturecube
Texturecube bug fix
|
2015-03-30 10:48:10 +08:00 |
yangxiao
|
b469cfa928
|
merge cocos
|
2015-03-30 10:28:14 +08:00 |
samuele3hu
|
921981833e
|
Update Sprite3DCubeMap test case
|
2015-03-28 14:59:47 +08:00 |
XiaoYang
|
dbf86e3e66
|
Merge pull request #270 from zhukaixy/patch-2
Bugfix: for glcontext recreated
|
2015-03-27 17:08:51 +08:00 |
zhukaixy
|
8a1637e3de
|
Update cube_map.frag
|
2015-03-27 16:50:59 +08:00 |
yangxiao
|
a45f0d1a76
|
merge cocos
|
2015-03-27 16:50:40 +08:00 |
zhukaixy
|
a5bda44f22
|
Update Sprite3DTest.cpp
|
2015-03-27 16:47:48 +08:00 |
tangziwen
|
3a3e1e9ad1
|
update terrain test
|
2015-03-27 10:47:52 +08:00 |
yangxiao
|
c23746fbcd
|
modify
|
2015-03-26 13:05:42 +08:00 |
yangxiao
|
7af9957e1c
|
reset submodule
|
2015-03-26 12:56:38 +08:00 |
yangxiao
|
000e34c6d0
|
merge cocos
|
2015-03-26 12:50:18 +08:00 |
yangxiao
|
84535feb0c
|
merge cocos
|
2015-03-26 11:59:26 +08:00 |
lvlong
|
c999307150
|
add different animate quality.
|
2015-03-26 11:30:22 +08:00 |
yangxiao
|
8d24ea7efe
|
rename to nodeanimation
|
2015-03-26 10:20:28 +08:00 |
yangxiao
|
90e010aec8
|
add light
|
2015-03-26 10:09:12 +08:00 |