Dale Stammen
34df482893
disabled mandlebrot, julia and blur shader tests for winrt and wp8
2014-11-21 10:29:36 -08:00
Vladimir Timofeev
a689fc4c7e
sync with upstream
...
Conflicts:
CMakeLists.txt
2014-11-20 12:19:00 +03:00
yangxiao
3c0779885d
refact reskin test code
2014-11-19 16:50:09 +08:00
kaile.yin
eb9646ee3d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-11-19 10:58:19 +08:00
zhangbin
5aff5640b5
Solve the error when building android for sample projects of engine.
...
1. Update the project config.
2. Update the submodule cocos2d-console.
2014-11-18 18:39:53 +08:00
kaile.yin
bbd971d910
create ActionTimelineNode
2014-11-17 21:05:20 +08:00
zhangbin
365e09e5db
Merge branch 'v3' into support-wp8
2014-11-17 16:01:12 +08:00
Vladimir Timofeev
b5266e95bf
mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still)
2014-11-17 01:42:04 +03:00
Ricardo Quesada
dcc4c46d5b
Using std::swap instead of CC_SWAP
...
CC_SWAP is deprecated. Use `std::swap` instead.
2014-11-16 09:29:05 -08:00
Vladimir Timofeev
210d8ec985
Compile Box2D tests only if library used in cocos.
2014-11-15 21:16:01 +03:00
Ricardo Quesada
ac5ffea643
Merge pull request #9101 from super626/v3
...
Add uv animation test
2014-11-14 14:18:37 -08:00
zhangbin
4ef7c9f948
Modify the cpp template & tests to support compiling wp8-xaml & win8.1-universal project by console.
2014-11-14 16:48:14 +08:00
Ricardo Quesada
2e3b2d9f28
Merge pull request #9080 from vovkasm/cmake-refactoring
...
Cmake refactorings and fixes
2014-11-13 15:42:47 -08:00
yangxiao
e8fbf4d071
remove space line
2014-11-13 14:21:19 +08:00
yangxiao
ba51065f3a
remove space line
2014-11-13 14:19:51 +08:00
yangxiao
7395fb70f6
refact code style
2014-11-13 14:16:38 +08:00
tangziwen
3381400eec
trim uv_test texture's size
2014-11-13 12:06:52 +08:00
tangziwen
c33777a45a
remove dummy log
2014-11-13 11:57:18 +08:00
tangziwen
85f0b0ec29
fix resource miss
2014-11-12 17:44:19 +08:00
tangziwen
8101b6a94e
add UV Animation Test & it's resource
2014-11-12 17:42:45 +08:00
Dhilan007
e071e5c896
Fix Label may display incomplete for multiline text with outline feature enabled.
2014-11-12 17:24:35 +08:00
Vladimir Timofeev
72e59a53a8
cmake: Build application bundles on Mac for test applications (this allow run they from Xcode)
2014-11-11 10:30:48 +03:00
andyque
16d0419136
fix compile error
2014-11-10 16:02:06 +08:00
andyque
8433127b45
finish tests
2014-11-07 11:11:51 +08:00
andyque
4bfa94b8c2
add button flip test
2014-11-07 11:11:51 +08:00
andyque
5483bc834d
fix scale9sprite flip issue
2014-11-07 11:09:22 +08:00
minggo
25053b80bc
Merge pull request #8930 from super626/fixsprite
...
add Sprite3D::getMeshArrayByName and refactor re-skin test
2014-11-05 18:11:51 +08:00
Ricardo Quesada
3a34d6eb9d
Performance improvements
...
`Director::getMatrix()` returns `const Mat4`
2014-11-04 16:46:14 -08:00
Ricardo Quesada
2ec1170943
treat warnings as errors in samples
2014-11-04 15:42:29 -08:00
minggo
543c65c7b3
Merge pull request #8970 from super626/v3
...
refact 3d bundle code and fix sprite
2014-10-31 10:27:16 +08:00
yangxiao
77aebb657d
merge cocos
2014-10-30 11:56:20 +08:00
Dale Stammen
fa70e066a1
enabled FastTileMap test for WP8
2014-10-29 09:17:31 -07:00
lvlong
bdf10426e2
new axe.c3b (ver 0.4)
2014-10-27 16:12:15 +08:00
minggo
baff367c94
Merge pull request #8918 from dumganhar/iss8843-drawpoint
...
closed #8843 : Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-27 11:38:11 +08:00
yangxiao
20decd5a39
refact reskin code
2014-10-25 14:11:32 +08:00
James Chen
13b51f7c73
Small fixes in Sprite3DTest
2014-10-24 12:03:42 +08:00
James Chen
603700179e
closed #8843 : Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-24 12:03:11 +08:00
Dale Stammen
f42afaa6bb
updated project files with new pch files
2014-10-23 19:40:57 -07:00
Dale Stammen
af98442e1f
added projects Assets
2014-10-23 07:35:22 -07:00
Dale Stammen
fdfc05a823
removed old files
2014-10-23 07:35:19 -07:00
Dale Stammen
96daa12a42
added projects Assets
2014-10-23 07:35:05 -07:00
Dale Stammen
4f01036bc9
removed old files
2014-10-23 07:34:21 -07:00
Dale Stammen
3795d6ac28
removed old files
2014-10-23 07:33:14 -07:00
Dale Stammen
6005ffd89d
remove PhoneDirect3DXamlAppComponent namespace refactor
2014-10-23 07:30:13 -07:00
Dale Stammen
068e574090
cocos2d namespace refactor
2014-10-23 07:26:59 -07:00
Dale Stammen
d0891a9973
remove PhoneDirect3DXamlAppComponent namesapce refactor
2014-10-23 07:24:23 -07:00
Dale Stammen
f2d9fd2746
enabled tests for winrt
2014-10-23 07:23:13 -07:00
Dale Stammen
75d37a9cc4
no mp3 for winrt
2014-10-23 07:22:05 -07:00
minggo
b3288f7c27
Merge pull request #8893 from dabingnn/v3_fixTypo
...
[ci skip] fix typo
2014-10-22 14:16:07 +08:00
Huabing.Xu
ff27c3539d
[ci skip] fix typo
2014-10-21 17:37:00 +08:00
Dhilan007
4e7d03f0e5
Replace CCLOG with log in ConfigurationTest
2014-10-21 15:56:52 +08:00
minggo
f3e4c705eb
more warnings fixed
2014-10-21 11:47:28 +08:00
minggo
b2d1549686
Merge pull request #8869 from Dhilan007/v3-movefile
...
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
2014-10-20 18:10:52 +08:00
minggo
0dd8e89bb2
Merge pull request #8863 from Dhilan007/v3-labelfix
...
Fix wrong text color for system font on Linux/Window
2014-10-20 16:38:32 +08:00
Dhilan007
a5f838496c
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
2014-10-20 16:25:24 +08:00
minggo
8a76be13e4
Merge pull request #8865 from huangshiwu/v3_fixbug
...
add two missing image files for TexturePerfermancTest
2014-10-20 15:27:12 +08:00
minggo
f224f275ec
Merge pull request #8851 from pipu/#8838
...
Fixed #8838
2014-10-20 15:14:07 +08:00
huanghsiwu
8e6000ef56
add two missing image files for TexturePerfermancTest
2014-10-20 15:03:30 +08:00
Dhilan007
ae997f52ee
update test case of LabelTTF
2014-10-20 14:58:15 +08:00
pipu
8072328ca6
Modify that record path of .csb file
2014-10-20 11:56:48 +08:00
Huabing.Xu
86fedffd56
change asset manager to use a new resource, which will not affect other test cases
2014-10-20 11:03:13 +08:00
andyque
0dc7bbe861
fix long file path on WP8
2014-10-18 14:48:27 +08:00
Dhilan007
b5f91d17da
Fix [Node:clipping -> Clipping to RenderTexture] crash
2014-10-17 18:48:18 +08:00
minggo
d241e568b0
Merge pull request #8788 from samuele3hu/v3_new_spine
...
Update the deprecated Func and update bindings-generator
2014-10-17 16:35:51 +08:00
minggo
6367727e18
Merge pull request #8784 from pipu/v3_Modify_Bug_#8770
...
Fixed #8770
2014-10-17 15:47:30 +08:00
minggo
31664d979a
Merge pull request #8783 from andyque/adjustUITestProject
...
fix scrollView rotate issue
2014-10-17 14:54:32 +08:00
samuele3hu
14f91ea9f6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-17 14:38:07 +08:00
samuele3hu
dfd2077648
Update the related manifests files for assetsmanager tests
2014-10-17 14:35:52 +08:00
andyque
e76b605aeb
update css submodule
2014-10-17 14:22:48 +08:00
pipu
778701595c
Fixed #8770
2014-10-17 14:11:15 +08:00
andyque
952e52365b
fix scrollView rotate issue
2014-10-17 14:02:49 +08:00
andyque
8161d2ad34
fix scrollView rotate issue
2014-10-17 11:31:00 +08:00
andyque
812c2ecd0c
fix winRT macro
2014-10-17 10:09:05 +08:00
Dale Stammen
dc2f40fb8f
added missing tests
2014-10-16 11:14:56 -07:00
Dale Stammen
7ccc380e3f
enabled networking tests for winrt
2014-10-16 11:14:18 -07:00
Dale Stammen
a931f8c192
enabled console for winrt
2014-10-16 11:13:32 -07:00
Dale Stammen
ae7008fdd9
enabled console for winrt
2014-10-16 11:13:08 -07:00
Dale Stammen
3ab8292b5a
enabled console for WinRT
2014-10-16 11:12:37 -07:00
Dale Stammen
bcfd605361
added universal app cpp-test project files
2014-10-16 11:11:41 -07:00
minggo
07253cfb60
Merge pull request #8743 from andyque/removeWebView
...
remove UIWebView.cpp in win32
2014-10-16 21:06:53 +08:00
minggo
883230d9d8
Merge pull request #8758 from dabingnn/v3_fixVBOFullTest
...
change vbo full test
2014-10-16 19:36:01 +08:00
minggo
34cfcb0b54
Merge pull request #8690 from dabingnn/v3_spriteLamp
...
sprite lamp
2014-10-16 19:33:57 +08:00
minggo
8bf00bd4e6
Merge pull request #8748 from super626/cameraoperation
...
Modify camera operation
2014-10-16 19:29:55 +08:00
Huabing.Xu
a655a883f1
change vbo full test
2014-10-16 18:30:01 +08:00
minggo
064f0d9042
Merge pull request #8708 from dabingnn/v3_updateSpine
...
V3 update spine
2014-10-16 17:50:07 +08:00
yangxiao
1ed38334d9
remove unused variables
2014-10-16 17:44:04 +08:00
yangxiao
f13fdb5162
adjust
2014-10-16 17:40:41 +08:00
yangxiao
f5400b74a5
adjust
2014-10-16 17:38:42 +08:00
yangxiao
e5dedf062a
adjust
2014-10-16 17:37:05 +08:00
yangxiao
8e6728d8c0
change camera operation
2014-10-16 17:31:18 +08:00
minggo
0787a228d0
Merge pull request #8739 from huangshiwu/v3_iphone6hires
...
Add Default-667h@2x and Default-737h@3x launch images to support iPhone6...
2014-10-16 16:48:39 +08:00
Huabing.Xu
644aa19b2d
Merge branch 'v3' into v3_updateSpine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 16:48:16 +08:00
andyque
f3f15c58fe
remove UIWebView.cpp in win32
2014-10-16 16:46:49 +08:00
huangshiwu
0a04da0a10
Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode
2014-10-16 15:53:12 +08:00
minggo
fef079aee6
Merge pull request #8682 from super626/fixbillboard
...
Fixbillboard
2014-10-16 12:04:50 +08:00
samuele3hu
d997f72be2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-10-16 10:59:58 +08:00
minggo
8eed0811fa
Merge pull request #8717 from MSOpenTech/wp8-dll
...
New version of WP8 for cocos2d-x v3.3
2014-10-16 09:33:43 +08:00
Huabing.Xu
8135b09c98
Merge branch 'v3' into v3_updateSpine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-15 15:55:17 +08:00
SunLightJuly
f1ce16b463
added ClippingRectangleNode Test
2014-10-15 13:41:47 +08:00
samuele3hu
064e159c70
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
2014-10-15 13:41:27 +08:00