Vladimir Timofeev
0aecc15a25
Correct field initialization order in various places (Xcode warnings)
2015-05-01 12:19:30 +03:00
WenhaiLin
0e1338f6f8
Add test case for issue#10773
2015-04-30 16:11:59 +08:00
minggo
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
Dale Stammen
904abeab87
added CC_WINDOWS_PHONE_8_1 to preprocessor defines
2015-04-29 09:48:14 -07:00
WenhaiLin
ce7e36f76e
Fixed warns and crash on Win32.
2015-04-28 20:10:56 +08:00
Milos Jakovljevic
0343fd4061
Changing the name of the Action, adding more comments
2015-04-28 11:48:19 +02:00
WuHao
2b245e0318
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6
2015-04-28 15:19:52 +08:00
WuHao
9d46c5413d
added performance test for SpritePolygon
2015-04-28 15:18:40 +08:00
minggo
7ddbc59c95
Merge pull request #11622 from MSOpenTech/v3.6-winrt-fix
...
Use TextBMFont when text is updated from slider for faster performance
2015-04-28 11:55:33 +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
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
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
zhangbin
61cf0ad28b
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
2015-04-23 15:46:19 +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
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
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
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
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
cdd7acc537
add spine test case
2015-04-14 16:14:51 +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
minggo
da69dbd133
Merge pull request #11388 from xiaofeng11/v3
...
Reader update
2015-04-13 11: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
WenhaiLin
b5ae74c52b
[ci skip]Update the reference of submodule ccs-res.
2015-04-09 17:07:37 +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
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
WenhaiLin
16bce0bfd3
Fixed crashes in test case of Scene/Node.
2015-04-09 15:43:01 +08:00
WenhaiLin
2e24f302d6
Fixed the test case of BillBoard not respond click event as expected.
2015-04-09 15:08:49 +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
WenhaiLin
a378651320
Fixed some test cases of action not respond click event as expected.
2015-04-09 14:20:59 +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
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
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
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
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
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
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
zhukaixy
572ede87f2
correct for code indent
2015-03-26 10:05:43 +08:00
zhukaixy
aead9e5855
correct for code indent
2015-03-26 09:53:41 +08:00
lvlong
f93dffdeb0
node frame animation test and resource
2015-03-26 09:25:37 +08:00
lvlong
ecfd66cda3
node frame code!!!!!
2015-03-26 09:12:05 +08:00
zhukaixy
c1e5e47bdb
fix code style issue
2015-03-25 13:46:30 +08:00
zhukaixy
54472497a4
fix comments
2015-03-25 13:43:55 +08:00
zhangbin
7aaf122a41
Support compile & run test projects with cocos2d-console on wp8.
2015-03-25 11:42:55 +08:00
zhukaixy
2ebc854335
Modify code style
2015-03-25 11:36:11 +08:00
zhukaixy
6eaa78d1cb
add reload mechanism for TextureCube and Skybox
2015-03-24 15:43:59 +08:00
minggo
7e7cef3556
Merge pull request #11066 from super626/v3
...
Fix android switch back and foreground bug
2015-03-23 11:15:17 +08:00
XiaoYang
fcf6cab884
Merge pull request #262 from tangziwen/v3_abc
...
fix UVAnimation test while switching back to foreground
2015-03-23 10:38:11 +08:00
tangziwen
e213cd1747
fix UVAnimation test while switching back to foreground
2015-03-23 10:19:00 +08:00
pipu
0bdfe99731
Update resources of Test TestTimelineProjectNode.
2015-03-20 17:08:15 +08:00
Dale Stammen
73e01c0d5e
added missing PerformanceParticle3DTest.cpp to WP8 project
2015-03-19 05:53:37 -07:00
minggo
f3e518b103
Merge pull request #10985 from dabingnn/v3_fixRenderTextureCrash
...
fix crash problem when switch to a new scene after call RenderTexture::s...
2015-03-19 20:00:31 +08:00
minggo
1aec5a9508
Merge pull request #10980 from super626/v3
...
3d particle performance test
2015-03-19 20:00:07 +08:00
yangxiao
0d045feec5
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2015-03-19 18:10:41 +08:00
yangxiao
6c6fffc847
modify enum to static int
2015-03-19 18:10:16 +08:00
Huabing.Xu
8b04a15ee8
fix crash problem when switch to a new scene after call RenderTexture::saveToFile()
2015-03-19 16:39:45 +08:00
XiaoYang
dfe9e45d50
Merge pull request #259 from lvlonggame/camera_culling_crash
...
fix: Camera culling crash
2015-03-19 16:30:00 +08:00
tangziwen
f60649b39f
add particle-perf for win rt
2015-03-19 16:09:16 +08:00
lvlong
9e3ae9bfb5
remove get window size.
2015-03-19 15:24:58 +08:00
zhukaixy
0587122ccc
Move Skybox.shader from Sprite3DTest to Shader3D folder
2015-03-19 15:11:24 +08:00
lvlong
9c0b618046
Merge branch 'v3' of github.com:super626/cocos2d-x into camera_culling_crash
2015-03-19 15:04:18 +08:00
lvlong
7f18c9809c
fix :camera-culling MoveTo
2015-03-19 15:02:38 +08:00
yangxiao
0106c1184e
add pu for performance test
2015-03-19 15:00:07 +08:00
yangxiao
b6a29d80de
3d particle performance test
2015-03-19 14:43:29 +08:00
songchengjiang
9329ba1b37
add particle3D performance Test
2015-03-19 12:32:53 +08:00
yangxiao
e6770909f2
reset expolosion
2015-03-17 17:47:53 +08:00
yangxiao
dced8004e1
reset explosion and fix bug of event handler
2015-03-17 17:44:52 +08:00
Martin Konopka
2c80b6ae3a
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-15 00:10:08 +01:00
Martin Konopka
cd12d08a52
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-14 19:33:15 +01:00
Nite Luo
cfa1f0c84f
Merge pull request #10843 from konopka/fix_compiler_reorder_warnings
...
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
2015-03-13 21:12:35 -07:00
Nite Luo
3194da4e7d
Merge pull request #10720 from darkdukey/hide_cursor
...
Hide cursor
2015-03-13 10:48:15 -07:00
Huabing.Xu
67fef0eb5e
Merge pull request #10856 from super626/v3
...
modify dds to png
2015-03-13 17:00:26 +08:00
songchengjiang
7e5af41817
replace mp_fire_02_2x2.dds with mp_fire_02_2x2.png
2015-03-13 16:34:21 +08:00
Huabing.Xu
639ed335b3
Merge pull request #10839 from pipu/node_load_callback
...
To add the function node load callback called during create node from csb file.
2015-03-13 15:06:14 +08:00
songchengjiang
7026b89b02
fix the bug of moveTo
2015-03-13 11:35:58 +08:00
Martin Konopka
350b81501d
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
...
Initialization follows the order of declaration, not the order of the initialization list.
2015-03-12 23:47:58 +01:00
pipu
56c3d1c6f6
To add the function node load callback called during create node from csb file.
2015-03-12 17:36:39 +08:00
Dale Stammen
afd0fbab10
added missing /bigobj to c++ compiler command line options
2015-03-09 10:16:42 -07:00
Dale Stammen
a828f73ccb
updated expiration date of project certificates
2015-03-09 08:31:06 -07:00
yangxiao
8137b01f23
merge cocos
2015-03-06 18:31:57 +08:00
songchengjiang
444dbfdf9e
replace .mesh with .c3b
...
modify ParticleUniverse file structure
2015-03-05 14:54:32 +08:00
yangxiao
faf299c5a1
make path shorter
2015-03-05 13:24:06 +08:00
Nite Luo
95bd326829
Replace std::to_string
2015-03-04 01:42:24 -08:00
yangxiao
573fdafbd8
android work
2015-03-04 14:25:46 +08:00
andyque
942ceccd99
fix android and win32 compile error
2015-03-04 14:12:11 +08:00
yangxiao
68eaadaffb
merge cocos
2015-03-04 09:57:42 +08:00
Nite Luo
e23eeafa4d
Create test case for show/hide mouse
2015-03-03 14:52:55 -08:00
Dale Stammen
e93fe1b13b
Merge branch 'v3' into v3-wp8-fix
2015-03-03 08:40:07 -08:00
minggo
13e4525772
Merge pull request #10659 from super626/v3
...
Remove expolosion particle
2015-03-03 23:03:02 +08:00
yangxiao
36723fcb68
reset submodule
2015-03-03 18:34:51 +08:00
yangxiao
901cfd627b
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
2015-03-03 17:59:25 +08:00
songchengjiang
d25c025cbe
replace star.pu with lineStreak.pu
2015-03-03 17:53:19 +08:00
yangxiao
9e06a4b848
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
2015-03-03 17:47:22 +08:00
yangxiao
3db3d9ae11
merge cocos
2015-03-03 17:23:33 +08:00
songchengjiang
9bdcdec60a
add test demo
...
use particleSystemScaleVelocity
2015-03-03 15:10:42 +08:00
songchengjiang
a9eb4dc7f9
support read material files on linux
...
modify the name of getAliveParticleCnt function
2015-03-02 16:28:38 +08:00
songchengjiang
a71aed6cc8
mix particle with sprite3D
2015-03-02 13:51:43 +08:00
songchengjiang
5c460ebb2d
add/update particle files
2015-03-02 13:07:32 +08:00
yangxiao
924a3cdff0
create particle with pu and material
2015-02-28 14:26:33 +08:00
yangxiao
d5bde9e536
add missing material
2015-02-28 12:57:15 +08:00
yangxiao
218de84cc5
remove expolosion particle
2015-02-28 11:31:15 +08:00
Dale Stammen
fb25ce9d1b
disabled LTCG to speed up release builds
2015-02-27 11:10:33 -08:00
Dale Stammen
f68a966485
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
2015-02-27 11:07:51 -08:00
Dale Stammen
b5e936c657
disabled LTCG to speed up release builds
2015-02-27 10:43:13 -08:00
Dale Stammen
5e6865ce53
added missing CC_PLATFORM_WINRT
2015-02-27 10:38:18 -08:00
Dale Stammen
2eb919bb7a
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
2015-02-27 10:36:48 -08:00
minggo
b973d08b6e
Merge pull request #10608 from super626/v3
...
Add project function to camera and fix cocos ui bug
2015-02-27 11:47:55 +08:00
yangxiao
437a59fb9a
modify project & unproject api
2015-02-27 10:01:57 +08:00
minggo
95a9e7de04
Merge pull request #10539 from krishnanm86/knarasimhan_sourcerefactor_branch
...
Source refactor. Abstracted common functionalities from 4 onTouches meth...
2015-02-26 20:35:15 +08:00
yangxiao
f13237c013
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-02-26 17:27:42 +08:00
yangxiao
9a64eb18dd
add project function
2015-02-26 15:20:20 +08:00
Krishna
2018943d6d
Removed template argument from ontouchescommon
2015-02-26 07:05:44 +01:00
Nite Luo
dbba9e36a1
Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path
...
Fix win32 resource search path to be relative to the executable.
2015-02-25 20:24:07 -08:00
Ray
0f8f0322c8
fix ccs-res
2015-02-26 10:10:32 +08:00
Ray
83a7b8012c
3DParticle Reader and tests
2015-02-26 09:19:14 +08:00
Krishna
75d5e26340
Bug Fix. INcluding the required template type for the function declaration
2015-02-25 12:19:19 +01:00
Krishna
2d80518873
Introduced function declarators that were missing
2015-02-25 10:23:35 +01:00
Ray
ff07f62e83
fix CocosStudio 3DReader test resource
2015-02-25 15:49:04 +08:00
Ray
71f90306f7
update ccs-res submodule
2015-02-25 15:40:46 +08:00
Ray
94523b667a
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-02-25 14:19:37 +08:00
Ray
c66a4f28bc
Add CocosStudio UserCameraReader
...
fix Sprite3DReader Test
2015-02-25 14:19:08 +08:00
minggo
2f618a9e09
Merge pull request #10541 from lzbgt/master
...
fix the linker ld error when building
2015-02-25 11:00:49 +08:00
Ray
bd64321e30
fix commit
2015-02-23 23:57:41 +08:00
Ray
c5cc1ebaa2
fix test project
2015-02-23 16:35:46 +08:00
Ray
35e3e8d62d
Sprite3D Reader and tests
2015-02-23 00:34:30 +08:00
Bruce
95ba69c868
fix ld error when building
2015-02-22 00:08:27 +08:00
Bruce
9c2ecafeb4
fix ld error when building
2015-02-21 23:56:05 +08:00
Bruce
871489ec2d
fix ld error when building
2015-02-21 22:55:35 +08:00
Krishna Narasimhan
36be1ec24b
Source refactor. Abstracted common functionalities from 4 onTouches methods in Camera3dTest
2015-02-21 11:39:26 +01:00
Ray
80a5b201f8
3DNode Reader lua Test
2015-02-19 17:28:51 +08:00
Ray
73e40f1c4b
Node3DReader Test
2015-02-19 16:18:54 +08:00
Dale Stammen
76233d4c6e
added missing Particle3D files and tests
2015-02-16 10:41:03 -08:00
Dale Stammen
795f65c85f
added missing Particle3D files and tests
2015-02-16 10:01:09 -08:00
yangxiao
10a8613b36
android properties to 10
2015-02-15 17:22:39 +08:00
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
Vladimir Timofeev
5688202844
Modify MSVC project files to build executables in subfolders and properly copy resources to that subfolders.
2015-02-10 16:23:34 +03: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
yangxiao
19edeb971b
fix warning
2015-02-03 17:51:16 +08:00
yangxiao
3b4f35decd
Merge branch 'terrain' of https://github.com/super626/cocos2d-x into terrain
2015-02-03 17:39:02 +08:00
yangxiao
66da4e8096
mac work
2015-02-03 17:38:40 +08:00
tangziwen
ca018f9ff2
set appropriate LOD distance value
2015-02-03 17:35:52 +08:00
tangziwen
b0f7c232e2
fix test
2015-02-02 16:14:13 +08:00
tangziwen
10eced8b98
bug fix upload new sample texture
2015-01-30 15:46:39 +08:00
zhukaixy
f3536056d8
Simpilify skybox
2015-01-29 19:01:10 +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
zhukaixy
ee99700ec1
add test case TextureCube
2015-01-29 09:28:14 +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
WenhaiLin
7baf84c232
Add test case for issue#10232
2015-01-28 11:31:52 +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
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
tangziwen
9ec366a130
update terrain test add new method to get normal
2015-01-27 15:18:59 +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
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
tangziwen
d04b3feb50
add new test, fix memory leak
2015-01-23 18:09:54 +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
tangziwen
25cd1f4c02
update test
2015-01-20 10:34:30 +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
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
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
yangxiao
42c40d895f
enable disable culling using macro
2015-01-14 14:41:10 +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
WenhaiLin
e2c7743db1
Add test case
2015-01-09 18:51:30 +08:00
songmiao
9de5371202
fix bug and add notes
2015-01-09 10:23:40 +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
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
Liam
83fcf74882
update for code format
2014-12-24 10:56:01 +08:00
kaile.yin
942abfc654
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-12-24 10:53:09 +08:00
huangshiwu
01eeb15a8d
fix allocator related compile error on wp8/8.1 and winrt
2014-12-24 10:45:29 +08:00
yusheng.lu
d543f8f6a2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-23 16:12:50 +08:00
yusheng.lu
a781c974de
submodule ccs-res go forward to newest
2014-12-23 15:35:20 +08:00
yusheng.lu
58ba057228
revert submodule ccs-res
2014-12-23 15:27:21 +08:00
andyque
d8f726bc4f
modify widget default behavior
2014-12-23 15:03:31 +08:00
Liam
e4360b7616
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Layout
2014-12-23 14:15:55 +08:00
yusheng.lu
7eedef71e6
armature node test completed
2014-12-23 11:13:05 +08:00
yangxiao
3d77c7535d
merge cocos
2014-12-23 10:35:35 +08:00
Liam
2991b57ec6
update lay out reader and samples
2014-12-22 18:24:06 +08:00
lvlong
db9f4a23fe
feedback commit.
2014-12-22 18:13:07 +08:00
yusheng.lu
6de7fae114
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-22 18:00:08 +08:00
lvlong
abd9a35504
CameraClippingDemo: change the sprite number.
2014-12-22 17:48:34 +08:00
yusheng.lu
62c5df2d9d
armature node reader done (projs incompleted)
2014-12-22 17:35:39 +08:00
minggo
feacf75f12
Merge pull request #9575 from minggo/MoveTo-MoveBy-support-v3
...
#9555 MoveTo and MoveBy support Vec3
2014-12-22 15:57:12 +08:00
minggo
6195d260c1
Merge pull request #9574 from super626/v3
...
Add new test
2014-12-22 15:25:14 +08:00
Liam
8b32193e04
reset unused format changed
2014-12-22 15:15:40 +08:00
Liam
7c4d31feab
update for lay out samples
2014-12-22 14:51:50 +08:00
minggo
1268f73a7c
MoveTo and MoveBy support Vec3
2014-12-22 14:34:35 +08:00
yangxiao
7a332aef04
ios work
2014-12-22 14:17:48 +08:00
kaile.yin
9ef5d8213e
update submodule
2014-12-22 14:07:00 +08:00
kaile.yin
b924dafe83
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-22 11:14:31 +08:00
tangziwen
68177e41e9
update
2014-12-19 17:39:26 +08:00
tangziwen
395cf929a8
update
2014-12-19 17:22:17 +08:00
XiaoYang
9102c77840
Merge pull request #182 from lvlonggame/v3
...
camera frustum update
2014-12-19 16:14:01 +07:00
tangziwen
95bcfaaa3e
update test 15:29
2014-12-19 15:31:06 +08:00
WenhaiLin
4366fb7230
Fix compile error on WIN32.
2014-12-19 11:49:40 +08:00
tangziwen
1bbe9e249d
fix coding style
2014-12-19 11:22:59 +08:00
yangxiao
7137e49cd4
modify async load test fix crash
2014-12-19 10:22:42 +08:00
tangziwen
591edd8bad
update test
2014-12-19 09:05:53 +08:00
mannewalis
c05a6c877d
adding files to cmake files
2014-12-18 18:10:13 -05:00
lvlong
a5746dd2a0
1. modify Android.mk
...
2. modify DrawNode3D include path
2014-12-18 18:14:16 +08:00
lvlong
f6bea9b6bb
1.add camera culling.
...
2.add camera culling sample.
3.fix bug: load .obj file material.
2014-12-18 17:18:22 +08:00
tangziwen
086bca399f
add three samples -- toonshader fakeshadow lightmap
2014-12-18 16:09:29 +08:00
tangziwen
73014e8be3
asdasd
2014-12-17 13:31:35 +08:00
lvlong
73a2a6385a
add frustum culling.
2014-12-16 16:34:35 +08:00
mannewalis
640695c21c
reverting android properties change
2014-12-15 16:31:22 -08:00
mannewalis
9be9c09a9f
fixes to cpp-tests for android allocator tests
2014-12-15 16:21:39 -08:00
yangxiao
5ad408530c
merge cocos
2014-12-15 17:47:05 +08:00
mannewalis
bc7757a366
adding allocator system
2014-12-12 08:57:06 -08:00
minggo
cf8b6120a0
Merge pull request #9481 from super626/v3
...
CullFace state change bug and fix #9465
2014-12-12 15:48:31 +08:00
yangxiao
34b21dad6d
invalid texture parameter on release mode fix #9465
2014-12-12 15:05:55 +08:00
pipu
70b9767c56
1. Fixes #4957 that click test TestChangePlaySection, then it will crash.
...
2. Modify default value of selectedState to serialize check box data.
2014-12-11 11:34:31 +08:00
minggo
eef6d08813
Merge pull request #9402 from doomsdayer/v3_listview
...
V3 listview
2014-12-10 11:13:42 +08:00
yusheng.lu
c6ba594c72
listview resources added
2014-12-10 09:59:28 +08:00
yusheng.lu
7426a32d9f
1. ListView demo compeleted.
...
2. Optimized ListViewReader format.
2014-12-08 19:00:12 +08:00
kaile.yin
17bd5bf31e
update submodule
2014-12-05 20:27:10 +08:00
yangxiao
2a445ef1d9
correct unsuitable word
2014-12-05 16:44:49 +08:00
yangxiao
5e86d71fcc
modify async load sample
2014-12-05 15:44:09 +08:00
yangxiao
c99185b755
add async load test
2014-12-05 15:01:30 +08:00
kaile.yin
1db2bf89e0
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-05 14:42:25 +08:00
minggo
95302e18cc
Merge pull request #9354 from huangshiwu/v3_clippingnode
...
modify Clipping to RenderTexture Test to get correct behavior
2014-12-05 09:28:36 +08:00
youyou
2b7ead06de
update timeline test
2014-12-04 16:49:43 +08:00
kaile.yin
743166f50b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-04 15:32:25 +08:00
pipu
6d764bc2c8
Merge branch 'v3' into v3_flatbuffers
...
Conflicts:
tools/cocos2d-console
2014-12-03 15:47:03 +08:00
kaile.yin
fd69a5efc3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-03 15:22:46 +08:00
huangshiwu
ca10211b25
modify Clipping to RenderTexture Test to get correct behavior
2014-12-03 14:17:42 +08:00
minggo
2e45d7d0d6
Merge pull request #9302 from samuele3hu/v3_test
...
Fix some errors about cpp-tests and lua-tests
2014-12-03 14:05:50 +08:00
pipu
06a0026632
Update ActionTimelineTestScene
2014-12-02 16:00:30 +08:00
pipu
4d0950d828
Update submodule that are plugin, ccd-res bindings-generator, cocos2d-console
2014-12-02 15:56:32 +08:00
minggo
4d2ea40db0
Merge pull request #9265 from shrimpz/fix_label_crashed_on_android
...
Fix label crashed on android #9255
2014-12-02 15:48:10 +08:00
pipu
26a6c9a724
Modify libcocos2d_wp8.vcxproj, libcocos2d_wp8.vcxproj.filters, libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters, cpp-tests.Shared.vcxitems, cpp-tests.Shared.vcxitems.filters
2014-12-02 12:30:34 +08:00
pipu
1cbc0120be
Merge branch 'v3' into v3_flatbuffers
2014-12-01 22:56:18 +08:00
pipu
417fc3ca26
Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers
2014-12-01 22:35:08 +08:00
pipu
8041d9927d
Add CustomWidgetCallbackBindTest into CMakeLists.txt of cpp-tests
2014-12-01 22:33:47 +08:00
zhounan
1fcf6b5007
Update cpp-tests/proj.win32/cpp-tests.vcxproj, cpp-tests/proj.win32/cpp-tests.vcxproj.filters
2014-12-01 22:31:01 +08:00
pipu
09f0722f3a
1, Update cpp-testsComponent.vcxproj.
2014-12-01 22:23:54 +08:00
pipu
c2fc246ce9
Add CustomWidgetCallbackBindTest into Android.mk of cpp-tests
2014-12-01 22:07:16 +08:00
pipu
22b044805c
Add callback parse
2014-12-01 21:50:05 +08:00
pipu
584c7dc7c6
Delete that use protocol buffers
2014-12-01 12:46:29 +08:00
yangxiao
b476e65c6a
Merge branch 'newcode' into fixsprite
2014-11-28 14:33:04 +08:00
yangxiao
437ee04d5d
fix linux
2014-11-28 14:12:38 +08:00
samuele3hu
c1f718c3fd
Fix cpp-test compile error and a bug of Confined
2014-11-28 10:40:41 +08:00
Ricardo Quesada
fe4b34fcc3
Merge pull request #9260 from ricardoquesada/sprite_perf_test_automated
...
Sprite Performance Test automation works OK
2014-11-27 10:06:10 -08:00
Ricardo Quesada
7c89e9e94d
Compiles on VS2012
...
...hopefully. Using _MSC_VER < 1800 for CC_ROUND
2014-11-27 08:58:07 -08:00
Ricardo Quesada
1a2acb9039
including <math.h> to make VS2012 Express happy
2014-11-27 07:28:07 -08:00
Dhilan007
4cda033a04
Fixed compiling and linking error of lua tests when using NDK r10 above.
2014-11-27 13:56:15 +08:00
Ricardo Quesada
4f3621b85c
Compiles on VS2012...
...
hopefully
2014-11-26 20:23:16 -08:00
Ricardo Quesada
bfb79b6a9e
CCRANDOM_() uses std::rand() because it can be seeded with std::srand()
...
plus other minor fixes in perf tests
2014-11-26 20:07:42 -08:00
Shrimpz
c15f353382
* added a testcase for issue #9255
2014-11-27 11:03:11 +08:00
Ricardo Quesada
db71d562e9
Compiles on VS2013
2014-11-26 18:35:14 -08:00
Ricardo Quesada
74a5bbf280
some fixes for perf tests
2014-11-26 18:11:53 -08:00
minggo
e8cff91bd7
Merge pull request #9248 from andyque/fixTextIgnoreContentSizeIssue
...
Fix text ignore content size issue
2014-11-27 09:57:33 +08:00
Ricardo Quesada
96e089be76
Sprite Performance Test automation works OK
2014-11-26 16:55:39 -08:00
Ricardo Quesada
1361f2c619
Director users a low-pass filter to display the FPS
...
FPS is more stable. Uses a 5% low-pass filter
2014-11-26 13:31:44 -08:00
andyque
e118b085b8
add UIText bug fix tests
2014-11-26 15:05:20 +08:00
minggo
dbb473fdcb
Merge pull request #9203 from dumganhar/arm64-juno
...
Some updates for neon64 instruction
2014-11-26 11:46:19 +08:00
minggo
3d7c3257b0
Merge pull request #9238 from ricardoquesada/guideline_fixes
...
Code conforms with the cocos2d-x c++ guidelines
2014-11-26 10:49:58 +08:00
Ricardo Quesada
33a2d0451c
Code conforms with the cocos2d-x c++ guidelines
2014-11-25 17:53:52 -08:00
Ricardo Quesada
4cc59a9a0f
Merge pull request #9201 from MSOpenTech/v3-win8.1-appstate
...
V3 win8.1 universal app pause and resume support
2014-11-25 14:43:42 -08:00
Ricardo Quesada
9b5f147224
Fixes in async test
...
code is cleaner
2014-11-25 10:43:58 -08:00
Dale Stammen
8da06fb9cc
Merge branch 'v3' into v3-win8.1-appstate
2014-11-25 08:07:29 -08:00
James Chen
15333ca517
Merge branch 'arm64-juno' of https://github.com/dumganhar/cocos2d-x into arm64-juno
2014-11-25 17:03:28 +08:00
James Chen
6998d91781
MathUtilTest is only available for optimized instructions.
2014-11-25 16:36:07 +08:00
huanghsiwu
8db214a778
Adds PerformanceMathTest for wp8 and winRT
2014-11-25 11:30:00 +08:00
James Chen
dab99eeb8b
Adds PerformanceMathTest for win32.
2014-11-25 10:33:17 +08:00
James Chen
e31a3fce83
Typo fix for the name of MultiTouchTest
2014-11-25 10:33:16 +08:00
James Chen
19de8a0935
Adds PerformanceMathTest.cpp
2014-11-25 10:33:16 +08:00
James Chen
9248b56bde
Adds UnitTest for MathUtil
2014-11-25 10:33:16 +08:00
James Chen
9760dce4c0
Updates loop count and step count for Math performance test.
2014-11-25 10:33:16 +08:00
James Chen
54cd36d2d1
Adds Math Performance test.
2014-11-25 10:33:15 +08:00
minggo
b8bb61c7c6
Merge pull request #9028 from andyque/fixWidgetFlipIssue
...
Fix widget flip issue
2014-11-24 15:19:50 +08:00
Dale Stammen
316b68f783
added winrt and wp8 support for EVENT_RENDERER_RECREATED
2014-11-21 10:30:49 -08:00
Dale Stammen
7aaad84022
added winrt and wp8 support for EVENT_RENDERER_RECREATED
2014-11-21 10:30:14 -08:00
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
Huabing.Xu
c882fc02f1
spine runs on android platform
2014-10-15 13:35:22 +08:00
Huabing.Xu
b4526bd9e0
spine runs on android platform
2014-10-15 11:48:47 +08:00
Huabing.Xu
93158a1cfb
update spine runtime and test case
2014-10-15 11:23:02 +08:00
Dale Stammen
2ca1479840
updated WP8 test project files
2014-10-14 16:53:31 -07:00
Huabing.Xu
a20b8d671c
sprite lamp (works on iOS mac and android)
2014-10-14 16:54:52 +08:00
songchengjiang
081196c933
fixed BillBoard
...
Added New Test case
2014-10-14 15:08:36 +08:00
minggo
0ab3017094
Merge pull request #8658 from pipu/v3_pipu
...
V3 pipu
2014-10-14 14:25:46 +08:00
songchengjiang
ecd63db80b
Fixing bug
2014-10-13 19:10:42 +08:00
minggo
0351000c97
Merge pull request #8650 from dabingnn/v3_addStaggeredTileMap
...
V3 add staggered tile map
2014-10-13 13:50:50 +08:00
pipu
9503253a17
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu
2014-10-12 17:44:28 +08:00
pipu
50dee1a214
Reverting tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj
2014-10-12 15:53:32 +08:00
pipu
86aee1e548
Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk
2014-10-12 15:39:22 +08:00
minggo
c01d1b1166
Merge pull request #8646 from huangshiwu/v3_languagecode
...
fix bug that Application::getCurrentLanguageCode on ios and mac always r...
2014-10-11 16:23:49 +08:00
minggo
2db8217b09
Merge pull request #8543 from Dhilan007/v3-fixwarns
...
fix warns and memory leak
2014-10-11 16:07:54 +08:00
huangshiwu
4dd9120e67
fix bug that Application::getCurrentLanguageCode on ios and mac always return empty string
2014-10-11 15:19:20 +08:00
Huabing.Xu
7747e2ecf5
Merge branch 'v3' into v3_addStaggeredTileMap
2014-10-11 15:15:12 +08:00
Huabing.Xu
55431d6a83
add tile map staggered test
2014-10-11 15:09:58 +08:00
pipu
b732ce378e
Merge branch 'v3_pipu_protocol_buffers' into merge_test
...
Conflicts:
cocos/ui/UIScale9Sprite.cpp
2014-10-11 11:08:46 +08:00
pipu
ffd83bbdd0
Modifying win32 and wp8 protocol buffers lib
2014-10-10 22:38:34 +08:00
andyque
59ff2fbf72
remove dead code
2014-10-10 18:08:25 +08:00
andyque
0f0c3878e5
add more indicator
2014-10-10 17:36:33 +08:00
andyque
fb1adb5b90
add issue tests skeleton
2014-10-10 17:07:08 +08:00
Dhilan007
89db9ecd3b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn
...
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
2014-10-10 17:02:45 +08:00
andyque
da48649370
fix button title only content size issue
2014-10-10 11:01:51 +08:00
pipu
ee624e47cc
1. Modifying UIScale9Sprite
...
2. Updating UI Test
3. Updatding resource of ActionTimeline
2014-10-10 10:44:16 +08:00
pandamicro
a26e91f839
no message
2014-10-09 18:30:39 +08:00
pipu
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
Dhilan007
83150aa4d1
fix warns and memory leak
2014-10-09 17:19:43 +08:00
minggo
f928046f50
Merge pull request #8580 from Dhilan007/v3-labelfix
...
issue #8492:fix endless loop when dimensions that are not enough to fit one character
2014-10-09 17:05:39 +08:00
martell
73980195c0
wp8: use CC_STATIC because libs are static
2014-10-09 06:33:46 +01:00
Ricardo Quesada
27cb6afb5e
fixes warnings on Android
2014-10-08 18:55:33 -07:00
Dhilan007
8ea473de7b
fix endless loop when dimensions that are not enough to fit one character
2014-10-08 18:22:35 +08:00
Ricardo Quesada
84da993677
more samples using node::schedule(labmda)
2014-10-03 17:11:39 -07:00
Ricardo Quesada
342d934a0e
scheduler and macro fixes
...
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
2014-10-03 09:38:36 -07:00
Ricardo Quesada
42ace3e59c
Adds lambda support in node
...
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
2014-10-02 21:25:55 -07:00
Ricardo Quesada
12e9d18ab7
Compiles on Windows Phone 8
2014-10-01 19:08:34 -07:00
minggo
44aba5b2af
Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements
...
Scale9Sprite improvements
2014-09-30 17:09:02 +08:00
Sergey Perepelitsa
d9204b009e
scale9Sprite without scale9enabled scale fix
...
scale9Sprite crop > border tile bug fix
2014-09-30 10:59:20 +04:00
Dhilan007
90769ef242
fix compile error on win32
2014-09-30 14:40:24 +08:00
Dhilan007
02fcb6488a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/proj.win32/cpp-tests.vcxproj
2014-09-30 14:19:27 +08:00
Dhilan007
18307d52da
fix macro
2014-09-30 09:48:24 +08:00
Dhilan007
7ebe4a5548
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
...
Conflicts:
cocos/audio/AudioEngine.cpp
cocos/audio/apple/AudioPlayer.h
cocos/audio/include/AudioEngine.h
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
2014-09-30 09:45:47 +08:00
yangxiao
d680e58f80
merge cocos resolve conflict
2014-09-30 08:32:37 +08:00
Ricardo Quesada
a16c5d5e43
Adds missing includes
2014-09-29 14:45:43 -03:00
Ricardo Quesada
7a1dac5aa6
Fixes audio issues when using CMake on Mac
2014-09-29 14:07:11 -03:00
Dhilan007
f2f1331026
New Audio Engine[Win32]
2014-09-29 10:15:41 +08:00
yangxiao
dbf564208b
move light from 3d to base
2014-09-28 16:02:12 +08:00
Sergey Perepelitsa
094716a500
Scale9Sprite cropped frames tests
2014-09-28 01:58:26 +04:00
yangxiao
abd960725a
add to linux project
2014-09-26 16:54:01 +08:00
yangxiao
fd35d43510
remove unused resource
2014-09-26 15:57:18 +08:00
yangxiao
98d9cea774
merge cocos
2014-09-26 15:14:57 +08:00
yangxiao
db2ff49f26
adjust according to minggo
2014-09-26 14:13:26 +08:00
yangxiao
bf84aba47e
do not add ambient color by default
2014-09-25 16:27:31 +08:00
yangxiao
eab0951c2d
reset
2014-09-25 16:07:57 +08:00
yangxiao
567c632d98
config max support light number in shader
2014-09-25 15:29:32 +08:00
minggo
2620592d62
Merge pull request #7975 from newnon/v3_openUrl
...
openUrl function for all platform but on windows RT empty function
2014-09-25 13:41:08 +08:00
yangxiao
56313aa895
merge cocos
2014-09-25 11:05:02 +08:00
minggo
6a437d79b1
Merge pull request #8138 from MSOpenTech/wp8-v3.3
...
WP8 v3.3 bug fixes
2014-09-25 10:39:37 +08:00
minggo
04aa44aeea
Merge pull request #8141 from huangshiwu/v3_wp8test
...
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 09:40:10 +08:00
huanghsiwu
49f1927d5d
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 07:41:51 +08:00
andyque
53d28168fe
remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32
2014-09-24 16:39:32 +08:00
minggo
fdb30f1ee7
Merge pull request #8115 from Dhilan007/v3-audio903
...
New Audio Engine -MAC
2014-09-24 15:00:53 +08:00
Sergey Perepelitsa
d8216149de
precompiled headers improvements for iOS & Mac
2014-09-23 23:19:25 +04:00
Dale Stammen
b9c57f7e28
changed background-music-aac.wav to background.wav. background-music-acc.wav does not exist
2014-09-23 10:39:17 -07:00
Dhilan007
ed4e800d70
Add audio resource.
2014-09-23 15:38:40 +08:00
Sergey
b8b5397e4e
Tests for Mac/iOS android Linux & Windows
2014-09-22 17:54:49 +04:00
Guy Kogus
908311ff7f
Added tests for opening a URL.
2014-09-22 17:51:05 +04:00
Dhilan007
936c3b3f79
New Audio Engine -MAC
2014-09-22 15:38:12 +08:00
minggo
e8b20d8583
Merge pull request #8093 from wohaaitinciu/v3_WebView_win32
...
web view win32
2014-09-22 09:30:29 +08:00
minggo
681621805d
Merge pull request #8109 from andyque/fixTests
...
fix editbox test
2014-09-19 16:29:07 +08:00
yangxiao
06c0adcf6d
remove unused resource
2014-09-19 14:52:25 +08:00
andyque
7615eb8d39
fix editbox test
2014-09-19 14:21:18 +08:00
yangxiao
650f810815
add obb by default
2014-09-19 11:22:37 +08:00
songchengjiang
62777e9552
compile Android
2014-09-18 18:35:18 +08:00
songchengjiang
3c67515378
Finished light reconstruction
2014-09-18 16:38:35 +08:00
Jeff
418ec69abf
compile error
2014-09-18 15:18:30 +08:00
minggo
442f30af1f
Merge pull request #8091 from dabingnn/v3_PageTurnZFighting
...
new version of avoid z fighting in pageTurn
2014-09-18 10:50:31 +08:00
Huabing.Xu
39c6f9bfbd
remove setDepthTest(true) because it is not needed to be set for pageTurn
2014-09-18 10:00:36 +08:00
Jeff
e9c6f5d02b
fix compile errors
2014-09-18 01:30:14 +08:00
Jeff
27919dad77
add simple implement of WebView for win32
...
1.add simple implement of WebView for win32
2.Modify `std::string' to `const std::string &' as issues 7958 said
3.Open the test case in cpp-tests
2014-09-17 22:30:15 +08:00
Huabing.Xu
3a0e9be97e
new version of avoid z fighting in pageTurn
2014-09-17 18:33:18 +08:00
minggo
ccbf694927
Merge pull request #8086 from huangshiwu/v3_test
...
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView...
2014-09-17 14:50:42 +08:00
yangxiao
584284c847
merge cocos and rename lighttest
2014-09-17 14:26:57 +08:00
huangshiwu
c8bdba69ad
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView
2014-09-17 14:00:40 +08:00
andyque
6badfb30e1
add getTitleRenderer interface to UIButton
2014-09-17 10:57:40 +08:00
minggo
7d97aaeeb3
Merge pull request #8078 from minggo/SchedulerPauseResumeAll-issue
...
SchedulerPauseResumeAll can not resume at 5s
2014-09-16 17:30:20 +08:00
minggo
da29b92ff4
Merge pull request #8072 from Dhilan007/v3-audio903
...
move AudioEngine to cocos2d:experimental namespace
2014-09-16 17:12:03 +08:00
minggo
3de82474c0
SchedulerPauseResumeAll can not resume at 5s
2014-09-16 16:38:30 +08:00
huangshiwu
3907e5c1a2
fix ClippingNode's memory leak bug
2014-09-16 14:50:00 +08:00
Dhilan007
9942206c53
move AudioEngine in cocos2d:experimental namespace
2014-09-16 10:22:25 +08:00
minggo
27528f3e5f
Merge pull request #8061 from minggo/fix-cocostudio-test-crash
...
[ci skip]remove unneeded Android.mk
2014-09-15 22:53:18 +08:00
minggo
a61cda04ee
remove unneeded Android.mk
2014-09-15 22:47:44 +08:00
andyque
5f95ad221e
improve iOS WebView
2014-09-15 18:02:11 +08:00
minggo
68ab3082b4
fix warnings
2014-09-15 16:23:57 +08:00
minggo
7bb391ce55
Merge pull request #8033 from Dhilan007/v3-audio903
...
Lua bindings of AudioEngine.
2014-09-15 13:43:27 +08:00
andyque
030fe34afa
fix UI related warnings
2014-09-15 11:13:56 +08:00
andyque
7b0f41ed7b
remove auto scale text
2014-09-15 09:28:56 +08:00
Dhilan007
28af7999e5
update test case of AudioEngine
2014-09-14 22:49:27 +08:00
andyque
880929f102
fix button scale issue
2014-09-13 22:08:02 +08:00
huangshiwu
0addaf3912
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix
2014-09-12 15:38:29 +08:00
minggo
55783b66c2
Merge pull request #8012 from huangshiwu/v3_drawnode_prbk
...
V3 drawnode prbk
2014-09-12 15:17:49 +08:00
huangshiwu
11d8829b3a
Deprecate DrawPrimitives and enhance DrawNode --little modify
2014-09-12 14:50:41 +08:00
andyque
c81cfc1ecf
fix text doesn't scale with button issue
2014-09-12 14:24:27 +08:00
andyque
ed22792a72
fix text only button issue
2014-09-12 13:50:13 +08:00
huangshiwu
6182a872c6
Deprecate DrawPrimitives and enhance DrawNode --more modify
2014-09-12 11:12:20 +08:00
huangshiwu
147bb7301b
fix wp8 compile error --add BillBoard and BillBoardTest
2014-09-12 09:33:30 +08:00
huangshiwu
8922121ed1
Deprecate DrawPrimitives and enhance DrawNode --make some modify
2014-09-12 07:33:34 +08:00
huangshiwu
d9634057ab
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk
2014-09-11 16:41:54 +08:00
yangxiao
5274b4f958
merge cocos resolve conflict
2014-09-11 16:02:07 +08:00
yangxiao
9901cad113
merge cocos
2014-09-11 15:55:00 +08:00
yangxiao
df9ab144fe
light work
2014-09-11 15:46:32 +08:00
huangshiwu
fb1d47900c
Deprecate DrawPrimitives and enhance DrawNode
2014-09-11 15:39:56 +08:00
yangxiao
3cfc36591c
merge cocos
2014-09-11 10:13:57 +08:00
yangxiao
bb6f5a6be5
Merge branch 'newcode' into billboard
2014-09-10 16:27:59 +08:00
Dhilan007
fc27c5e32a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-09-10 14:35:33 +08:00
minggo
46d4f487bb
Merge pull request #7978 from super626/v3
...
Calculate Content Size for Sprite3D
2014-09-10 14:06:47 +08:00
yangxiao
a980a2efa4
merge cocos
2014-09-10 10:28:59 +08:00
andyque
acae8a2535
Merge branch 'v3' into addChipmunkStaticLib
...
Conflicts:
CMakeLists.txt
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/cocos2d_wp8.vcxproj.filters
cocos/CMakeLists.txt
2014-09-10 10:00:15 +08:00
Ricardo Quesada
f5cd48f154
Android properties back to 10
2014-09-09 18:46:47 -07:00
Ricardo Quesada
4d57e991ea
Compiles in Win32
2014-09-09 18:07:24 -07:00
Ricardo Quesada
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
Ricardo Quesada
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
Ricardo Quesada
0ead7b6307
Squashed commit of the following:
...
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
2014-09-09 12:18:31 -07:00
songchengjiang
4099015421
Sprite3D set default _contentSize by AABB
2014-09-09 17:47:34 +08:00
songchengjiang
117c38f806
Sprite3DHitTest use AABB testing
2014-09-09 17:05:33 +08:00
yangxiao
cf9094207a
merge cocos
2014-09-09 16:00:55 +08:00
andyque
6a4397a3eb
change toolset from 12.0 to 4.0
2014-09-09 15:57:21 +08:00
Dhilan007
6697989174
Update test case of AudioEngine.
2014-09-09 10:48:07 +08:00
yangxiao
a295159a3a
Merge branch 'newcode' into transition
2014-09-09 10:37:08 +08:00
Dhilan007
1b96b2ac87
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909
2014-09-09 10:32:56 +08:00
andyque
59dc56bfcb
remove chipmunk dependency
2014-09-05 21:59:30 +08:00
huangshiwu
01358f0b62
fix wp8 compile error and modify default resource path
2014-09-05 15:43:08 +08:00
yangxiao
730ab846c3
code adjustment
2014-09-05 14:59:14 +08:00
huangshiwu
7372604f7f
fix wp8 compile error and modify default resource path
2014-09-05 11:21:08 +08:00
Dhilan007
6b4b5ed943
Refactoring API:
...
1.Remove Singleton Pattern
2.Make AudioProfile clear.
2014-09-05 11:13:51 +08:00
yangxiao
8da7a4b2de
merge cocos reslove conflict
2014-09-04 17:40:14 +08:00
yangxiao
a5e1e692e8
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
2014-09-04 17:00:49 +08:00
liuliang
c42bef1f02
Add a bulletin board test example
2014-09-04 16:58:00 +08:00
yangxiao
d114e11a0b
android, linux and lua
2014-09-04 16:45:42 +08:00
yangxiao
ed63f01c7e
seperate billboard test from Sprite3D test
2014-09-04 16:27:18 +08:00
minggo
6539ff293d
Merge pull request #7940 from andyque/fixVs2013CompileError
...
Fix vs2013 compile error
2014-09-04 13:41:15 +08:00
Ricardo Quesada
047025696c
Merge pull request #7680 from andyque/fixNormalizedPosition
...
fix normalizedPosition bug
2014-09-03 10:07:22 -07:00
Dhilan007
a352a10d38
Add test case for new audio engine.
2014-09-03 18:20:31 +08:00
XiaoYang
58f4e84b9a
Merge pull request #126 from songchengjiang/billboard
...
Billboard
2014-09-03 18:12:08 +08:00
songchengjiang
68ce6449e8
repaired camera orientation
...
Testing RotateBy action
2014-09-03 17:17:57 +08:00
yangxiao
bb90fe48ef
merge cocos
2014-09-03 16:54:17 +08:00
yangxiao
1bd09f21d0
merge cocos
2014-09-03 15:42:58 +08:00
andyque
58f219fc20
test extension::Scale9Sprite and remove unused file compile flags
2014-09-03 15:00:09 +08:00
andyque
2e27a6865f
update project to vs2013
2014-09-03 14:10:38 +08:00
minggo
b37ef4e1c3
remove unneeded files
2014-09-03 11:52:19 +08:00
minggo
eee9ac626a
Merge pull request #7815 from andyque/mergeExtensionEditBox
...
merge extension EditBox to ui module
2014-09-03 11:25:10 +08:00
andyque
b00a7b3b38
add Node normalizedPosition bug test
2014-09-03 09:16:31 +08:00
andyque
a79d35d08b
remove NodeNormalizedPositionTest
2014-09-03 09:16:31 +08:00
andyque
fab9a0052b
fix normalizedPosition bug
2014-09-03 09:16:31 +08:00
yangxiao
8dff467b27
Merge branch 'newcode' into transition
2014-09-03 09:15:12 +08:00
andyque
dafbf28283
fix release mode compile error
2014-09-02 16:42:23 +08:00
andyque
fadfa87afd
fix vs2013 compile error
2014-09-02 16:42:04 +08:00
songchengjiang
18d06015c6
Added More Models
...
Code optimization
2014-09-02 11:24:19 +08:00
andyque
c13e7b7224
Merge branch 'mergeExtensionEditBox' of github.com:andyque/cocos2d-x into mergeExtensionEditBox
2014-09-02 10:06:17 +08:00
andyque
6dc45f86e4
fix windows compile error
2014-09-02 10:05:22 +08:00
andyque
fa33ab76fc
remove UIEditBox test
2014-09-01 18:23:45 +08:00
andyque
e24192aeb2
fix linux compile
2014-09-01 18:06:21 +08:00
andyque
ffee7b27d4
fix linux and android compile error
2014-09-01 17:43:40 +08:00
andyque
85ce801fdd
remove ccscale9sprite , cceditBox
2014-09-01 17:06:22 +08:00
andyque
0076953f97
fix iOS compile error
2014-09-01 15:55:09 +08:00
andyque
aef0f5e729
Merge branch 'v3' into mergeExtensionEditBox
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/Android.mk
cocos/ui/CMakeLists.txt
cocos/ui/proj.win32/libui.vcxproj
cocos/ui/proj.win32/libui.vcxproj.filters
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
2014-09-01 15:26:25 +08:00
yangxiao
538fe2e543
Merge branch 'newcode' into transition
2014-09-01 15:14:30 +08:00
songchengjiang
3f8b430b3e
deleted Meshcommand
2014-09-01 09:33:08 +08:00