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 |
yangxiao
|
77716d481d
|
format
|
2015-01-26 15:03:01 +08:00 |
yangxiao
|
5e1d7449f7
|
complete use case 1
|
2015-01-26 14:58:16 +08:00 |
andyque
|
12cf9da486
|
improve loadingbar test
|
2015-01-26 14:46:45 +08:00 |
andyque
|
0e67cfcbff
|
improve loading Bar Test
|
2015-01-26 14:39:44 +08:00 |
minggo
|
4ac50f2c26
|
Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix
Fixed sets the page's base URL for WebView doesn't work.
|
2015-01-26 13:51:08 +08:00 |
andyque
|
fdbf84a118
|
add uploading switch scale9 tests
|
2015-01-26 13:49:54 +08:00 |
Wenhai Lin
|
81198583f1
|
Fixed sets the page's base URL for WebView doesn't work.
|
2015-01-23 18:30:12 +08:00 |
yangxiao
|
677ee473ff
|
3d+2d use case, not finished
|
2015-01-23 18:24:15 +08:00 |
samuele3hu
|
6e055ba41f
|
Fix some lua test cases bug
|
2015-01-23 15:35:15 +08:00 |
samuele3hu
|
d74fb0e8b5
|
Update LayoutComponent Test case of UIEditTest
|
2015-01-22 10:21:38 +08:00 |
samuele3hu
|
01bfe09c05
|
Add checked lua codes for issue #10107
|
2015-01-21 19:33:42 +08:00 |
yusheng.lu
|
bec9b0e6b3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-01-21 17:14:16 +08:00 |
yusheng.lu
|
304f28a58a
|
Update the csb resources for current Cocos2d-x
|
2015-01-21 17:08:16 +08:00 |
minggo
|
72fb059aeb
|
Merge pull request #10144 from andyque/fixButtonPressActionIssue
fix button pressAction scale issue
|
2015-01-21 16:37:59 +08:00 |
andyque
|
d58426db99
|
fix button pressAction scale issue
|
2015-01-21 14:54:37 +08:00 |
minggo
|
335f69d95d
|
Merge pull request #10110 from super626/v3
Fix Animate3D speed bug and add parameter to Ray::intersects
|
2015-01-21 14:11:11 +08:00 |
minggo
|
11ff48416f
|
Merge pull request #10060 from doomsdayer/v3_layout_test
Updated the Layout Component demo
|
2015-01-21 11:11:44 +08:00 |
minggo
|
fde86c7fd2
|
Merge pull request #10127 from Dhilan007/v3-systemfont-alphafix
Fixed the alpha channel of text color of system font not take effect
|
2015-01-21 11:09:27 +08:00 |
minggo
|
dca1edccd7
|
Merge pull request #10113 from liamcindy/Scale9Error
update for ui object scale9 state refresh
|
2015-01-21 10:51:55 +08:00 |
minggo
|
9f24b9a350
|
Merge pull request #10090 from Dhilan007/v3-issue10089
Fixed lose the precision of label's dimensions
|
2015-01-21 10:51:27 +08:00 |
Liam
|
776f40ea6b
|
reset cpp-test project option
|
2015-01-21 10:19:05 +08:00 |
Liam
|
902fba0638
|
fix slider and loadingbar scale9 error
|
2015-01-20 20:57:54 +08:00 |
yusheng.lu
|
858bafdae9
|
Removed the unused variable to make XCode compile pass.
|
2015-01-20 19:56:00 +08:00 |
yusheng.lu
|
a35be8977a
|
Submodule ccs-res go forward.
|
2015-01-20 19:18:23 +08:00 |
WenhaiLin
|
ef55ccdbeb
|
Fixed UIEditBoxTest display error font size
|
2015-01-20 18:08:17 +08:00 |
Liam
|
a42d213d16
|
update for ui object scale9 state refresh
|
2015-01-20 17:24:04 +08:00 |
Wenhai Lin
|
3263289680
|
Add test case for testing text color of system font
|
2015-01-20 16:50:50 +08:00 |
WenhaiLin
|
e5fc236ec4
|
Add test case for issue#10089
|
2015-01-20 12:01:51 +08:00 |
yusheng.lu
|
bba8d6481f
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_layout_test
|
2015-01-19 10:05:39 +08:00 |
Nite Luo
|
796720e4fd
|
Rotate root node
|
2015-01-16 00:14:24 -08:00 |
Nite Luo
|
414115690e
|
Create rotation test case for billboard
|
2015-01-16 00:04:26 -08:00 |
Nite Luo
|
0bddeb88c8
|
Disable 3D rendering support for commands that needs to execute in order
|
2015-01-15 14:57:51 -08:00 |
Nite Luo
|
4a440e66c9
|
Refactor draw command
|
2015-01-15 14:00:49 -08:00 |
songmiao
|
147506f662
|
change camera position
|
2015-01-15 15:53:19 +08:00 |
minggo
|
45c4c16f93
|
Merge pull request #10010 from andyque/fixErrorFontName
fix font name typo in tests
|
2015-01-15 10:24:02 +08:00 |
minggo
|
905ccb11b9
|
Merge pull request #10009 from Dhilan007/v3-34rc0
Fixed warns:truncation from double to float
|
2015-01-15 10:14:41 +08:00 |
andyque
|
f8200347cd
|
fix font name typo in tests
|
2015-01-15 10:10:53 +08:00 |
WenhaiLin
|
13b049a543
|
Fixed warns:truncation from double to float
|
2015-01-15 10:07:23 +08:00 |
minggo
|
62d416eb01
|
Merge pull request #10008 from samuele3hu/v3_4_rc1_check
[ci skip]Fix some lua test cases bugs
|
2015-01-15 10:07:19 +08:00 |
samuele3hu
|
1325ba0eaf
|
Fix some lua test cases bug
|
2015-01-15 10:01:16 +08:00 |
minggo
|
1fa0fb584b
|
Merge pull request #10004 from MSOpenTech/wp8-fix
WP8/WinRT fixes
|
2015-01-15 09:33:38 +08:00 |
Nite Luo
|
15660926d9
|
Fix Sprite3D not cascading 3D flag
|
2015-01-14 16:23:35 -08:00 |
Dale Stammen
|
32c14710e7
|
allow custom shaders for WinRT Universal App
|
2015-01-14 10:37:04 -08:00 |
minggo
|
825f90564c
|
Merge pull request #9992 from samuele3hu/v3_4_issue9986
issue #9986:Add lua bindings for Component and related test cases
|
2015-01-14 17:05:51 +08:00 |
samuele3hu
|
77912270f9
|
issue #9986:Add lua bindings for Component and related test cases
|
2015-01-14 16:58:35 +08:00 |
minggo
|
1641c92721
|
Merge pull request #9983 from samuele3hu/v3_4_issue9820
issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes
|
2015-01-14 16:11:43 +08:00 |
samuele3hu
|
c026aa82f9
|
Add CC_DEPRECATED_ATTRIBUTE flag
|
2015-01-14 15:09:37 +08:00 |
yangxiao
|
42c40d895f
|
enable disable culling using macro
|
2015-01-14 14:41:10 +08:00 |
samuele3hu
|
951324a230
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_issue9820
Conflicts:
cocos/scripting/lua-bindings/manual/3d/lua_cocos2dx_3d_manual.cpp
|
2015-01-14 13:58:12 +08:00 |
samuele3hu
|
1d94ae4302
|
issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes
|
2015-01-14 13:51:09 +08:00 |
Huabing.Xu
|
34582ba268
|
Merge branch 'v3' into v3_AddOptionsForCulling
Conflicts:
cocos/2d/CCLabel.cpp
|
2015-01-14 12:44:24 +08:00 |
minggo
|
301cb558ec
|
Merge pull request #9970 from super626/v3
correct wrong word
|
2015-01-14 11:45:48 +08:00 |
minggo
|
5459149279
|
Merge pull request #9969 from huangshiwu/pointSize
DrawNode enable draw different size points
|
2015-01-14 11:38:31 +08:00 |
yusheng.lu
|
eb106d57a6
|
layout component test
|
2015-01-14 11:34:43 +08:00 |
minggo
|
0207c22cb6
|
Merge pull request #9953 from darkdukey/renderFix
Render fix
|
2015-01-14 11:06:33 +08:00 |
minggo
|
d320941ca1
|
Merge pull request #9963 from Dhilan007/v3-issue9898-fix
Fixed crash if dispatch event after remove event listener in callback
|
2015-01-14 10:59:42 +08:00 |
Huabing.Xu
|
f3d8798d39
|
add macro to enable to disable culling
|
2015-01-14 10:56:51 +08:00 |
yangxiao
|
772813e810
|
modify wrong word
|
2015-01-14 09:36:22 +08:00 |
Nite Luo
|
4335328e3d
|
Add support for creating empty sprite3D
|
2015-01-13 16:41:24 -08:00 |
Dale Stammen
|
f07999e1be
|
enabled all sprites3d tests for winrt universal apps
|
2015-01-13 14:33:16 -08:00 |
Dale Stammen
|
a2a257133a
|
enabled fogtestdemo for winrt universal apps
|
2015-01-13 14:32:30 -08:00 |
huangshiwu
|
fea492ab4f
|
DrawNode enable draw different size points
|
2015-01-13 22:30:50 +08:00 |
WenhaiLin
|
13481ea5c2
|
Add test case for issue#9898
|
2015-01-13 18:37:45 +08:00 |
lvlong
|
8f16728514
|
wrong words
|
2015-01-13 18:00:20 +08:00 |
Nite Luo
|
1c10ae43bc
|
Merge branch 'v3' into renderFix
Conflicts:
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
|
2015-01-12 20:43:55 -08:00 |
Nite Luo
|
a84f521e64
|
Clean up the debug functions in Billboard
|
2015-01-12 20:17:00 -08:00 |
Nite Luo
|
8591609128
|
Implement 3D drawing support for Sprite, Label, Particle, BatchNode
|
2015-01-12 20:06:50 -08:00 |
Nite Luo
|
fee8bc1b28
|
Remove Transparent Queue, Move transform calculation of Billboard to visit
|
2015-01-12 18:17:47 -08:00 |
minggo
|
12539c24be
|
Merge pull request #9937 from pipu/serialize_parse_inneractionframe_alphaframe
Serialize parse inneractionframe alphaframe
|
2015-01-12 20:01:45 +08:00 |
andyque
|
32450ae9a3
|
fix empty http string
|
2015-01-12 16:16:39 +08:00 |
Nite Luo
|
7741daf091
|
Billboard Render correctly
|
2015-01-11 22:20:41 -08:00 |
pipu
|
34402b75c9
|
Merge branch 'v3' into parse_inneractionframe
|
2015-01-12 13:38:30 +08:00 |
minggo
|
c4e47ed38d
|
Merge pull request #9902 from super626/v3
add fog test and arcball test
|
2015-01-12 11:58:03 +08:00 |
pipu
|
82be4701b5
|
Update resource DemoPlayer.csb in path tests/cpp-tests/Resources/ActionTimeline
|
2015-01-12 11:12:38 +08:00 |
pipu
|
78b32332d3
|
Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number.
|
2015-01-12 10:55:15 +08:00 |
Nite Luo
|
6dfc021c02
|
Merge renderqueue to one
|
2015-01-09 14:06:21 -08:00 |
minggo
|
c1b958c540
|
Merge pull request #9904 from Dhilan007/v3-systemfont-android-fix
Fixed dead loop when the width of label[system font] smaller then one word of the string on android
|
2015-01-09 19:07:24 +08:00 |
WenhaiLin
|
e2c7743db1
|
Add test case
|
2015-01-09 18:51:30 +08:00 |
samuele3hu
|
6a55fef70e
|
Update the VideoPlayerTest to passing the fullpath of video resource
|
2015-01-09 16:45:51 +08:00 |
samuele3hu
|
08ec8cc8bf
|
Fix some lua-tests bugs
|
2015-01-09 15:23:54 +08:00 |
songmiao
|
9de5371202
|
fix bug and add notes
|
2015-01-09 10:23:40 +08:00 |
WenhaiLin
|
718c400bfa
|
Fixed bodies display wrong in Physics:Pump test case
|
2015-01-09 10:21:50 +08:00 |
Nite Luo
|
e7480a7efb
|
Enable tansparent queue and create camera rotation demo
|
2015-01-08 16:30:00 -08:00 |
WenhaiLin
|
83cf479cb4
|
Fixed typo
|
2015-01-08 16:57:03 +08:00 |
songmiao
|
71820e6db1
|
add notes, deal with opengl shader in windows device, fix bug
|
2015-01-08 15:16:47 +08:00 |
Huabing.Xu
|
2b71c57b52
|
Merge pull request #9840 from Dhilan007/v3-physics-performance
Improve performance of Physics
|
2015-01-08 10:33:51 +08:00 |
songmiao
|
dfa6137ce9
|
modify arcball and fog shader
|
2015-01-07 17:58:10 +08:00 |
Wenhai Lin
|
8524a5fb97
|
Improve performance of physics
|
2015-01-07 17:08:04 +08:00 |
songmiao
|
41cd946e27
|
modify fog shader format and notes
|
2015-01-07 15:47:27 +08:00 |
songmiao
|
c522a72f66
|
modify fog shader for ios device
|
2015-01-07 14:56:34 +08:00 |
Huabing.Xu
|
27d4c6a0f6
|
Merge pull request #9830 from huangshiwu/v3_drawNode_fixbug
DrawNode override drawPoints function to set pointSize, fix draw points ...
|
2015-01-07 14:46:13 +08:00 |
songmiao
|
d1845f89fe
|
add fog test and arcball camera test
|
2015-01-07 11:47:34 +08:00 |
huangshiwu
|
f41f00fcb2
|
make rotated rect draw correctly
|
2015-01-07 11:44:16 +08:00 |
andyque
|
a1daba88f9
|
fix indent issue
|
2015-01-05 16:04:59 +08:00 |
andyque
|
56e333dc9b
|
fix crash on mac
|
2015-01-05 16:02:46 +08:00 |
andyque
|
2a266efc1a
|
fix CurlTest error code 23 on Windows
|
2015-01-05 15:55:40 +08:00 |
raydelto
|
e20c347767
|
Fixing typo in the constant INVAILD_AUDIO_ID of the new AudioEngine, changing it to INVALID_AUDIO_ID
|
2014-12-31 20:51:45 -04:00 |
Dale Stammen
|
5c79bf996d
|
delete first pass of allocations before starting second pass
|
2014-12-30 21:24:49 -08:00 |
minggo
|
d517831e01
|
Merge pull request #9699 from super626/fixandroid
fix background/foreground switch
|
2014-12-30 17:07:38 +08:00 |
yangxiao
|
3377c3ee53
|
fix #9689
|
2014-12-30 11:54:53 +08:00 |
yangxiao
|
bfb577e385
|
fix ##9689
|
2014-12-30 11:48:39 +08:00 |
minggo
|
3c1978fcc3
|
Merge pull request #9611 from super626/quaternion
Rotation With Quaternion
|
2014-12-30 10:09:08 +08:00 |
Thomas Hou
|
cfa9f039ec
|
change light direct for good look.
|
2014-12-29 16:43:48 +08:00 |
Thomas Hou
|
1502d32aac
|
use std math library M_PI instead of pi.
|
2014-12-29 16:24:31 +08:00 |
minggo
|
7db279220c
|
Merge branch 'quaternion' of https://github.com/super626/cocos2d-x into v3
|
2014-12-29 15:04:43 +08:00 |
yangxiao
|
060c6ee0b7
|
add quaternion test
|
2014-12-29 14:36:25 +08:00 |
minggo
|
212684fcd4
|
Merge pull request #9665 from andyque/fixLibpngWarning
Fix libpng warning
|
2014-12-29 10:00:43 +08:00 |
andyque
|
13032be21d
|
fix hd png file warning
|
2014-12-27 20:59:37 +08:00 |
andyque
|
9c974eebd0
|
fix libpng warning
|
2014-12-27 20:47:59 +08:00 |
lvlong
|
f592671df6
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
|
2014-12-26 13:42:13 +08:00 |
lvlong
|
fdb498a8d2
|
camera test
|
2014-12-26 13:37:02 +08:00 |
minggo
|
491d36c62b
|
Merge pull request #9626 from liamcindy/CocoReader
update for cocos reader
|
2014-12-26 09:29:37 +08:00 |
andyque
|
29e9ef7edf
|
Merge branch 'v3' into modifyWidgetDefaultBehavior
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
|
2014-12-25 18:08:07 +08:00 |
Liam
|
fa85faec68
|
update for cocos reader
|
2014-12-25 15:02:22 +08:00 |
youyou
|
f678d1027c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
|
2014-12-25 12:09:31 +08:00 |
youyou
|
db6ffd7962
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-12-24 15:59:50 +08:00 |
yusheng.lu
|
c64792959c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
|
2014-12-24 15:32:02 +08:00 |
minggo
|
bb9fb9f0d6
|
Merge pull request #9591 from liamcindy/Layout
update for lay out
|
2014-12-24 14:27:08 +08:00 |
yusheng.lu
|
fa5b4f8df7
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
resolve the conflicts
|
2014-12-24 13:06:38 +08:00 |