yangxiao
|
a9384a3250
|
add particle3dtest
|
2015-02-15 13:26:29 +08:00 |
yangxiao
|
51ae806700
|
remove unused code
|
2015-02-13 16:19:38 +08:00 |
yangxiao
|
9b117bf87c
|
resolve conflict
|
2015-02-13 15:46:19 +08:00 |
kompjoefriek
|
a2ef1abef3
|
Fixed unwanted changes
|
2015-02-12 23:07:24 +01:00 |
yangxiao
|
954fd52493
|
rename folder and fix warning
|
2015-02-12 17:54:27 +08:00 |
yangxiao
|
8f290b2d24
|
modify according to minggo
|
2015-02-12 16:09:08 +08:00 |
yangxiao
|
79a0c0152a
|
add 3d particle (Particle Universe)
|
2015-02-11 18:14:22 +08:00 |
minggo
|
a65070bf00
|
Merge pull request #10380 from fusijie/cameratest
fixed Camera3dTest restart bug.
|
2015-02-10 10:43:38 +08:00 |
Nite Luo
|
ee2781e6a6
|
Merge pull request #10223 from vovkasm/cmake-msvc-fixes-core
Cmake build system fixes for MSVC (partial)
|
2015-02-04 23:18:08 -08:00 |
Jacky
|
ecefc53c0d
|
fixed Camera3dTest restart bug.
|
2015-02-05 14:16:31 +08:00 |
samuele3hu
|
4f782e2330
|
Fix z-fighting error by using setDepthTest of cc.Director
|
2015-01-30 11:03:47 +08:00 |
minggo
|
73e8026336
|
Merge pull request #10274 from darkdukey/forceDepthTest
Force depth test
|
2015-01-29 16:29:13 +08:00 |
Nite Luo
|
5532cb30b6
|
Tweak the name
|
2015-01-29 00:24:32 -08:00 |
Nite Luo
|
995b7225dd
|
Add test-case for force depth bug
|
2015-01-29 00:21:33 -08:00 |
minggo
|
18a45e36eb
|
Merge pull request #10271 from Dhilan007/v3-systemfont-win32-fix
Label:Fixed system font can't display the proper text when the text contains '&' on win32.
|
2015-01-29 13:56:11 +08:00 |
WenhaiLin
|
05db3bfd72
|
Fixed system font can't display the proper text when the text contains '&' on win32.
|
2015-01-29 11:55:49 +08:00 |
minggo
|
de3e9be2c5
|
Merge pull request #10265 from samuele3hu/v3_4_fi
Add AsyncLoadSprite3D test case and update the related lua binding
|
2015-01-29 10:16:49 +08:00 |
samuele3hu
|
80c2e0c153
|
Add AsyncLoadSprite3D test case and update the related lua binding
|
2015-01-28 21:47:52 +08:00 |
andyque
|
ac3d79a516
|
add constructor to AnimationInfo
|
2015-01-28 16:59:27 +08:00 |
andyque
|
35c436f1f3
|
fix compile error
|
2015-01-28 16:35:16 +08:00 |
Huabing.Xu
|
1f8b5796e9
|
Merge pull request #10256 from dabingnn/v3_fixCompileError
fix compile error on cpp-tests release mode
|
2015-01-28 15:51:19 +08:00 |
Huabing.Xu
|
29c4c744ac
|
fix compile error on cpp-tests release mode
|
2015-01-28 15:34:28 +08:00 |
minggo
|
34c132280e
|
Merge pull request #10244 from geron-cn/fixProjectNodeLoader
Fix project node crash in simulator and add its test-cpp
|
2015-01-28 15:30:53 +08:00 |
minggo
|
80cf4439f2
|
Merge pull request #10241 from Dhilan007/v3-scheduled-fix
Fixed may access wrong memory address in Scheduler::schedule
|
2015-01-28 15:22:40 +08:00 |
minggo
|
b233d6928e
|
Merge pull request #10238 from Dhilan007/v3-scale9sprite-fix
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
|
2015-01-28 15:16:23 +08:00 |
minggo
|
2738745614
|
Merge pull request #10248 from dabingnn/v3_fixRenderer
V3 fix renderer
|
2015-01-28 15:15:08 +08:00 |
minggo
|
f54916cf69
|
Merge pull request #10247 from samuele3hu/v3_4_fi
Add more 3D test case and adjust some binding function
|
2015-01-28 13:41:34 +08:00 |
WenhaiLin
|
7baf84c232
|
Add test case for issue#10232
|
2015-01-28 11:31:52 +08:00 |
samuele3hu
|
7628ec53bc
|
Remove useless comment
|
2015-01-28 11:06:00 +08:00 |
samuele3hu
|
82a95bf2fc
|
Modify some script files
|
2015-01-28 10:57:30 +08:00 |
minggo
|
c320262f43
|
Merge pull request #10243 from cheyiliu/patch-1
Update SocketIOTest.cpp
|
2015-01-28 10:49:58 +08:00 |
geron-cn
|
7b9d9ff9f9
|
fix complie error on win
|
2015-01-28 10:33:50 +08:00 |
Wenhai Lin
|
4685ab1ef6
|
Add a test case about Scale9Sprite run action in physics scene
|
2015-01-28 10:20:30 +08:00 |
minggo
|
8d681dfe7d
|
Merge pull request #10218 from andyque/fixIssue10183
fixed "call ui::TextField getContentSize in insert or delete event callback ,the result is wron"
|
2015-01-28 09:57:34 +08:00 |
samuele3hu
|
6208e9cba5
|
Add more test cases about 3D
|
2015-01-28 09:40:20 +08:00 |
Nite Luo
|
5c32b31d6e
|
Fix test case #10237
|
2015-01-27 17:24:01 -08:00 |
Nite Luo
|
8f539a0107
|
Make PositionZ independent from global Z
|
2015-01-27 15:41:58 -08:00 |
Nite Luo
|
3cd74ee8ce
|
Fix BillboardTest
|
2015-01-27 13:49:49 -08:00 |
Nite Luo
|
a45db07da3
|
Merge pull request #10236 from super626/usecase
Usecase 2 for 2d + 3d
|
2015-01-27 10:30:18 -08:00 |
geron-cn
|
3268dbc9fd
|
add cpp-test for animation list and projected
|
2015-01-28 02:12:09 +08:00 |
cheyiliu
|
71abf22a0d
|
Update SocketIOTest.cpp
just a fix for spelling
|
2015-01-27 18:22:39 +08:00 |
yangxiao
|
89f107ac08
|
remove unused variables
|
2015-01-27 15:25:40 +08:00 |
yangxiao
|
9744439048
|
use case 2 finished
|
2015-01-27 15:24:15 +08:00 |
minggo
|
880abfe814
|
Merge pull request #10209 from andyque/fixLoadingBarReloadTexture
Fix loading bar reload texture issue
|
2015-01-27 13:50:38 +08:00 |
Nite Luo
|
55b2504bfd
|
Merge branch 'v3' into billboardTest
|
2015-01-26 10:53:17 -08:00 |
yangxiao
|
cc18a3a955
|
another use case not finished
|
2015-01-26 18:44:30 +08:00 |
andyque
|
95e8072afa
|
fixed issue #10183
|
2015-01-26 18:26:59 +08:00 |
minggo
|
269e91a55d
|
Merge pull request #10211 from super626/usecase
Usecase for 2d + 3d
|
2015-01-26 15:41:06 +08:00 |
andyque
|
691e1925ca
|
udpate test resource submodule
|
2015-01-26 15:05:41 +08:00 |
Vladimir Timofeev
|
725744744b
|
cmake: add logic to find and link with curl in cpp-tests, because cpp-tests use curl as its own (in file tests/cpp-tests/Classes/CurlTest/CurlTest.cpp)
|
2015-01-26 10:03:30 +03:00 |