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
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
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
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
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
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
andyque
8a9f420735
fix side effect of ui::button clone
2015-04-16 14:38:00 +08: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
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
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
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
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
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
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
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
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
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
000e34c6d0
merge cocos
2015-03-26 12:50:18 +08:00
yangxiao
84535feb0c
merge cocos
2015-03-26 11:59:26 +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
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
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
lvlong
9e3ae9bfb5
remove get window size.
2015-03-19 15:24:58 +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
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
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
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
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
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
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
218de84cc5
remove expolosion particle
2015-02-28 11:31:15 +08:00
Dale Stammen
5e6865ce53
added missing CC_PLATFORM_WINRT
2015-02-27 10:38:18 -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
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
c66a4f28bc
Add CocosStudio UserCameraReader
...
fix Sprite3DReader Test
2015-02-25 14:19:08 +08:00
Ray
bd64321e30
fix commit
2015-02-23 23:57:41 +08:00
Ray
35e3e8d62d
Sprite3D Reader and tests
2015-02-23 00:34:30 +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
yangxiao
51ae806700
remove unused code
2015-02-13 16:19:38 +08: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
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
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
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
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
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
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
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
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
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
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
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
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
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
7426a32d9f
1. ListView demo compeleted.
...
2. Optimized ListViewReader format.
2014-12-08 19:00:12 +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
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
1cbc0120be
Merge branch 'v3' into v3_flatbuffers
2014-12-01 22:56:18 +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
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
6998d91781
MathUtilTest is only available for optimized instructions.
2014-11-25 16:36:07 +08:00
James Chen
e31a3fce83
Typo fix for the name of MultiTouchTest
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
bbd971d910
create ActionTimelineNode
2014-11-17 21:05:20 +08: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
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
c33777a45a
remove dummy log
2014-11-13 11:57:18 +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
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
Dale Stammen
fa70e066a1
enabled FastTileMap test for WP8
2014-10-29 09:17:31 -07: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
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
f224f275ec
Merge pull request #8851 from pipu/#8838
...
Fixed #8838
2014-10-20 15:14:07 +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
6367727e18
Merge pull request #8784 from pipu/v3_Modify_Bug_#8770
...
Fixed #8770
2014-10-17 15:47:30 +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
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
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
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
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
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
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
93158a1cfb
update spine runtime and test case
2014-10-15 11:23:02 +08: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
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
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
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
minggo
44aba5b2af
Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements
...
Scale9Sprite improvements
2014-09-30 17:09:02 +08: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
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
98d9cea774
merge cocos
2014-09-26 15:14:57 +08:00
yangxiao
bf84aba47e
do not add ambient color by default
2014-09-25 16:27:31 +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
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
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
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
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
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
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
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
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
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
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
yangxiao
730ab846c3
code adjustment
2014-09-05 14:59:14 +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
ed63f01c7e
seperate billboard test from Sprite3D test
2014-09-04 16:27:18 +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
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
songchengjiang
18d06015c6
Added More Models
...
Code optimization
2014-09-02 11:24:19 +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
Ricardo Quesada
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
Ricardo Quesada
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
yangxiao
a039d6b0fc
animate3d transition
2014-08-29 18:25:42 +08:00
songchengjiang
9f715e4e00
Added Sprite3D Model
2014-08-29 18:18:19 +08:00
songchengjiang
0d75998027
pressure test
2014-08-29 17:58:20 +08:00
songchengjiang
4aa4287d28
test on Android
2014-08-29 17:29:15 +08:00
songchengjiang
34070677ad
Added testing Model Number
2014-08-29 17:11:18 +08:00
songchengjiang
71d722854c
added mesh command
2014-08-29 12:08:28 +08:00
songchengjiang
701d70fb6c
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-29 10:58:04 +08:00
andyque
cd031c4493
Merge branch 'v3' into addWebView
...
Conflicts:
cocos/Android.mk
cocos/ui/Android.mk
2014-08-29 10:25:24 +08:00
songchengjiang
f5ea9a2219
tab format
2014-08-29 09:33:28 +08:00
songchengjiang
06e3eb955f
repaired BillBoard Depth Test
2014-08-29 09:30:59 +08:00
songchengjiang
ac8158c60b
Tab Format
2014-08-29 09:14:54 +08:00
songchengjiang
e16fb5977e
Finished BillBorad
2014-08-29 09:14:22 +08:00
songchengjiang
e6f055f3fd
calculated Z in View
...
Transparent Render
2014-08-28 19:22:01 +08:00
minggo
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
minggo
681c3c06f1
Merge pull request #7558 from newnon/v3_actions_by_tag_improvements
...
stopAllActionsByTag && removeAllActionsByTag
2014-08-28 14:24:37 +08:00
minggo
2fd6cf8f43
fix compiling error
2014-08-28 13:59:56 +08:00
minggo
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
songchengjiang
014ba0d12e
Merge branch 'light' of https://github.com/super626/cocos2d-x into light_new
2014-08-28 10:17:32 +08:00
songchengjiang
5067741140
Deleted Plane Model
2014-08-28 10:16:15 +08:00
yangxiao
d0943afb62
Merge branch 'light' of https://github.com/super626/cocos2d-x into light
2014-08-28 09:24:04 +08:00
yangxiao
74f98b36d6
merge cocos
2014-08-28 09:22:57 +08:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
Ricardo Quesada
dbdd2b3e13
Adds ClippingNode bug test case
2014-08-27 10:54:15 -07:00
songchengjiang
26dc7de802
Repaired Light Shader BUG On ios
2014-08-27 21:03:52 +08:00
songchengjiang
731d1165c3
Spot Light Shader optimization
2014-08-27 17:09:20 +08:00
minggo
d0ca9a4da5
remove unneeded include header files
2014-08-27 13:39:50 +08:00
yangxiao
c5515874d5
merge cocos
2014-08-27 11:00:14 +08:00
andyque
4597de069d
improve test case and make program more robust
2014-08-27 08:02:22 +08:00
andyque
84c5542a0e
Merge branch 'v3' into addWebView
2014-08-26 22:11:35 +08:00
andyque
9449152caf
finish WebView Tests
2014-08-26 22:03:55 +08:00
andyque
15815118a2
finish android version
2014-08-26 16:53:37 +08:00
yangxiao
7d6b8ea706
merge cocos
2014-08-26 14:58:58 +08:00
yangxiao
03390a4f46
merge cocos
2014-08-26 14:05:59 +08:00
andyque
e12db46866
fix style
2014-08-26 12:08:26 +08:00
andyque
2226d4b420
change WebView namespace and add WebViewTest
2014-08-26 11:39:56 +08:00
songchengjiang
3d59aaf86e
Replaced Tab Format
2014-08-26 09:43:11 +08:00
yangxiao
cff5b65314
Merge branch 'newcode' into v3
2014-08-25 21:20:49 +08:00
yangxiao
dd93439c4b
replace model
2014-08-25 19:25:51 +08:00
songchengjiang
00085c157f
Added skeleton Model
...
Light On/Off
2014-08-25 16:32:15 +08:00
songchengjiang
1a1ccda3ed
repaired Action BUG
2014-08-25 13:58:15 +08:00
yangxiao
8bfd56c080
use normal walk
2014-08-25 11:31:38 +08:00
minggo
dcea3b6134
Merge pull request #7843 from huangshiwu/v3_glviewattrs
...
V3 glviewattrs
2014-08-25 09:46:19 +08:00
minggo
0701fe1dfb
Merge pull request #7853 from super626/v3
...
Better reskin model support
2014-08-22 19:18:47 +08:00
huangshiwu
07af58c0c2
OpenGL context attributions setting revise -2
2014-08-22 16:22:16 +08:00
yangxiao
1db3d14896
reset bone number to 60, put test in alphabetical order
2014-08-22 16:06:36 +08:00
yangxiao
1938817187
reset girl name
2014-08-22 14:24:40 +08:00
minggo
aba973b1ea
Merge pull request #7834 from andyque/improveUI
...
add click event listener to all Widget classes
2014-08-22 14:00:10 +08:00
yangxiao
d90572fc10
engine refactor hide concept of submesh
2014-08-22 13:52:03 +08:00
minggo
a0b19db670
Merge pull request #7840 from minggo/fix-warning
...
fix warnings
2014-08-22 13:41:31 +08:00
yangxiao
2d5431353a
engine adjust
2014-08-22 13:25:26 +08:00
andyque
84cf0ee834
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
2014-08-22 11:49:39 +08:00
huangshiwu
7dec715288
OpenGL context attributions setting revise
2014-08-22 10:55:39 +08:00
minggo
2afbc7a698
fix warnings
2014-08-21 16:21:23 +08:00
songchengjiang
5bad6e216b
Added No Normal Shader
2014-08-21 10:33:16 +08:00
andyque
3f51926c5d
add click event listener to Widget
2014-08-21 10:21:07 +08:00
huangshiwu
2369a5900d
merge v3 to v3_glviewattrs
2014-08-21 10:18:55 +08:00
huangshiwu
2a03bea1a4
OpenGL context attributions setting
2014-08-21 09:35:32 +08:00
yangxiao
bd4aec4bcd
support multi-attribs
2014-08-20 18:20:19 +08:00
songchengjiang
26cb5d8bae
Replace Tab Format
2014-08-20 16:43:01 +08:00
songchengjiang
3a1c0583fb
optimization
2014-08-20 16:41:45 +08:00
andyque
2d8bec2ba9
remove Extension EditBox
2014-08-20 16:20:57 +08:00
songchengjiang
8b5bd3dbb6
Repaired the errors of Shader PassValue On Android
...
Light modification
2014-08-20 16:20:22 +08:00
andyque
46f3ab9b57
add Scale9Sprite to create method of ui::EditBox
2014-08-20 16:08:28 +08:00
songchengjiang
58abc4c08f
Light Shader modification for Android
2014-08-19 19:24:19 +08:00
andyque
a8ab1a85b7
fix linux compile error
2014-08-19 17:42:17 +08:00
Sergey
b7fa3624cf
stopAllActionsByTag test
2014-08-19 13:31:19 +04:00
songchengjiang
4cf1c6a47c
deleted redundant code
...
Replace Tab Format
2014-08-19 16:32:49 +08:00
songchengjiang
d9bf2c2b7e
Finished Light And Test
2014-08-19 15:51:30 +08:00
yangxiao
54423efe9f
fix reskin
2014-08-19 15:25:00 +08:00
XiaoYang
9f444b7010
Merge pull request #104 from liuliang2004/Meshv3
...
Modification is compatible with the old model
2014-08-19 14:32:05 +08:00
liuliang
94be97f724
Modify change interface
2014-08-19 14:30:27 +08:00
liuliang
06dfaf9db5
Modify change interface
2014-08-19 14:21:48 +08:00
liuliang
9d3bab3810
Modification is compatible with the old model
2014-08-19 14:03:41 +08:00
songchengjiang
680f089ae1
Shader: Light struct modification
2014-08-19 13:54:30 +08:00
andyque
8d1c422ac5
merge extension EditBox to ui module
2014-08-19 10:28:24 +08:00
minggo
38fdef614a
Merge pull request #7797 from andyque/addOptionsForWidgetEventHandling
...
add swallow touch and propagation to parent widgets customization
2014-08-18 23:16:22 +08:00
yangxiao
3fd122391c
reset sprite3dtest
2014-08-18 18:01:57 +08:00
songchengjiang
10afb9b9af
Finished Point Light
...
Finished Directional Light
Finished Spot Light
2014-08-18 17:10:07 +08:00
yangxiao
79a55286ce
refactor to new model
2014-08-18 11:13:08 +08:00
samuele3hu
6259aebdab
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
2014-08-17 23:45:56 +08:00
songchengjiang
9b3a02f350
Added Light Test
...
Added Point Light
2014-08-17 21:33:33 +08:00
yangxiao
7159914248
old model work
2014-08-16 16:56:04 +08:00
songchengjiang
2b1efc59cb
GLProgram Added Light Shader
...
GLProgram Added Normal Matrix
2014-08-15 19:15:14 +08:00
songmiao
08a4ebba06
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-08-15 17:43:04 +08:00
andyque
0517ceb0dc
add scrollView nested tests
2014-08-15 16:21:27 +08:00
songmiao
361770e0f3
add BillBorad and BillBoardTest
2014-08-15 16:15:29 +08:00
minggo
f2f8035724
Merge pull request #7708 from super626/obb
...
AABB, OBB
2014-08-15 15:32:14 +08:00
andyque
0e637b4d9f
add swallow touch and propagation customization to UIWidgets
2014-08-15 15:28:28 +08:00
minggo
8364e179a4
Merge pull request #7780 from andyque/addOptionsForHardCodedValue
...
add customization to UIButton and UIPageView
2014-08-15 15:16:12 +08:00
songchengjiang
1e9c02dfa3
Added Light Class
2014-08-15 14:51:23 +08:00
minggo
db17084b6d
fix warnings
2014-08-15 12:06:16 +08:00
yangxiao
ab783d2702
merge cocos2d
2014-08-14 17:12:39 +08:00
minggo
ae11f24cc8
Merge pull request #7779 from dabingnn/v3_fixSkinnedOutline
...
V3 fix skinned outline
2014-08-14 11:26:35 +08:00
andyque
18851d3e81
add customization to UIButton and UIPageView
2014-08-14 11:14:24 +08:00
Huabing.Xu
5d49afec0e
fix ios running error
2014-08-14 10:04:01 +08:00
minggo
a88504b153
Merge pull request #7756 from andyque/fixTestCase
...
fix custom particle tests position
2014-08-14 09:44:16 +08:00
minggo
0b86e129b0
Merge pull request #7762 from andyque/addAlignmentToUILabel
...
add UITextField color & place hold color, fix double delete bug
2014-08-14 09:38:57 +08:00
yangxiao
6ce3b5c20a
add mirror test
2014-08-13 17:38:16 +08:00
andyque
e2d609c05d
add UITextField color & place hold color, fix double delete bug
2014-08-13 11:28:37 +08:00
minggo
d223629477
Merge pull request #7754 from dabingnn/v3_addCallBackForRenderTexture
...
add callback for RenderTexture::saveToFile
2014-08-13 10:05:08 +08:00
andyque
e269ad49c1
fix custom particle tests position
2014-08-13 09:56:37 +08:00
minggo
cc37780861
Merge pull request #7736 from dabingnn/v3_addSkinnedOutline
...
V3 add skinned outline
2014-08-12 15:07:21 +08:00
boyu0
e4bb0ad3c8
fix some merge errors.
2014-08-12 11:39:56 +08:00
boyu0
5a2564755c
change NULL->nullptr
2014-08-12 11:29:37 +08:00
Huabing.Xu
3a7b673164
add callback for RenderTexture::saveToFile
2014-08-12 10:50:57 +08:00
boyu0
790ef9e818
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step
...
Conflicts:
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h
2014-08-12 10:20:34 +08:00
Huabing.Xu
e387caf763
add create(modelPath) interface for EffectSprite3D
2014-08-12 09:56:25 +08:00
Huabing.Xu
0dff45cfc2
adjust SkinnedEffectCode
2014-08-12 09:51:03 +08:00
Huabing.Xu
e66d1f6f69
add skinned outline effect
2014-08-11 18:11:15 +08:00
minggo
b34e97cfd6
Merge pull request #7729 from andyque/fixCascadedColor
...
fixed Widget's Children reload textures change RGBA issue
2014-08-11 15:33:36 +08:00
andyque
cdb2b9f59f
fixed Widget's Children reload textures change RGBA issue
2014-08-11 15:04:00 +08:00
yangxiao
6d15c26a61
move create default camera to Scene::initWithSize
2014-08-11 10:55:14 +08:00
Huabing.Xu
7e1adeb3e9
add new test case
2014-08-08 18:01:36 +08:00
lvlong
8101e2ff1a
1. move drawnode3d to Sprite3DTest
...
2. add getAABB to sprite3D and mesh
2014-08-08 17:54:39 +08:00
yangxiao
ceb6549ec8
merge cocos2d
2014-08-08 16:25:52 +08:00
minggo
213f2f5a6c
Merge pull request #7702 from super626/v3_merge
...
Camera and Camera test
2014-08-08 15:56:38 +08:00
yangxiao
7408250113
add drawline
2014-08-08 15:01:24 +08:00
andyque
d00e3349a3
fixed loadingBar change direction affect position issue
2014-08-08 11:17:17 +08:00
lvlong
28769c9b15
add obb sample
2014-08-08 11:16:33 +08:00
yangxiao
3c9483899e
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
minggo
4542b1882d
Merge pull request #7617 from rny/SpriteFrameCache
...
SpriteFrameCache load from plist file content data
2014-08-07 10:20:36 +08:00
minggo
cc75a8e860
Merge pull request #7632 from super626/v3
...
SubMesh and AttachMement
2014-08-05 09:59:38 +08:00
andyque
f44906d56c
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property
2014-08-05 08:11:37 +08:00
yangxiao
11a13ce9e2
Merge branch 'newcode' into v3
2014-08-04 15:41:21 +08:00
yangxiao
4452d9579a
merge cocos2d, fix lua
2014-08-04 12:07:27 +08:00
andyque
5af4657fbb
fix windows utf8 source code file can not compile erorr
2014-08-01 21:20:27 +08:00
huangshiwu
575c9787c0
Merge branch 'v3' into v3_pr
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
Ningyu
137de84b05
add test case
2014-08-01 14:39:45 +08:00
yangxiao
e03d284e26
merge cocos2d
2014-07-31 18:55:41 +08:00
minggo
2851bd9193
Merge pull request #7627 from andyque/fixScale9Sprite
...
refactor ui::widgets to use ui::Scale9Sprite instead of extension::Scale9Sprite
2014-07-31 16:58:56 +08:00
minggo
0e7eb3614e
Merge pull request #7618 from dabingnn/v3_buildAllTarget
...
add target to build All target
2014-07-31 14:25:37 +08:00
andyque
1de2b78d61
refactor, optimize Scale9Sprite
2014-07-31 11:07:20 +08:00
yangxiao
44c501ca2a
merge cocos2d
2014-07-31 09:56:23 +08:00
huangshiwu
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
Huabing.Xu
428e9b1b1a
Merge branch 'v3' into v3_buildAllTarget
2014-07-30 14:12:28 +08:00
andyque
f2b0528cc9
refactor
2014-07-30 10:45:35 +08:00
andyque
7abea5dc58
add utf8 support for UITextField
2014-07-30 10:34:37 +08:00
andyque
955da5d3cc
move utf8_substr to ui::helper class.
2014-07-30 10:34:37 +08:00
Huabing.Xu
d86cc0a811
decouple libcocos2d and cocosdenshion
2014-07-29 18:08:40 +08:00
andyque
c5ca0dbf10
fix android and linux compile error
2014-07-29 16:24:27 +08:00
andyque
1daaea1410
remove extension::Scale9Sprite dependency
2014-07-29 16:24:27 +08:00
andyque
ebf05d1acc
add UIScale9Sprite tests
2014-07-29 16:24:27 +08:00
boyu0
1b6cda488a
add ParticleResetTotalParticles test.
2014-07-29 11:21:11 +08:00
yangxiao
da4ba95806
SubMesh and Attachment
2014-07-29 10:49:06 +08:00
minggo
b2e705acd8
Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf
...
fix remove self in Widget touch callback issue
2014-07-28 14:04:20 +08:00
andyque
7353f8685a
Simplify Widget ContentSize cascade change algorithm
2014-07-25 14:59:58 +08:00
andyque
e56e015be2
minor modification of tests
2014-07-25 14:40:58 +08:00
andyque
3502cb0a23
fix remove self in Widget touch callback issue
2014-07-25 14:23:04 +08:00
minggo
20e3a61524
Merge pull request #7578 from newnon/v3_mac_custom_font_fix_v2
...
mac custom font fix v2
2014-07-25 11:38:38 +08:00
minggo
b0c922d91e
Merge pull request #7188 from pandamicro/FileUtils_FILE_API
...
Refactor #5580 : Add new file&directory apis into FileUtils and test cases
2014-07-24 22:18:10 +08:00
Sergey
92ac809bfe
Mac fonts tests
2014-07-24 12:27:17 +04:00
andyque
21f1624462
minor fix of RichText
2014-07-23 14:10:00 +08:00
minggo
524d9cb8af
Merge pull request #7552 from andyque/fixScale9Sprite
...
fix scale9Sprite addChild zorder issue
2014-07-22 18:39:04 +08:00
andyque
1f4c289db4
fix scale9Sprite addChild zorder issue
2014-07-22 16:26:40 +08:00
zhangcheng
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
pandamicro
d2c6602dea
Refactor #5580 : Merge createDirectories to createDirectory
2014-07-21 16:51:48 +08:00
minggo
21647839b6
Merge pull request #7515 from Dhilan007/v3-320final
...
fixed warn and replace 'printf' with 'log';
2014-07-18 13:56:54 +08:00
LinWenhai
c10e49201d
fixed compil
2014-07-18 13:44:07 +08:00
Dhilan007
5d22bca240
fixed warn and replace 'printf' with 'log';
2014-07-18 10:20:37 +08:00
Dale Stammen
88da5d5fdb
disabled custom shader tests for WP8
2014-07-17 08:13:49 -07:00
andyque
7ff78c61ba
fix richText UTF8
2014-07-17 18:36:09 +08:00
minggo
578af01ef1
Merge pull request #7499 from andyque/fixRichTextUTF8
...
fix richText utf8 error
2014-07-17 17:57:41 +08:00
andyque
fc2ab110cc
fix richText utf8 error
2014-07-17 17:58:40 +08:00
zhangcheng
6d0bf8e143
Merge branches 'v3' and 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fixesActionManagerCrash
2014-07-17 17:25:32 +08:00
zhangcheng
24d87ad05b
1. fixes ActionManagerEx crashes.
2014-07-17 17:24:41 +08:00
minggo
c482e2e14f
Merge pull request #7491 from Dhilan007/v3-320final
...
fixed text line wrap issue in UITextField.
2014-07-17 16:48:41 +08:00
Dhilan007
8ac1398037
fixed text line wrap issue in UITextField.
2014-07-17 16:23:38 +08:00
geron-cn
4e9a710053
fix binary test crash bug
2014-07-17 16:16:49 +08:00
geron-cn
441f0ebca8
fix binary test crash bug
2014-07-17 16:13:12 +08:00
geron-cn
1a2caaeebf
fix binary test crash bug
2014-07-17 16:09:17 +08:00
geron-cn
8212ed3822
fix binary test crash bug
2014-07-17 16:01:03 +08:00
andyque
4f5cd2a368
change FastTileMap to TileMap
2014-07-17 14:09:53 +08:00
minggo
c6349ef246
Merge pull request #7480 from visiblelight/wp8_fast_tmx_fix
...
disable FastTileMapTest on WP8
2014-07-17 13:35:52 +08:00
vision
c29766a4ad
disable FastTileMapTest on WP8
2014-07-17 12:56:58 +08:00
minggo
5a5b245e84
Merge pull request #7474 from andyque/fixFastTileMap
...
change FastTiledMap namespace to cocos2d::experimental
2014-07-17 10:52:40 +08:00
andyque
880c2c4c3f
change FastTiledMap namespace to cocos2d::experimental
2014-07-17 10:46:20 +08:00
minggo
4c7d777f25
Merge pull request #7471 from visiblelight/wp8_shader_update
...
Wp8 shader update
2014-07-17 10:14:54 +08:00
vision
40951d586c
update
2014-07-17 10:10:33 +08:00
vision
c47d844d20
update the buildin shaders on WP8. Disable the effect 3d test.
2014-07-17 10:08:49 +08:00
minggo
a653d0eb28
Merge pull request #7440 from boyu0/add_utils_atof
...
Add utils::atof(), fix bug: particle not shown on android.
2014-07-17 09:59:15 +08:00
zhangcheng
8bf4c8b6c9
1. Fixes CCTimeLine warning.
...
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
2014-07-15 18:07:33 +08:00
andyque
714048059c
fix loading bar switch loading method issue
2014-07-15 17:03:35 +08:00
andyque
52596dc97f
fix Text line wrap issue
2014-07-15 11:46:53 +08:00
boyu0
c7fec217ba
Change atof() to utils::atof()
2014-07-14 20:45:24 +08:00
minggo
6d063fb97b
Merge pull request #7431 from andyque/addTextFieldTTFTest
...
add TextField TrueTypeFont tests
2014-07-14 16:31:36 +08:00
Dhilan007
a5317dde87
fixed using the incorrect res in test case of 'TextureMemoryAlloc'.
2014-07-14 15:50:20 +08:00
andyque
4fe3723edf
add TextField TrueTypeFont tests
2014-07-14 14:29:28 +08:00
minggo
3b59b41116
3D:Sprite3D -> Node:Sprite3D
2014-07-12 22:26:46 +08:00
vision
7495a611ea
fix conflict
2014-07-11 16:03:40 +08:00
Dhilan007
d8cdb75851
Fix compile errors on WP8
2014-07-11 15:10:19 +08:00
andyque
43255e2b96
Merge branch 'v3' into addStudio1.4
...
Conflicts:
cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
2014-07-11 13:55:13 +08:00
minggo
6c37541657
Merge pull request #7363 from Dhilan007/v3-event-clear
...
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
2014-07-11 13:36:52 +08:00
andyque
f76f71eb5d
fix win32 & win8 compile error
2014-07-10 16:37:15 +08:00
andyque
eec40ff2a8
fix linux and android compile
2014-07-10 16:37:15 +08:00
andyque
6de47ea53a
update ccs-res and add custom ImageView and custom particle widget support
2014-07-10 16:37:15 +08:00
andyque
8b42eb4ce9
add Cocostudio 1.3,1.4, 1.5 ui tests
2014-07-10 16:37:15 +08:00
andyque
41ccd5e465
add v1.4 tests
2014-07-10 16:37:15 +08:00
andyque
937b0ab52a
add cocostudio parser test template
2014-07-10 16:37:15 +08:00
minggo
831b0b332b
Merge pull request #7371 from minggo/enumerateChildren-fix
...
Node::enumerateChildren just searches from itself
2014-07-10 15:46:04 +08:00
minggo
c7856b21fd
Merge pull request #7366 from Dhilan007/v3-fixed-warn
...
fixed warn and replace NULL with nullptr.
2014-07-10 15:42:02 +08:00
minggo
316564d58a
Node::enumerateChildren just searches from itself
2014-07-10 11:07:39 +08:00
Dhilan007
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
Dhilan007
dbcb20b886
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
...
Make clear EVENT_COME_TO_FOREGROUND event.
2014-07-09 23:03:04 +08:00
yangxiao
7b35f36ba3
Merge branch 'newcode' into v3
2014-07-09 09:56:23 +08:00
yangxiao
90b6841e25
adjust api according feedback
2014-07-09 09:53:15 +08:00
pandamicro
85d29ec803
Refactor #5580 : Refactor Hungary style code in test case
2014-07-09 09:52:21 +08:00
minggo
0f7968de89
Merge pull request #7339 from super626/v3
...
fix android, add 3d files to cocos2d.h and remove unused resources
2014-07-08 22:09:50 +08:00
minggo
f7af8938bd
Merge pull request #7277 from darkdukey/fix_rotation3D
...
Fix setRotation3D
2014-07-08 22:05:27 +08:00
andyque
2a2184331e
fix opacity issue when replace Widget textures
2014-07-08 11:30:27 +08:00
yangxiao
b19ca902ce
Merge branch 'newcode' into v3
2014-07-08 11:19:26 +08:00
yangxiao
75ee088631
resolve conflict Bone in cocos2d and cocostudio
2014-07-08 11:03:29 +08:00
minggo
3344ebbcdd
Merge pull request #7267 from andyque/addBinaryFileTests
...
add tests to GUI
2014-07-08 09:51:17 +08:00
andyque
9a77ea9d57
add nested layout
2014-07-07 15:48:50 +08:00
andyque
6f33e4b84f
add UIPageView button tests
2014-07-07 15:31:06 +08:00
minggo
8b00e72f33
Merge pull request #7311 from andyque/fixWindowsError
...
fix windows compile and running error
2014-07-04 13:44:55 +08:00
andyque
fc3caa1845
initialize member variable
2014-07-04 11:48:55 +08:00
minggo
95fe74a34b
Merge pull request #7299 from dabingnn/fast_tmx
...
Fast tmx
2014-07-04 09:49:30 +08:00
heliclei
3e75a10362
merge upstream/v3
2014-07-03 16:15:01 +08:00
heliclei
1f768f80aa
update curl test url
2014-07-03 16:08:34 +08:00
minggo
0be6d27271
Merge pull request #7295 from minggo/support-regular-expression
...
Support regular expression
2014-07-03 15:20:06 +08:00
Huabing.Xu
f3863eb072
add hex tile map test back
2014-07-03 11:31:30 +08:00
minggo
d8c9f6a0a6
add regular support in Node::enumerateChildren()
2014-07-02 17:07:36 +08:00
zhangcheng
9204ac28df
1. merge v3
2014-07-02 15:37:15 +08:00
Huabing.Xu
187646ef3f
Merge branch 'v3' into fast_tmx
2014-07-02 11:38:19 +08:00
Dhilan007
bcf2b0e2b6
fixed no response in test case of curl.
2014-07-02 10:18:07 +08:00
andyque
3304bba017
add switch method to all the GUI tests
2014-07-02 10:00:34 +08:00
andyque
21b11cc3c6
add switch method to LoadingBar, ListView , pageView and scrollView
2014-07-02 10:00:34 +08:00
andyque
f492643755
add switch method to UILayout and UIIamgeView
2014-07-02 10:00:34 +08:00
andyque
7fdc37a70e
add switch method to checkBoxTest
2014-07-02 10:00:34 +08:00
andyque
3326941939
add switch loading method to buttonTest
2014-07-02 10:00:34 +08:00
andyque
c3a5692e84
add test frame to UIScene_Editor
2014-07-02 10:00:33 +08:00
Nite Luo
4cb59683e4
Add Sprite3DRotation test
2014-07-01 12:36:53 -07:00
minggo
ca7e95b342
Merge pull request #7274 from Dhilan007/v3-320beta
...
fixed crash cause by addChild on win 7.
2014-07-01 22:15:26 +08:00
Dhilan007
6294a3024f
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gcsplitadapter
2014-07-01 19:10:15 +08:00
Dhilan007
6ba111cbff
fixed crash cause by addChild on win 7.
2014-07-01 18:23:20 +08:00
zhangcheng
02c7c93e43
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse
2014-07-01 16:36:37 +08:00
zhangcheng
4b8f818a1d
1、Update binary parse lib.
2014-07-01 16:31:17 +08:00
minggo
cc3a9d0737
fix crash caused by std::regex()
2014-07-01 16:09:25 +08:00
Huabing.Xu
e1d97ecb59
Merge branch 'v3' into v3_fix
2014-07-01 14:54:28 +08:00
Huabing.Xu
75c7777999
fix Effect3dSprite memory leak
2014-07-01 14:48:46 +08:00
minggo
80204e3048
Merge pull request #7201 from chengstory/cleanupBinaryLoader_AddSceneBinaryParse
...
Cleanup binary loader add scene binary parse
2014-07-01 13:47:35 +08:00
andyque
9ef0544953
call parent onExit method
2014-06-30 18:22:58 +08:00
Huabing.Xu
98d3e22777
re add commented test case back
2014-06-30 11:23:41 +08:00
Huabing.Xu
47471e202d
Merge branch 'v3' into fast_tmx
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
2014-06-29 20:23:43 +08:00
minggo
4f79176da2
Merge pull request #7234 from boyu0/iss5614_physics_transform
...
closed #5614 : add transform support for physics
2014-06-29 17:23:20 +08:00
Huabing.Xu
3771654e66
remove deprecated function
...
rename enum to static const member of class
remove hex tile map(we do not support it yet)
2014-06-27 18:00:06 +08:00
boyu0
fccc517eef
add test for physics transform.
2014-06-27 17:30:50 +08:00
yangxiao
4685a8654e
Animate3D transition
2014-06-27 17:02:08 +08:00
yangxiao
2a6ce26335
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-06-27 16:36:36 +08:00
yangxiao
343ef9ae55
update sprite3d test
2014-06-27 16:36:01 +08:00
lvlong
fac17097a0
add a new model and change girl model to it
2014-06-27 11:44:44 +08:00
yangxiao
392a769c8f
merge cocos2d v3
2014-06-26 22:48:42 +08:00
yangxiao
ccb39e51b2
animation3d transition not finished
2014-06-26 18:35:12 +08:00
minggo
768eb4e1d0
Merge pull request #7222 from minggo/warnings-fix
...
fix warnings
2014-06-26 17:24:13 +08:00
minggo
dc635db163
fix warnings
2014-06-26 16:15:02 +08:00
minggo
e0e9d3379c
Merge pull request #6948 from lite3/v3
...
Add immediate send request
2014-06-26 16:05:58 +08:00
minggo
2917596d5e
add utils::findChildren()
2014-06-26 14:05:30 +08:00
zhangcheng
a6d6287b29
1. remove hungary style.
...
2. fixes build error.
2014-06-26 10:08:17 +08:00
andyque
a4bd3879ac
fix ListView addChild problem
2014-06-25 16:17:16 +08:00
zhangcheng
bdf7be6fa0
1. add classname = "" log.
2014-06-25 14:32:38 +08:00
minggo
7eb6ed75b8
Merge pull request #7197 from andyque/dimissListViewFocus
...
dimiss ListView focus tests
2014-06-25 14:11:36 +08:00
andyque
634f1b58c4
add todo to reminder me
2014-06-25 14:10:53 +08:00
andyque
1902fdc9f4
dimiss ListView focus tests
2014-06-25 14:04:32 +08:00
andyque
6df8079fd7
closed #5591 , fix UIButton setTitleColor & getTitleColor not match
2014-06-25 13:47:29 +08:00
lvlong
7331ef49b6
don't rotate girl model
2014-06-25 13:29:45 +08:00
zhangcheng
644b61e261
1. add SceneBinary to 2.x
2014-06-25 11:58:36 +08:00
Huabing.Xu
290897af14
Merge branch 'v3' into fast_tmx
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-06-25 10:10:08 +08:00
minggo
63d0f66553
Merge pull request #7189 from andyque/feature5161
...
replace size with contentSize
2014-06-24 18:43:33 +08:00
pandamicro
9d450d6513
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into FileUtils_FILE_API
2014-06-24 14:57:12 +08:00
pandamicro
415f97b00f
Refactor #5580 : Add test case for FileUtils' file and directory manipulations
2014-06-24 14:51:35 +08:00
lvlong
dc0101737c
test for tony
2014-06-24 14:43:20 +08:00
lvlong
431378a41e
commit for tony test
2014-06-24 14:10:03 +08:00
minggo
4bb6545250
Merge pull request #7166 from boyu0/bug5541_rotation_action_for_physics
...
closed #5541 : Add rotation action support for physics.
2014-06-24 10:46:10 +08:00
andyque
199ad9c623
issue #5161 , replace deprecated methods
2014-06-24 10:18:01 +08:00
andyque
312ab4f396
Merge branch 'v3' into feature5161
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
2014-06-24 09:51:18 +08:00
yangxiao
c65e5d6872
simplify shader, bath sprite3D render
2014-06-23 19:08:26 +08:00
minggo
fc7b42c0e5
Merge pull request #7157 from 2youyouo2/v3
...
update action timeline
2014-06-23 18:38:46 +08:00
andyque
7eae7625c1
Merge branch 'v3' into cleanupBinaryLoader
2014-06-23 18:30:03 +08:00
andyque
e72d89ba2f
fix windows tests compile error
2014-06-23 15:21:25 +08:00
boyu0
c40c461848
closed #5541 : add warning code and comment.
2014-06-23 13:55:52 +08:00
andyque
c9bcbfb265
fix addEventListener hidden problem
2014-06-23 12:09:49 +08:00
andyque
5624da5448
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.h
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
2014-06-23 09:37:39 +08:00
lite3
ebbcb3ea33
change immediateSend to sendImmediate
2014-06-22 11:39:39 +08:00
lite3
7c65968b56
add immediateSend test
2014-06-22 00:11:20 +08:00
yangxiao
1e319bc1f8
fix compile bug
2014-06-20 22:38:09 +08:00
boyu0
2fa266e917
closed #5541 : change PhysicsActionTest for rotate action.
2014-06-20 18:42:36 +08:00
lvlong
478ea8949a
Merge branch 'v3' of https://github.com/lvlonggame/cocos2d-x into v3
...
Conflicts:
tools/bindings-generator
tools/cocos2d-console
2014-06-20 16:14:46 +08:00
lvlong
69436ddd65
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
cocos/3d/CCBundle3DData.h
2014-06-20 16:02:22 +08:00
lvlong
e4bbfad773
1. binary loader is OK.
...
2. add some comment.
2014-06-20 15:30:08 +08:00
andyque
5f5b705bee
refactor setSize to setContentSize and deprecated the old interface
2014-06-20 14:03:33 +08:00
yinkaile
1aa07906a1
add new line at the end of the file
2014-06-20 11:36:48 +08:00
andyque
4ca184b58a
issue #5161 , deprecated getSize
2014-06-20 11:18:53 +08:00
minggo
0d07e19cd1
Merge pull request #7054 from 2youyouo2/v3
...
add TimelineAction
2014-06-19 21:05:15 +08:00
gin0606
3ae8e29ce5
Add new line at the end of a file to *.h
2014-06-19 20:45:49 +09:00
gin0606
bf4f30d14b
Add new line at the end of a file to *.cpp
2014-06-19 20:45:24 +09:00
boyu0
5f10ff2c29
issue #4437 : change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2
2014-06-19 15:57:13 +08:00
lvlong
8493c4579b
before switch branch save
2014-06-19 15:43:02 +08:00
minggo
e60e3c217d
Merge pull request #7046 from Dhilan007/v3-label-improve
...
1.Support setting up the line height and additional kerning of label.
2014-06-19 09:44:51 +08:00
geron-cn
797085574c
add binary read to test-cpp
2014-06-18 20:13:06 +08:00
geron-cn
6abc9aba0e
add binary read to test-cpp
2014-06-18 20:09:12 +08:00
geron-cn
d2746f64a6
cpp-tests
2014-06-18 18:11:21 +08:00
Dhilan007
9351172baf
add test case for new API of Label.
2014-06-18 18:01:55 +08:00
andyque
aa5df68b96
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
cocos/3d/CCAnimationCurve.h
cocos/3d/CCAnimationCurve.inl
2014-06-18 15:13:34 +08:00
andyque
f614e9a89b
fix tests
2014-06-18 15:06:45 +08:00
andyque
95f1bd7e72
update loader
2014-06-18 11:54:25 +08:00
minggo
6ecca08340
Merge pull request #7039 from minggo/get-child-by-name
...
issue #4693 : add getName(), setName() and getChildByName()
2014-06-18 11:30:14 +08:00
andyque
2cef0cb437
update ccs-res
2014-06-18 11:26:26 +08:00
2youyou2
719fdb712d
add frame event test
2014-06-18 11:22:38 +08:00
andyque
ca24ad6768
Merge branch 'v3' into cleanupBinaryLoader
2014-06-18 11:19:19 +08:00
minggo
df798baa8b
Merge pull request #7059 from Rumist/v3
...
BUG FIX : #5553
2014-06-18 11:18:33 +08:00
2youyou2
806d74b6f9
add change play section test
2014-06-17 15:57:30 +08:00
yangxiao
17854cd922
change speed
2014-06-17 13:45:58 +08:00
2youyou2
d2a6782a9e
fixed start frame not right
2014-06-17 11:45:57 +08:00
minggo
53963a2441
issue #4693:enumerateChildren() support regular expression
2014-06-17 11:43:03 +08:00
2youyou2
7ee90b4114
add performance test
2014-06-17 11:13:46 +08:00
andyque
9ab45744bb
Merge branch 'v3' into cleanupBinaryLoader
2014-06-17 09:45:16 +08:00
yangxiao
9acd373a0e
make girl up
2014-06-16 19:41:10 +08:00
lvlong
32cc5b12d6
ready
2014-06-16 19:30:45 +08:00
lvlong
4b7f6a6185
static Sprite3D is ok
2014-06-16 19:08:43 +08:00
yangxiao
bc31d6b082
merge lv
2014-06-16 16:45:43 +08:00
lvlong
2840409933
for tony test
2014-06-16 14:09:41 +08:00
2youyou2
fda54a21f1
change test title
2014-06-16 09:45:44 +08:00
yangxiao
79d2de3b67
make character up
2014-06-16 00:31:31 +08:00
yangxiao
dd8f66ce57
merge loader
2014-06-16 00:01:38 +08:00
yangxiao
9dd7241176
load c3t animation work 90%
2014-06-15 22:45:56 +08:00
andyque
1d01fe8bbc
refactor
2014-06-15 16:12:24 +08:00
lvlong
4ae01d148f
11
2014-06-13 19:26:46 +08:00
2youyou2
369ed3e6d3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-13 18:00:01 +08:00
2youyou2
2031e0e92d
change TimelineAction to ActionTimeline
2014-06-13 16:03:03 +08:00
2youyou2
1c5d9ba212
remove resource to use armature resource
2014-06-13 14:41:28 +08:00
elsanide
4b7b32e81e
BUG FIX : #5553
...
Texture2dTest.cpp typo in #ifdef
Notice the W in CC_PLATFORM_WINRT is missing.
2014-06-13 15:24:37 +09:00
Huabing.Xu
4e94eaabed
Merge branch 'v3' into v3Animation
2014-06-13 12:06:11 +08:00
2youyou2
f63939945d
change NodeCache to NodeReader
2014-06-12 19:34:22 +08:00
lvlong
14f4b6430f
modify 3dloader, you can run animation.
2014-06-12 18:26:42 +08:00
2youyou2
e4f1ac6126
add hd resource
2014-06-12 17:38:26 +08:00
2youyou2
7eda0ae999
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-12 16:43:04 +08:00
lvlong
1ca69d2689
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
2014-06-12 16:28:36 +08:00
2youyou2
f536020d26
remove unused files
2014-06-12 16:21:41 +08:00
lvlong
742ea7f2df
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
2014-06-12 15:53:41 +08:00
boyu0
acb87f414e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fast_tmx
2014-06-12 14:44:28 +08:00
yangxiao
e37c6ab7ee
test action sequence
2014-06-12 14:20:38 +08:00
minggo
6845a69655
issue #4693 : remove unneede codes
2014-06-12 14:00:41 +08:00
minggo
990c491746
issue #4693 : add test case for getName, setName, getChildByName and enumerateChildren
2014-06-12 13:55:23 +08:00
boyu0
1df80a8ce4
closed #5537 : add test case
2014-06-12 12:57:29 +08:00
vision
97b578185d
new parameter for setting blur shader effect
2014-06-12 09:49:48 +08:00
2youyou2
4d1bf0c1a2
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
...
Conflicts:
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
2014-06-12 09:42:20 +08:00
youyou
28ae57c5fc
add AsyncReader
2014-06-12 00:38:23 +08:00
2youyou2
aa06fab776
support relative path for reading json
2014-06-11 21:11:22 +08:00
Huabing.Xu
65acec013b
Merge branch 'v3' into v3Animation
2014-06-11 17:45:31 +08:00
andyque
5515c43bb2
improve lasers
2014-06-11 15:16:08 +08:00
Huabing.Xu
18663609b4
add interface for speed and playback in animate
2014-06-11 15:07:37 +08:00
vision
e2c75c1f11
New shader for the blur effect, the old one is ineffecient and difficult to maintain.
2014-06-11 14:54:14 +08:00
andyque
2f6f1b7151
improve binary format
2014-06-11 14:45:35 +08:00
andyque
7a8f27ee0b
remove unused parser code
2014-06-11 14:15:34 +08:00
samuele3hu
54379f48a9
Fix the crash of Texture2dTest when `—ndk-mode` is `release`
2014-06-11 11:24:17 +08:00
2youyou2
09a2ceb7df
add TimelineAction
2014-06-11 11:10:07 +08:00
andyque
b895018765
update parser
2014-06-11 09:35:24 +08:00
yangxiao
6d09b50699
animation bug
2014-06-10 19:53:06 +08:00
andyque
48f7743daa
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-06-10 15:08:10 +08:00
yangxiao
a991940268
debug Sprite3D with .c3t
2014-06-09 18:37:58 +08:00
minggo
29ac8d746d
Merge pull request #7012 from Dhilan007/v3-testcast
...
update test cast of label.
2014-06-09 16:32:32 +08:00
andyque
c387ae3bc7
add text effect test
2014-06-09 14:34:46 +08:00
Dhilan007
791737befa
update test cast of label.
2014-06-09 13:41:32 +08:00
vision
361bfad5f8
initilization missed.
2014-06-09 11:39:19 +08:00
vision
ae16c88538
Save the bound texture unit so that the sampler can be updated dynamiclly.
2014-06-09 10:58:28 +08:00
yangxiao
0c95fe1fbd
animation test
2014-06-06 19:12:08 +08:00
boyu0
fc5e58b521
issue #4437 : add dirty tag.
2014-06-06 18:03:44 +08:00
boyu0
560053d23c
issue #4437 : add test and fix transform.
2014-06-06 17:33:27 +08:00
minggo
6cee3fe830
Merge pull request #6979 from visiblelight/TextureOptimize
...
Texture Optimize
2014-06-06 11:38:49 +08:00
vision
39f2669886
remove the new images and use the old ones.
2014-06-06 10:37:45 +08:00
vision
f7d5d837bf
add new tests for different pixel formats
2014-06-05 16:33:42 +08:00
andyque
c96a6086c3
improve parsing code
2014-06-05 11:43:43 +08:00
andyque
3dc6e86c25
add binary file parsing into ui tests
2014-06-05 10:25:45 +08:00
Ricardo Quesada
a11740ff29
ouch, more windows compile issues
2014-06-04 10:11:16 -07:00
Ricardo Quesada
59b966731e
Compiles on Windows and Android
2014-06-04 09:48:35 -07:00
Ricardo Quesada
79ebc546f8
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
...
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
2014-06-04 09:19:22 -07:00
minggo
a495747a7c
Merge pull request #6971 from andyque/refactorUIFramework
...
refactor ObjectFactory
2014-06-04 17:08:27 +08:00
minggo
a31710973c
Merge pull request #6962 from visiblelight/AlphaIssues
...
Fix a crash in ParticleTest->PremultipliedAlphaTest
2014-06-04 15:10:54 +08:00
andyque
38e274de73
refact ui header file include
2014-06-04 14:56:33 +08:00
minggo
7bf2be6033
Merge pull request #6959 from kezhuw/bugfix_autorelease_pool_manager
...
Bugfix autorelease pool manager
2014-06-04 14:31:30 +08:00
minggo
5432698674
Merge pull request #6969 from boyu0/bug5482_setPhysicsBody
...
closed #5482 : Node::setPhysicsBody() doesn't work after node added to another node.
2014-06-04 13:52:43 +08:00
boyu0
368c5b0d3b
closed #5482 : add a test case for bug 5482.
2014-06-04 11:59:15 +08:00
vision
ad230bb412
fix a crash in ParticleTest->PremultipliedAlphaTest
2014-06-04 10:39:18 +08:00
Kezhu Wang
dbca937835
add test case to break buggy code
2014-06-03 17:58:09 +08:00
minggo
691a77b148
Merge pull request #6928 from boyu0/bug5392_scheduleUpdate
...
closed #5392 : add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
2014-06-03 14:38:07 +08:00
Ricardo Quesada
b24c674d25
Little fixes for setNormalized
2014-05-30 21:50:39 -07:00
Ricardo Quesada
1b8d0d88df
Adds setNormalizedPosition()
...
Changes in `visit()` were done in order to do it
in a robust and fast way.
2014-05-30 16:42:05 -07:00
Huabing.Xu
2e42c77b9a
fix typo
2014-05-30 11:13:53 +08:00
Huabing.Xu
95b6fb52de
only use _backToForeGroundListner when on Android
2014-05-30 10:56:03 +08:00
Huabing.Xu
41d19007eb
Merge branch 'v3.1hotfix' into v3
...
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-05-30 10:19:56 +08:00
minggo
bfb3567131
Merge pull request #6924 from minggo/remove-test-case
...
Remove test case
2014-05-29 14:54:28 +08:00
minggo
e48b14b55d
Merge pull request #6932 from Dhilan007/v3-labelfix
...
Create a test case for issue 4999(label is unsharp if it's created by smaller font).
2014-05-29 14:54:16 +08:00
minggo
3182fd56b8
Merge pull request #6931 from VisualSJ/v3
...
Test case action name error
2014-05-29 14:07:23 +08:00
VisualSJ
dd2b7e036a
Test case action name error
2014-05-29 14:00:43 +08:00
Dhilan007
2a6158bae1
Create a test case for issue 4999(label is unsharp if it's created by smaller font).
2014-05-29 14:00:38 +08:00
boyu0
91db87a2f6
closed #5392 : add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
2014-05-29 13:51:43 +08:00
Huabing.Xu
8633ab9c14
add background/foreground listener for EffectSprite/Effect framework test case
2014-05-29 12:43:04 +08:00
Huabing.Xu
ad3b1cf827
add background/foreground listener for Effectsprite3d/Effect3d test case
2014-05-28 21:07:12 +08:00
minggo
d7cca2a044
closed #4819 : remove KeyboardTest
2014-05-28 18:31:00 +08:00
minggo
0acc4cd961
issue #4819 : remove KeyPadTest
2014-05-28 18:17:22 +08:00
minggo
0ad0f9c405
issue #4819 : remove AccelerometerTest
2014-05-28 18:10:37 +08:00
minggo
c44a5a2b3e
Merge pull request #6908 from dabingnn/v3_refactorEffect3DFrameWork
...
V3 refactor effect3 d frame work
2014-05-27 20:53:40 +08:00
minggo
99290b83c7
Merge pull request #6871 from asuuma/v3_Repeat_fix
...
Fix Repeat will run one more over in rare situations
2014-05-27 16:22:42 +08:00
Huabing.Xu
e59813476a
clclosed #5369 : Fix wrong logic when setTarget to Effect3D
2014-05-27 15:08:38 +08:00
minggo
0b661d8192
Merge pull request #6907 from visiblelight/screenshot_refactor
...
adding comments for the new utility
2014-05-27 14:52:09 +08:00
Huabing.Xu
453ff81d2a
closed #5369 : refactor Effect3d/EffectSprite3D framework to the pattern similar to Effect/EffectSprite
2014-05-27 14:50:46 +08:00
Ishiguro Yusuke
b8f9b1f20b
Add test case for reproducing Repeat bug
2014-05-27 15:40:38 +09:00
vision
e81db73b0a
adding comments for the new utility.
2014-05-27 14:29:52 +08:00
minggo
034e2c6f75
Merge pull request #6809 from heliclei/autotest-stop
...
Support autotest stop command
2014-05-27 14:01:38 +08:00
minggo
a01315e2f5
Merge pull request #6726 from visiblelight/screenshot
...
Add a new utility function to snap the screen
2014-05-27 11:18:25 +08:00
vision
363fd8dc2a
move the capturen screen interface from Director to ccUtils
2014-05-27 10:44:23 +08:00
andyque
9cef55d62c
issue #5176 , refactor FocusNavigationController
2014-05-27 10:20:37 +08:00
andyque
d8d5139aaf
closed #5176 , refactor UILayout and focus
2014-05-26 23:04:44 +08:00
vision
c72ae9e3c5
merge from the latest v3
2014-05-26 20:18:11 +08:00
vision
20bae53f4a
fixing typos
2014-05-26 16:32:13 +08:00
vision
28d30a5c40
fix a typo
2014-05-26 16:24:57 +08:00
andyque
40f2128acd
Merge branch 'v3' into 5176
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/UIPageView.cpp
cocos/ui/UIScrollView.cpp
cocos/ui/UIScrollView.h
2014-05-26 14:00:23 +08:00
vision
7edfe78f7d
remove the parameter rect
2014-05-26 13:42:47 +08:00
minggo
75cb686573
Merge pull request #6894 from andyque/refactor5183
...
refactor Layout, LayoutParameter and LayoutExecutant
2014-05-26 00:41:04 -05:00
andyque
634fea7c45
Merge remote-tracking branch 'upstream/v3' into refactor5183
2014-05-26 09:18:32 +08:00
vision
910099fbe5
add new interfaces for TextureCache to unbind the bound image asynchronous load callbacks.
2014-05-23 17:08:22 +08:00
Ricardo Quesada
5601048829
Fixes compiler warnings for mac and ios
2014-05-22 16:34:16 -03:00
andyque
1165ba8bc3
issue #5176 , readd addChild methods into UIListView
2014-05-22 17:49:19 +08:00
heliclei
5e4f481ae5
capture this instead of reference in lambda
2014-05-22 14:52:19 +08:00
andyque
3b777646c4
issue #5176 . fix UIScrollView
2014-05-22 11:01:58 +08:00
andyque
57d5e6f2d5
issue #5176 , add ListView focus test
2014-05-22 11:01:58 +08:00
andyque
fa5d43741c
fix keypad test
2014-05-21 10:46:26 +08:00
andyque
b07e82f7c3
Revert "Revert "Merge pull request #6752 from andyque/refactorLayout""
...
This reverts commit 1ed9b9749e
.
2014-05-20 16:17:10 +08:00
minggo
9a276c66a0
Merge pull request #6740 from zifter/FixProgressTo
...
Fix Progress Action. Not working with charging from 100 to 0.
2014-05-20 15:36:10 +08:00
andyque
1ed9b9749e
Revert "Merge pull request #6752 from andyque/refactorLayout"
...
This reverts commit ae118a9d22
, reversing
changes made to 6f2f2046c7
.
2014-05-20 14:36:29 +08:00
andyque
b6373b5303
Merge branch 'v3' into refactorLayout
2014-05-20 09:30:23 +08:00
minggo
cffd53ea94
accelerometer fix
2014-05-19 17:44:28 +08:00
andyque
ee24e137f7
issue #5183 , refactor obscure functions
2014-05-19 17:18:04 +08:00
andyque
121d6d3109
issue #5183 , refactor
2014-05-19 16:51:25 +08:00
heliclei
2ddfc45fee
support autotest stop
2014-05-19 13:46:17 +08:00
andyque
b89a073b90
replace texture resources
2014-05-19 12:09:55 +08:00
andyque
99f17ec88d
commnet out the Renderer test in PerformanceTest
2014-05-19 11:46:32 +08:00
Ricardo Quesada
6461e26c9f
Squashed commit of the following:
...
commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 14:03:53 2014 -0700
More WP8 fixes
commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c
Merge: c2b1619 fea335f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:41 2014 -0700
Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d
commit c2b1619005b5a62ef77afe727429584d6a57010e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:19 2014 -0700
Adds missing resources for Windows Phone 8
commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:54:15 2014 -0700
Updates CHANGELOG
commit b8b93da914de97662c9df55cfc351ad8b74ea779
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:48:59 2014 -0700
Adds Sprite3d files and tests
commit 059c842938e19068427bb2276d52f3e0ea1cc51f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:16:13 2014 -0700
fixes compiler warnings for windows
commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 10:53:34 2014 -0700
fixes for Sprite3D
Adds copyright header
removes compilation warnings
cleans code a bit
commit 1377787a4bcebdf349f9de0a05c329066c6eb626
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 20:46:26 2014 -0700
Merge pull request #34 from dumganhar/pull/6731
fix compilation error of missing bind Mesh for luabindings.
commit f89725f65ca604efb9abbcfe336c9d50135016b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:45:12 2014 -0700
use const & and changed typo
commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat May 17 11:43:10 2014 +0800
fix compilation error of missing bind Mesh for luabindings.
commit 59524b3850b27342f3cb4c390751bdf97362a794
Merge: ee4ec94
5c5a6b9
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat May 17 11:33:01 2014 +0800
Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731
commit 5c5a6b9bde410027db948b539bc3111dc243cf0b
Merge: d4285e3 5f41732
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:23:58 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit d4285e336808699f828b82c6b90a83b1b0c0978c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:22:49 2014 -0700
remove empty lines
commit 5f4173271101e2411ffb6cbf600066e204df98d3
Merge: e272583 ac8cf25
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 20:15:44 2014 -0700
Merge pull request #33 from dabingnn/mesh3d_work
Mesh3d work
commit ac8cf2571d92b03c9632d0415078d08526322289
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:14:01 2014 -0700
added mesh3d file to template
commit e272583cb8a7f41d8d74dbf7d7db71584187a779
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 19:10:45 2014 -0700
Merge pull request #32 from dabingnn/mesh3d_work
Mesh3d work
commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca
Merge: 4feae11 97cae73
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 18:18:13 2014 -0700
Merge branch 'v3' into mesh3d_work
commit 6a1b847065a1b9d369892ab011478c47e80c9195
Merge: 4feae11 4ece4b3
Author: Trace0429 <yangtuo0429@gmail.com>
Date: Fri May 16 17:15:39 2014 -0700
Merge pull request #31 from Trace0429/mesh3d_work
windows work now
commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Sat May 17 08:12:46 2014 +0800
windows work now
commit 4feae11577f64c3aff943af51adc37dcb987bdc1
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 16:32:58 2014 -0700
Merge pull request #30 from dabingnn/mesh3d_work
Mesh3d work
commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:32:00 2014 -0700
fix compile error after merge (MAC can work)
commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe
Merge: 510fc0c d19de29
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:24:11 2014 -0700
Merge branch 'v3' into mesh3d_work
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/cocos2d.vcxproj
cocos/2d/cocos2d.vcxproj.filters
cocos/Android.mk
cocos/CMakeLists.txt
cocos/renderer/CMakeLists.txt
commit 510fc0cea76bdedfae858bb930d98715ce54f7e9
Merge: e098ed7 7fea347
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 16:11:39 2014 -0700
Merge pull request #29 from dabingnn/mesh3d_work
Mesh3d work
commit 7fea34782f30ef0498a7a993016f45fcb786b771
Merge: a8a409a e098ed7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:08:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit a8a409a7d5280b1075eb6258ee556611a5cba7b3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:05:37 2014 -0700
bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw
commit e098ed7a5c187256be8313ec5d66294d3554c914
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 16:02:27 2014 -0700
bind buffer to 0 when finish draw
commit d13f637a3777e81085e0285faf00105c58229d7c
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 14:00:38 2014 -0700
fix outline width
commit 8a79c98b163ad862a2e09cbcc19a939f06556358
Merge: e208712 a0cf4ef
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:17 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e20871233915f8b6010e59595c38793ec3d6956e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:12 2014 -0700
make some member protected
commit a0cf4efc48af801636a55d1c330fb6841896d33b
Merge: c0b8902 8b723e8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:06:17 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d
commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:04:27 2014 -0700
linux work now
commit 8b723e82d81cbffd78e7378cab6d11df30baa044
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:48:34 2014 -0700
inc drawcall
commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c
Merge: 1e7032b e783da9
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:31:44 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e783da91fe6c14c8594d3da865e965256376dd10
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:31:31 2014 -0700
Merge pull request #28 from dabingnn/mesh3d_work
Mesh3d work
commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:30:01 2014 -0700
optimize code
commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:29:37 2014 -0700
adjust code style
commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b
Merge: 659fbd6 553acfb
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:06:53 2014 -0700
Merge pull request #27 from dabingnn/mesh3d_work
Mesh3d work
commit 553acfb3ee685f5461a6d2a68779200abcca8670
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:06:02 2014 -0700
fix visual error for outline
commit 659fbd652aa7f4c2d3629fe446051c3dd0377510
Merge: 056c3e1 c617bb7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:54 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:47 2014 -0700
fix shader, add multiple sprite to Sprite3DEffectTest
commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa
Merge: 94d7896 7b19c56
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 11:33:31 2014 -0700
Merge pull request #26 from dabingnn/mesh3d_work
Mesh3d work
commit 7b19c564e4053ad883617873b11043df1fb98a45
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:30:34 2014 -0700
share the same glprogram in effect3DOutline
commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:19:56 2014 -0700
add class static variable for EffectOutline
commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d
Merge: 213bbb0 6837cea
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:07:04 2014 -0700
Merge branch 'v3' into mesh3d_work
commit 213bbb0c289e579895e92620153b95a8cf374521
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:55:28 2014 -0700
add mesh.h in cocos2d.h
commit 94d789610c9d4426b14e655a73197c652afc74f6
Merge: fa69e09 9af9da5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 10:41:24 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 10:41:05 2014 -0700
remove namespace
commit 9af9da50a91804d11537cffe0750e486cf95c8a5
Merge: ff15926 8a38a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 10:30:23 2014 -0700
Merge pull request #25 from dabingnn/mesh3d_work
Mesh3d work
commit 8a38a384742ba130946de8ad1759b61ed2f70495
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:27:28 2014 -0700
remove redundant uniform CC_Texture0
commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034
Merge: ff15926 511295e
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:20:01 2014 -0700
Merge branch 'v3' into mesh3d_work
commit ff15926f47edfbb1250440b060c1d887cfecd033
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 09:11:36 2014 -0700
warning more than one texture
commit 5debbf8d6de4563361974b67aa52e572f7df9dd6
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 08:45:03 2014 -0700
remove redundant line
commit ed357e7484a63bc3eb208d589943f802b7832e4d
Merge: a1e2306 25dd07e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 22:53:10 2014 -0700
Merge pull request #24 from dabingnn/mesh3d_work
Mesh3d work
commit 25dd07edb7005f593003e90120d6e6439686e5f6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:52:33 2014 -0700
fix memory leak
commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:49:04 2014 -0700
remove unused member variable
commit a1e23064140328f4c9bbe434383ca6f25fcb7548
Merge: bac54fc 712e816
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 22:37:16 2014 -0700
Merge pull request #23 from dabingnn/mesh3d_work
Mesh3d work
commit 712e81606f2782ac41276c1e8a87d32217ac9d28
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:35:48 2014 -0700
fix memory leak
commit bac54fce097edd4040b0a7cd522d15644e6b482a
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 20:01:49 2014 -0700
Merge pull request #22 from dabingnn/mesh3d_work
Mesh3d work
commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 20:01:29 2014 -0700
android work now
commit a6cc0f77875e045d169758adf0cde87360f41475
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:53:39 2014 -0700
remove sprite3dEffect include
commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:50:17 2014 -0700
remove unused Sprite3dEffect
commit c5e2d5579daca64b0e9394a2b07613352847eca8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:48:12 2014 -0700
remove unused outline shader files
commit 09a100cf388d80aa1389d96994ae189cbb0652b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:43:17 2014 -0700
fix error on IOS
commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 18:47:37 2014 -0700
Merge pull request #21 from dabingnn/mesh3d_work
Mesh3d work
commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:46:54 2014 -0700
adjust indent, and line to the end of the file
commit 661ceb72831d6eccfa522a09cedf994541af6f88
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:35:18 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
Conflicts:
cocos/3d/CCSprite3D.cpp
cocos/3d/CCSprite3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
commit 8e764e74dd019852a0ef35b257895a7e79cd9a14
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:31:06 2014 -0700
add testCase for outline
commit c2ced288851892299fd7258e51f32303959b374d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:03:34 2014 -0700
extract base class Effect3D
commit d23ffe3167476d10740df321e579bf647a3698d0
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 18:02:45 2014 -0700
RendeMeshData member rename
commit fb8f25553cd317a277c1b924da2c11b9f3188666
Merge: 73cb4b4 819db70
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:57:29 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 819db702d5ffa9461fc9d1d232cea7d373536664
Merge: 2676911 b408f43
Author: Trace0429 <yangtuo0429@gmail.com>
Date: Thu May 15 17:54:24 2014 -0700
Merge pull request #20 from Trace0429/mesh3d_work
Mesh3d work
commit 73cb4b444b222d34e135b0d09b426b9c73c1b790
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:54:03 2014 -0700
android meshcommand
commit b408f4343e47766416b19a583bc6bb5167439693
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Fri May 16 08:50:38 2014 +0800
windows work now
commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 17:38:41 2014 -0700
raw EffectSprite
commit 2676911bb71ef92b3d9cf198021169d9e4466525
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:37:20 2014 -0700
remove SpriteEffect from Sprite3D
commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 16:34:36 2014 -0700
raw effectSpriteTest
commit 39e372ef2037090317c9c4a2287b06cadf83c9c5
Merge: 734633e 6d27912
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:14:57 2014 -0700
use meshcommand
commit 734633ec1ffc66e590b2ad2da94f6477d78146f2
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 15:38:30 2014 -0700
use meshcommand
commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 15:31:43 2014 -0700
comment out effect framework
commit 6d27912f148e03acc07da3e3b4d0c565af8afefa
Merge: d6f6f63 61a9011
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 15:11:25 2014 -0700
Merge pull request #19 from dabingnn/mesh3d_work
Mesh3d work
commit 61a9011d6c78ea6918664bb608dc51344e0236e5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:55:06 2014 -0700
fix compile error in testcases
commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:52:43 2014 -0700
fix compile error after merge with v3
commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47
Merge: d6f6f63 760ee57
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:48:19 2014 -0700
Merge branch 'v3' into mesh3d_work
commit d6f6f633927eb00df984ec4239555f9ce2c7e44d
Merge: c6fbd6e 76d2523
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 14:26:40 2014 -0700
Merge pull request #18 from dabingnn/mesh3d_work
Mesh3d work
commit 76d2523ae735384533a1e37f06e370cb3481b0f2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:25:40 2014 -0700
move 3d shaders to shader cache
commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de
Merge: 2c9a573 c6fbd6e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:56:00 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:55:49 2014 -0700
meshcommand
commit 0631a51c5d9c0aae55447105b962a888e1158cd3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:21:36 2014 -0700
add mesh rebuild when come to foreground in android
commit 8695016869ab56f3a046f488485f9fdfb6532417
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:13:59 2014 -0700
android work now
commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5
Merge: cd7b235 0466a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 12:21:40 2014 -0700
Merge pull request #17 from dabingnn/mesh3d_work
Mesh3d work
commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8
Merge: e349e4e cd7b235
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:19:24 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:18:49 2014 -0700
commit the changed IOS/MAC project file
commit a7c9a65d5603622b1d40cc009dfceee60c376f50
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:17:57 2014 -0700
remove MeshPart
commit cd7b235b5ec5b3ce21bc856888d383e6224fd047
Merge: e666045 3b7b406
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 11:03:54 2014 -0700
Merge pull request #16 from dabingnn/mesh3d_work
Mesh3d work
commit 3b7b406caff0b6f79fe044612a32e909f778d1e3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 10:59:10 2014 -0700
raw version of single Mesh
commit e666045aa4768199c530f494f0a1fb402f2ce922
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:44:04 2014 -0700
fix outline
commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:09:45 2014 -0700
without normal no outline effect
commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 22:39:03 2014 -0700
android listenBackToForeground
commit 6bec670319ea154474c32c941c250bc3909a7e2e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:58:09 2014 -0700
add boss1 with normal
commit 35c1b8d5fcec188cbef92457e24721ae53820328
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:54:20 2014 -0700
change cache
commit 076166fba142d5432bbadaf3e75d6c35bcb6905a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:35:59 2014 -0700
depress no .mtl crash
commit 498c9693a7e7009615382c5769b7493c3ff6be68
Merge: 8a63b49 d4fd946
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:50 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970
Merge: b4a8fee f395cc5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:36 2014 -0700
merge dabingnn
commit d4fd946fc8afdc95741f6a170e489d3dca9e2519
Merge: f395cc5 a17f074
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:53:58 2014 -0700
Merge pull request #15 from dabingnn/mesh3d_work
Mesh3d work
commit a17f074302d10ff03881cba7e634e094d31feb0a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:52:58 2014 -0700
android can work now
commit b4a8fee4b9735e16331a5656055572db9e551367
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:33:07 2014 -0700
refactoring render code
commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2
Merge: f129e02 a2c12df
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:27:21 2014 -0700
Merge pull request #14 from dabingnn/mesh3d_work
Mesh3d work
commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac
Merge: 1932e22 f129e02
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:26:19 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work
commit 1932e22962a79530adf583f24070efcee32251d3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:25:55 2014 -0700
android can compile now(can not work)
commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 14:21:09 2014 -0700
Merge pull request #13 from dabingnn/mesh3d_work
Mesh3d work
commit c0d90973c2b87582e99966256c74dcdf23712d6a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 14:15:16 2014 -0700
include Sprite3DEffect in the cocos2d header
commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 12:51:09 2014 -0700
outline sprite
commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a
Merge: 1c76d4c 48e9f39
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:48:55 2014 -0700
meshvertexattrib work
commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:40:55 2014 -0700
use meshvertexattribute
commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 09:41:57 2014 -0700
Merge pull request #12 from dabingnn/mesh3d_work
Mesh3d work
commit e0d87a99f42f808429917c8b586509ca75e8a5e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:40:14 2014 -0700
remove compile error
commit c445e07c895fc2352f1220459d91f41f77690cd8
Merge: b70bf52 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:31:14 2014 -0700
Merge branch 'v3' into mesh3d_work
commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc
Merge: da24c48 5a2127d
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 00:25:47 2014 -0700
vertex attrib
commit da24c48c981029493900bcd2143495e546faa75e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 23:49:09 2014 -0700
mesh vertex attribute
commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd
Merge: d98adb7 5148f76
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 19:06:38 2014 -0700
Merge pull request #11 from dabingnn/mesh3d_work
Mesh3d work
commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93
Merge: 02deb39 d98adb7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:05:40 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 02deb399314f01ec1222d78f2383a65614e33a34
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:04:15 2014 -0700
fix texcoord y flipped
commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775
Merge: 300eb4e 946283b
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 18:35:08 2014 -0700
Merge pull request #10 from dabingnn/mesh3d_work
Mesh3d work
commit 946283b83218de893c727dc9780291fe1683a4f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 18:22:16 2014 -0700
added blendFunc
commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 16:03:01 2014 -0700
Merge pull request #9 from dabingnn/mesh3d_work
Mesh3d work
commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 16:01:59 2014 -0700
fix compile error after merge
commit 5bfc30b2b930131d23058d99a6862061c2217f38
Merge: da7d6a0 0171e27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 15:56:46 2014 -0700
Merge branch 'v3' into mesh3d_work
commit da7d6a087f22f4a11827ff3410fbcd2561f155fc
Merge: 0caad32 f413b4e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 14:19:24 2014 -0700
Merge pull request #8 from dabingnn/mesh3d_work
Mesh3d work
commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0
Merge: f47cfc6 0caad32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:17:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit f47cfc67041ed4655a916623a6731876758a5182
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:15:06 2014 -0700
add new interface for createSprite3D
commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 13:58:35 2014 -0700
default GLProgram to object
commit 901ccef93593e2c39cca190784b4fc9684dfa9d0
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:13:24 2014 -0700
remove compile warning
commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:01:20 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 12:59:59 2014 -0700
rename init->initWithFile in Sprite3D
commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5
Merge: f719f45 1c8773c
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 12:58:23 2014 -0700
Merge pull request #7 from super626/mesh3d_tmp
Mesh3d
commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e
Merge: 23e8786 f719f45
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 12:56:06 2014 -0700
Merge branch 'mesh3d_tmp' into mesh3d
commit f719f45aba37791ffdfe107569350a1af94cbeb0
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:59:46 2014 -0700
Merge pull request #6 from dabingnn/mesh3d_work
Mesh3d work
commit 1b7646759d9efcdf0942a42c0c22964a99309853
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:53:17 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:52:41 2014 -0700
adjust line indent and header file define
commit 23e8786892b89e25d1add091a7c3bc618990e579
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 11:44:22 2014 -0700
using vbo
commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:42:10 2014 -0700
Merge pull request #5 from dabingnn/mesh3d_work
Mesh3d work
commit a239a7e35a82f497c337d96a025125b92c8daefd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:39:06 2014 -0700
add CCSprite3d include into cocos2d.h
commit 8d580c28a084c1dab2a5ce925871f3361e6b970a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:33:18 2014 -0700
remove cocos2d.h include in Sprite3DTest.h
commit 56fc0f4cbccb07cda972efda302ff6689b958ab2
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:28:47 2014 -0700
Merge pull request #4 from dabingnn/mesh3d
Mesh3d
commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:26:40 2014 -0700
fix compile error after rename
commit 230a73132c09c66b449efbacbc417974616694c6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:07:30 2014 -0700
rename FileXXX to CCFileXXX
commit ab16a26376f7deddf1a82f3085668e3fd9f09a12
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 10:52:36 2014 -0700
rename _model to _mesh
commit 92ac7f75d06ad081282bbddcad5920a1f7584264
Merge: 6b911b5 df147d1
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 22:23:59 2014 -0700
Merge pull request #3 from dabingnn/mesh3d
Mesh3d
commit df147d14ddb8e61d907a44c6f03f404c8a68103f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 22:21:22 2014 -0700
fix retain/release in sprite3D
commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 20:04:16 2014 -0700
remove compile warnings
commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 19:16:25 2014 -0700
using glprogramstate work ok
commit 0b4f36a964c28f5f4b3224522f27402e0efbe123
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:38:52 2014 -0700
add obj
commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:33:23 2014 -0700
use glprogramstate
commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 13:01:56 2014 -0700
sprite3d
commit 2a490c344f2db27d467506cf28c910410bb892e6
Merge: 23a5232 01b015d
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 10:52:17 2014 -0700
Merge pull request #1 from dabingnn/newcode
Newcode
commit 01b015d1238c89b6837ea276a95ce359cf0da5a7
Merge: 23a5232 5d24b3d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 10:50:14 2014 -0700
Merge branch 'v3' into newcode
commit 23a5232fe5bb4c0b0bc821d1945426486dafe253
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 09:44:41 2014 -0700
3d mesh initial code
2014-05-18 14:49:16 -07:00
vision
81ddbaa7b1
update the calculation of device pixel resolution
2014-05-19 01:12:56 +08:00
Ricardo Quesada
7e4597508c
Does not crash on Mac if the .ttf file is not found
2014-05-15 17:22:53 -07:00
Ricardo Quesada
f9f0142842
default value is 0.5 for interpolation
2014-05-15 16:52:15 -07:00
Ricardo Quesada
9d1ab1ba07
uniform sampler CC_Texture0 MUST NOT be defined on shaders
...
since it is a built-in.
Built-in uniforms MUST NOT be defined on shaders.
Basically all CC_ uniforms must be defined by cocos2d-x
2014-05-15 16:47:54 -07:00
Ricardo Quesada
e5494cd9e5
multiple pass sprite
...
on ShaderSprite2.cpp
2014-05-15 13:13:31 -07:00
Ricardo Quesada
1c13f901ae
Even better shader test
2014-05-14 16:55:57 -07:00
Ricardo Quesada
839170c147
Improvments on the shader2 tests
2014-05-14 13:09:33 -07:00
Ricardo Quesada
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
2014-05-14 10:07:09 -07:00
zifter
6fcef92708
Fix Progress Action.
2014-05-14 19:13:14 +03:00
vision
90e2b8a4af
move the method from ccUtils to Director
2014-05-14 19:42:24 +08:00
minggo
048d6c09d3
Merge pull request #6701 from heliclei/autotest-autorun
...
support auto start cpp-tests
2014-05-14 18:16:58 +08:00
andyque
6cb3b47488
closed #5110 , refactor
2014-05-14 17:07:24 +08:00
vision
dfb016dde3
move the utility from Renderer to UtilsHelper
2014-05-14 16:25:47 +08:00
vision
6213747c41
fix the compile failure on win32.
2014-05-14 19:37:04 +08:00
andyque
e6889dca36
issue #5110 , refactor UIText
2014-05-14 15:26:14 +08:00
andyque
46cf6251b6
issue #5110 , rename a member variable and delete gui prefix in ui tests
2014-05-14 11:26:04 +08:00
andyque
e6a36fde18
issue #5110 , refactor VideoPlayer
2014-05-14 11:18:11 +08:00
andyque
08801c035e
issue #5110 . refactor UILoadingBar, remove unneeded deprecats
2014-05-14 10:48:16 +08:00
vision
e7df247d65
replace more tabs with spaces to uniform the code styles.
2014-05-14 10:40:56 +08:00
vision
021be6ef9b
Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot
2014-05-14 09:22:36 +08:00
Ricardo Quesada
723938e292
Adds effectNode in ShaderTest2
2014-05-13 18:12:58 -07:00
Ricardo Quesada
0171e27747
Merge pull request #6714 from Dhilan007/v3_nodefix
...
Fix a bug that if a node changes parent, parent's matrix will not update to reflect this change.
2014-05-13 14:14:27 -07:00
Ricardo Quesada
6462a1bf79
Adds simple sample for multitexturing
2014-05-13 12:55:34 -07:00
visiblelight
541d03d668
Now it shoudl run fine on iOS
2014-05-14 01:06:26 +08:00
minggo
05c16de87a
Merge pull request #6715 from dumganhar/iss5160-animation-notification
...
closed #5160 : Dispatch a custom event after an animation frame is displayed
2014-05-13 18:38:44 +08:00
visiblelight
fe91f46882
The target filename shuld use a writable path.
2014-05-13 18:34:35 +08:00
James Chen
24524cb5be
issue #5160 : Updates actiontest
2014-05-13 17:30:48 +08:00
heliclei
35b19a239a
exit gracefully after running all tests
2014-05-13 17:20:12 +08:00
visiblelight
5459b581b0
replace tab with spaces; remove the 'flipped' parameter;
2014-05-13 17:17:15 +08:00
James Chen
0dd22af688
closed #5160 : Updates ActionTest
2014-05-13 17:08:52 +08:00
Dhilan007
fbfbcaffc8
update project
2014-05-13 16:43:19 +08:00
visiblelight
47e4ee4ff2
add a new utility function to capture the screen
2014-05-13 16:23:35 +08:00
James Chen
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
heliclei
17cd12f8b1
fix win32 compile
2014-05-13 14:43:11 +08:00
Nite Luo
7d8cfc4cca
set parent transform dirty when addChild
2014-05-12 23:28:20 -07:00
heliclei
13f3c9705a
Merge remote-tracking branch 'upstream/v3' into autotest-autorun
2014-05-13 14:24:00 +08:00
heliclei
45d8547622
add config item
2014-05-13 14:16:06 +08:00
heliclei
eaa879a9f3
fix for winrt build
2014-05-13 14:08:49 +08:00
Nite Luo
0b7b9f6131
Merge branch 'v3' into reparentChildren
2014-05-12 22:52:19 -07:00
Nite Luo
e1f82c174b
add TestCase for reparentChildren bug
2014-05-12 22:50:31 -07:00
heliclei
471f218acf
add config item to control whether start autorun
2014-05-13 11:47:32 +08:00
Ricardo Quesada
012f1020ca
GLProgramState fixes
...
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
2014-05-12 19:12:56 -07:00
heliclei
98f1c6768c
Merge remote-tracking branch 'upstream/v3' into autotest-autorun
2014-05-13 07:53:49 +08:00
heliclei
1aabedb316
support auto start tests
2014-05-12 21:47:55 +08:00
minggo
9ab2dae212
Merge pull request #6635 from dumganhar/iss4660-unicode
...
issue #4660 : ccUTF8 uses utf8-utf16 conversion in llvm3.4
2014-05-12 17:57:25 +08:00
andyque
9a8c87601c
Merge branch 'v3' into refactor5057
2014-05-12 15:52:47 +08:00
andyque
9d7d06a1f8
issue #5047 , refactor UIVideoPlayer
2014-05-12 11:35:57 +08:00
andyque
4f3c128c4f
issue #5057 , refator UITextField
2014-05-12 11:29:22 +08:00
andyque
eeaf48d3e5
issue #5047 , refactor UISlider
2014-05-12 11:17:06 +08:00
andyque
74ac5d1d5a
issue #5057 , refactor UIScrollView
2014-05-12 11:08:10 +08:00
andyque
77a463bac3
issue #5057 , refactor UIPageView
2014-05-12 10:31:52 +08:00
andyque
7f15a14d55
issue #5057 , refactor LoadingBar
2014-05-12 10:12:22 +08:00
andyque
43eb75fb1a
issue #5057 , refactor Listview
2014-05-12 09:51:23 +08:00
James Chen
4d275f91d0
issue #4660 : Updates utf unit test, use c memcmp and run 10000 times
2014-05-11 11:24:32 +08:00
James Chen
945ad2eb04
issue #4660 : Adds utf8/16 conversion unit test
2014-05-10 21:52:19 +08:00
Ricardo Quesada
006fe7eb94
Merge pull request #6667 from super626/improved_glprogram
...
remove unused shadertest
2014-05-09 21:42:01 -07:00
yangxiao
cb3bd52d9a
remove unused shadertest
2014-05-09 21:34:59 -07:00
Ricardo Quesada
a8c2fb5431
Fixes deprecated warnings
2014-05-09 21:29:24 -07:00
Ricardo Quesada
1a0ab4bf92
10 tests
2014-05-09 20:51:46 -07:00
Huabing.Xu
e84d96234b
add two shaderTest case for Trace
...
comment out one(it is not working on IOS device)
2014-05-09 20:35:15 -07:00
Ricardo Quesada
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
Ricardo Quesada
47f6f8871f
compiles on windows
2014-05-09 14:43:20 -07:00
Trace
4c4a974287
use STRINGGIFY(A) instead R""
2014-05-09 12:03:09 -07:00
Trace
4bcdccd302
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
2014-05-09 12:01:18 -07:00
Huabing.Xu
e72633c066
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into tony_improved_glprogram
2014-05-09 11:53:22 -07:00
Trace
0b8aed3536
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
2014-05-09 11:51:00 -07:00
Huabing.Xu
168ff78e18
add test case for y flipped coord
2014-05-09 11:49:51 -07:00
Trace
88f1d8ac4e
Add ShaderTest sample and shader code
2014-05-09 11:48:11 -07:00
Ricardo Quesada
78dd92a7ef
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-09 11:40:13 -07:00
andyque
e1fe26543d
issue #5057 , refactor & remove deprecated warnings
2014-05-09 18:37:22 +08:00
andyque
264769f814
issue #5057 , refactor LinearGravity
2014-05-09 17:54:25 +08:00
andyque
09a53e7b03
issue #5057 , refactor BackGroundColorType
2014-05-09 17:05:36 +08:00
andyque
e8e0d007bd
issue #5057 , refactor LayoutType
2014-05-09 16:49:00 +08:00
andyque
451b7a1b6b
issue #5057 , refactor UICheckBox event callback
2014-05-09 16:04:55 +08:00
andyque
c5a505ec4c
issue #5057 , Merge branch 'v3' into refactor5057
...
Conflicts:
cocos/ui/CocosGUI.h
2014-05-09 15:39:02 +08:00
andyque
57ce0ee2cf
issue #5057 , refactor addTouchEventListener to std::function<>
2014-05-09 14:30:39 +08:00
andyque
7d1cb7af47
issue #5057 , refactor UILoadingBarTest
2014-05-09 11:52:51 +08:00
Dhilan007
06f264e87d
rename VideoWidget to VideoPlayer.
2014-05-09 11:30:07 +08:00
Ricardo Quesada
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
Ricardo Quesada
51f498fc94
fixed deprecation warnings
2014-05-08 16:42:36 -07:00
Ricardo Quesada
2e669c1d28
GLProgram::create() returns a linked GLProgram
2014-05-08 16:04:59 -07:00
Ricardo Quesada
580ebf939f
working Ok with new API
2014-05-08 15:43:12 -07:00
Ricardo Quesada
8f2ba467ff
Yeahhhhhh
...
it is working
2014-05-08 12:34:26 -07:00
Ricardo Quesada
087378926f
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-08 10:16:09 -07:00
Dhilan007
24452cada1
fixed compilation fails on android.
2014-05-08 21:39:53 +08:00
Dhilan007
972f9447dd
issue #4876:Add test case to play video
2014-05-08 18:14:32 +08:00
andyque
0c2fd977ea
issue #5057 . add UIDeprecated.h and refactor FocusDirection to inner class of
...
Widget and also simplify the enum value
2014-05-08 18:10:21 +08:00
andyque
898a66131a
issue #5056 . move gui test from ExtensionsTest to the outside
2014-05-08 14:35:45 +08:00
andyque
f6d0135b9b
Merge branch 'v3' into focus3861
2014-05-08 11:27:57 +08:00
andyque
323987beb2
closed #4861 , done
2014-05-08 11:26:29 +08:00
Ricardo Quesada
90ec7dd9ec
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
2014-05-07 20:21:03 -07:00
Ricardo Quesada
b401f6adc1
Lots of new code
...
Adds GLProgramState
2014-05-07 20:20:19 -07:00
andyque
b5f1f7455b
issue #4861 , fix a problem when layout focus loops
2014-05-08 10:46:05 +08:00
Huabing.Xu
41f48e7fa9
Merge branch 'v3' into tony_improved_glprogram
2014-05-07 15:30:04 -07:00
Ricardo Quesada
98454eeb69
Adds GLProgram::createXXX()
2014-05-07 14:38:41 -07:00
Ricardo Quesada
02405a8efe
Improved samples
2014-05-07 12:41:04 -07:00
Ricardo Quesada
b1ed7178fe
Improved API for Uniforms
2014-05-07 10:44:45 -07:00
yangxiao
5190fb27c8
use proposed vertex attribute api
2014-05-07 09:27:44 -07:00
andyque
05b7d274c8
issue #4861 . fix distance calculation
2014-05-07 18:27:05 +08:00
samuele3hu
8615e13c91
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-07 17:16:40 +08:00
James Chen
9862fab58f
Comments fix in CCRenderTexture.h
2014-05-07 16:37:21 +08:00
andyque
1282252c25
closed #4861 , refactor
2014-05-07 14:06:44 +08:00
andyque
ef44b2687b
closed #4861 , finished focus
2014-05-07 11:40:01 +08:00
andyque
ef70c684de
issue #4861 , add requestFocus method and the layout current can get focus
2014-05-07 10:23:57 +08:00
andyque
62a66872aa
issue #4861 , fixed some boundary conditions
2014-05-07 10:05:20 +08:00
Ricardo Quesada
db759005e0
Improvements for Attributes and Uniform API
2014-05-06 17:58:14 -07:00
Ricardo Quesada
21dd6fef69
Improves code a little bit
2014-05-06 12:46:35 -07:00
Trace
cf9e8ff0bd
Merge branch 'newV3' into improved_glprogram
...
Conflicts:
cocos/2d/CCGLProgram.cpp
cocos/2d/CCGLProgram.h
2014-05-06 12:07:42 -07:00
Trace
69fd841b30
fix the include error
2014-05-06 11:19:51 -07:00
andyque
9d71ae29b9
issue #4861 . fixed all widget focus diabled bug
2014-05-06 17:28:12 +08:00
andyque
51a704dcc8
issue #4861 , refactor improve nested focus test
2014-05-06 15:11:55 +08:00
andyque
29c57568bf
issue #4861 , add nested focus test
2014-05-06 14:38:45 +08:00
andyque
e52370e1c2
issue #4861 , refactor UIFocusTest, simplify code
2014-05-06 14:20:01 +08:00
andyque
ad4e1f1e2c
issue #4861 , improve UIFocusTest, add click event to ImageView
2014-05-06 14:14:22 +08:00
samuele3hu
0ce2a38f17
Update bindings-generator and `MAX_SUB_TEST_NUMS` for SpritePerformance Test
2014-05-06 13:59:16 +08:00
andyque
cb5b2a4f85
issue #4861 , Merge branch 'v3' into focus3861
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-05-05 17:40:28 +08:00
James Chen
67b2fbf14b
Updates xcode project, add ccs-res folder to Resources folder
2014-05-05 15:24:33 +08:00
andyque
2d0de93baf
issue #4861 , fixed a widget bug and add VBox test
2014-05-05 11:37:40 +08:00
andyque
852191a928
issue #4861 , improve the horizontal layout test
2014-05-05 11:37:39 +08:00
andyque
a7fbd590dc
issue #4861 . add a horizontal focus test
2014-05-05 11:37:39 +08:00
James Chen
8cbcf17163
issue #4674 : Re-added deleted source files.
2014-05-04 14:37:55 +08:00
James Chen
3b3c1c4dbb
issue #4674 : Removed large files and updated .gitignore
2014-05-04 14:36:16 +08:00
Ricardo Quesada
207e67318d
rolling back tests
2014-05-01 16:55:28 -07:00
Ricardo Quesada
b5f513ce16
Merge branch 'v3' into improved_directory_structure
2014-04-30 13:15:10 -07:00
Huabing.Xu
16105df503
getNormalize->getNormalized
2014-05-01 01:10:18 +08:00
Huabing.Xu
c722b74e36
Merge branch 'v3' into v3_refactor_normalize
2014-04-30 20:08:37 +08:00
Huabing.Xu
ea4fee2c31
refactor normalize in Vector2
2014-04-30 18:07:05 +08:00
Ricardo Quesada
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
Huabing.Xu
bd93a5cb76
fix bug for renderTexture created which is bigger than screen size
2014-04-29 15:08:44 +08:00
Ricardo Quesada
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
Ricardo Quesada
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
Huabing.Xu
feec24e3ef
Merge branch 'v3' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
2014-04-25 16:20:24 +08:00
James Chen
828401a23d
Merge pull request #6302 from zifter/FixParticle
...
closed #4880 : Particle systems loading incorrectly in CocosBuilder
2014-04-25 14:15:44 +08:00
James Chen
06d9187783
Merge pull request #6270 from andyque/feature4783
...
closed #4783 , add outline shader files
2014-04-25 13:50:44 +08:00
James Chen
037c57ef96
Merge branch 'develop' into perf-callback
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-25 12:07:48 +08:00
James Chen
cd6fe294b8
Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer
...
closed #4771 : Move PhysicsWorld to Layer
2014-04-25 11:52:32 +08:00
James Chen
328408d792
Merge pull request #6263 from Mazyod/develop-cpp11-http-client
...
closed #4702 : Update HTTPClient to use C++11 callbacks
2014-04-25 11:06:06 +08:00
James Chen
477fc9f0e0
Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-04-25 10:59:11 +08:00
James Chen
7beb8b78fe
Merge pull request #6325 from MSOpenTech/wp8-3.0-update
...
Wp8 3.0 update:
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
2014-04-25 10:41:58 +08:00
Huabing.Xu
c2da6727be
fix compile warning after merge
2014-04-24 17:00:28 +08:00
Huabing.Xu
f65973d9f0
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCActionInterval.cpp
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCLabelBMFont.cpp
tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
2014-04-23 14:46:14 +08:00
Huabing.Xu
560d24545a
3.0hotfix: Node: Clipping->RawStencilTest4-6
2014-04-22 10:58:42 +08:00
Huabing.Xu
7a38050e09
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-21 17:47:34 +08:00
zhangbin
440702aa06
Enable depth test in test case : TilemapTest->TMXOrthoVertexZ.
2014-04-21 15:26:57 +08:00
boyu0
710fe9d940
closed #4771 : modify test.
2014-04-21 13:32:47 +08:00
James Chen
a75432ec35
Merge pull request #6262 from Mazyod/develop-editbox-mac-enhancements
...
Mac Editbox Text Font and Placeholder features
2014-04-21 11:18:07 +08:00
Dale Stammen
467ededeff
enabled console for wp8
2014-04-19 10:08:01 -07:00
Huabing.Xu
3b83d52f95
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/ui/UIButton.cpp
cocos/ui/UIButton.h
cocos/ui/UICheckBox.cpp
cocos/ui/UICheckBox.h
cocos/ui/UIImageView.cpp
cocos/ui/UIImageView.h
cocos/ui/UILayout.cpp
cocos/ui/UILayout.h
cocos/ui/UILoadingBar.cpp
cocos/ui/UIRichText.h
cocos/ui/UISlider.cpp
cocos/ui/UIText.cpp
cocos/ui/UIText.h
cocos/ui/UITextAtlas.cpp
cocos/ui/UITextAtlas.h
cocos/ui/UITextBMFont.cpp
cocos/ui/UITextBMFont.h
cocos/ui/UITextField.cpp
cocos/ui/UITextField.h
cocos/ui/UIWidget.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
2014-04-19 00:30:34 +08:00
minggo
d8d847bd65
Merge pull request #6319 from boyu0/bug4903_build_libcurl_with_openssl
...
closed #4903 : Build libcurl.a with openssl
2014-04-18 17:10:53 +08:00
boyu0
9756709473
closed #4903 : change HttpClientTest get test 3 to https protocol.
2014-04-18 17:03:06 +08:00
CaiWenzhi
ed4fcd5d1a
Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes
2014-04-17 14:23:08 +08:00
CaiWenzhi
19f6526ef8
Widget supports contentsize
2014-04-17 14:08:25 +08:00
zifter
08d975268d
Fix for issue http://www.cocos2d-x.org/issues/4880 .
2014-04-17 03:15:43 +03:00
Huabing.Xu
718f3b3a57
remove warning message---continue
2014-04-16 10:47:29 +08:00
James Chen
60c1ed28dc
Removes unused enum in PerformaceCallbackTest
2014-04-16 10:41:42 +08:00
James Chen
ec40dda7f3
Adds performance test for callbacks: 1) std::function,
...
2) (target->*selector)(), 3) simulate new api of Scheduler
2014-04-16 10:35:58 +08:00
Huabing.Xu
95cb7721f6
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCSprite.cpp
tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
2014-04-15 22:21:04 +08:00
Huabing.Xu
7f61639541
replace Point with Vector2 in tests, extension folder
2014-04-15 18:23:40 +08:00
Huabing.Xu
5303f50904
Migrate to Vector2 in DrawPrimitive.h
2014-04-15 17:29:23 +08:00
Huabing.Xu
6686b657a4
Migrate getPostion and correspondent member variable to Vector2
2014-04-15 16:28:59 +08:00
Huabing.Xu
071cbc7565
migrate setPosition to Vector2
2014-04-15 16:16:14 +08:00
boyu0
b53961b78d
issue $4771: fix lua test and fix some bugs
2014-04-15 13:40:44 +08:00
Ricardo Quesada
584ccf65e4
Culling working again
2014-04-14 16:46:19 -07:00
boyu0
c98f50026f
issue $4771: move PhysicsWorld to layer.
2014-04-15 03:21:18 +08:00
Huabing.Xu
a5e900a86b
manually enable depth test in test case TMXIsoVertexZ
2014-04-14 17:06:35 +08:00
minggo
bb15d0ecf9
Merge pull request #6267 from dabingnn/develop_add_culling_enabled_option
...
Add interface setCullingEnabled(), culling is disabled by default
2014-04-14 14:50:11 +08:00
Huabing.Xu
ec5398e7c6
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
tests/cpp-tests/Classes/RenderTextureTest/RenderTextureTest.h
2014-04-14 14:08:19 +08:00
andyque
87b437dd3a
closed #4783 . replace deprecated function call
2014-04-14 13:48:17 +08:00
andyque
00d2bd833f
closed #4783 . finish the shading effects
2014-04-14 12:03:37 +08:00
andyque
2c1f5da69c
issue #4783 , add outline shader files
2014-04-14 11:52:17 +08:00
Huabing.Xu
d2dd57d412
change indention to space and remove comment code
2014-04-14 11:45:06 +08:00
Huabing.Xu
9935e8ddfb
setCullingEnabled set to public access
...
changed renderer->culling test case
2014-04-14 11:33:40 +08:00
Mazyad Alabduljaleel
40e6288ac7
[NEW]: update HTTPClient to use C++11 callbacks
...
[NEW]: updated tests to use the new API
[DEP]: deprecated old target/selector API
2014-04-13 01:06:04 +04:00
Mazyad Alabduljaleel
8919931a50
small indentation fix
2014-04-13 00:26:38 +04:00
Mazyad Alabduljaleel
b369c24f01
+ [NEW]: setting the font for Editbox text
...
+ [NEW]: setting the font for Editbox placeholder
+ [NEW]: setting the color for Editbox placeholder
+ [NEW]: updated test cases to show the new functionality
2014-04-13 00:19:14 +04:00
James Chen
043f86cd6b
Memory leak fix in SchedulerTest
2014-04-12 12:59:28 +08:00
zhangbin
d611cfb49f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-04-11 20:03:24 +08:00
zhangbin
0eee9bc288
Solve the incorrect effect of some transition test case in lua-tests.
2014-04-11 20:02:11 +08:00
Huabing.Xu
1aa909371d
remove kmMat4 in Cpp-tests
2014-04-11 18:03:07 +08:00
James Chen
b40773f6d0
Merge pull request #6240 from dabingnn/develop_add_rendererAssert
...
Trigger an assert if a command is added while render is rendering.
2014-04-11 17:37:02 +08:00
andyque
280c2755b3
closed #4761 . fix a compile error
2014-04-11 16:47:35 +08:00
andyque
83664e2322
closed #4761 . fix a improve super class function call
2014-04-11 16:34:26 +08:00
andyque
4be149e492
closed #4761 , fix zfighting between tests
2014-04-11 16:30:25 +08:00
Huabing.Xu
51289e8a4c
1. add assert condition of rendering when adding command
...
2. fix bug: renderTexture->SpriteRenderTextureBug
2014-04-11 16:05:22 +08:00
Huabing.Xu
1670e07300
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-11 11:18:13 +08:00
heliclei
157fce785c
fix CCConsole linux crash
2014-04-10 18:31:28 +08:00
James Chen
5d882cea23
Merge pull request #6213 from koowolf/wp8_fix
...
fix compiler error in wp8
2014-04-10 17:10:08 +08:00
James Chen
9c07ca5722
Merge pull request #6220 from Dhilan007/develop
...
Fixed logical error in TestChangeAnimationInternal::onExit.
2014-04-10 16:54:38 +08:00
koowolf
b5433f05c1
replace LabelTTF with Label
2014-04-10 16:51:25 +08:00
Dhilan007
d583dcc0f0
Fixed logical error in TestChangeAnimationInternal::onExit.
2014-04-10 16:48:51 +08:00
James Chen
8fcf687452
Merge pull request #6216 from Dhilan007/develop
...
Fixed logical error in CameraCenterTest::onExit.
2014-04-10 16:17:10 +08:00
Dhilan007
fce85e08f9
Fixed logical error in CameraCenterTest::onExit.
2014-04-10 16:13:07 +08:00
James Chen
8a66f43f30
closed #4744 : Adds test for issue4744.
2014-04-10 15:31:53 +08:00
James Chen
efb443dea0
Merge pull request #6200 from dumganhar/iss4729-deprecated-folder
...
issue #4729 : Move deprecated stuff to deprecated folder
2014-04-10 11:17:21 +08:00
James Chen
ba1f535201
Merge pull request #6199 from Dhilan007/develop_label
...
closed #4743 : Label:Makes the create functions of Label clearer.
2014-04-10 11:15:56 +08:00
Huabing.Xu
5475a0fc02
fix compile error after merge
2014-04-10 10:58:43 +08:00
Huabing.Xu
07ac817a7c
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-10 10:52:15 +08:00
Huabing.Xu
d865341694
remove kmMat4 interface in cpp-tests
2014-04-10 10:16:16 +08:00
James Chen
890dd64d38
issue #4729 : some warning fixes and compilation error fixes on win32.
2014-04-10 01:29:13 +08:00
James Chen
5615717617
issue #4729 : NULL -> nullptr in constructor or setXXX(NULL)
2014-04-10 00:36:43 +08:00
minggo
2beed5d398
Merge pull request #6166 from dabingnn/develop_fix_rendererBug
...
Develop fix renderer bug
2014-04-10 00:27:33 +08:00
Dhilan007
05b8123803
Label:Makes the create functions of Label just do one thing.
2014-04-09 23:31:05 +08:00
Dhilan007
67652357e1
1.Makes the create functions of Label clear.
2014-04-09 21:35:08 +08:00
zhangbin
43eaccca09
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4703
2014-04-09 13:47:18 +08:00
zhangbin
ddffa3b120
closed #4703 , Solve the incorrect effect of test case : RenderTexture test issue 937.
2014-04-09 13:40:43 +08:00
James Chen
8e428d7321
Merge pull request #6163 from heliclei/fix-autotest
...
fix autotest touch hang:run test scene constructor in cocos thread
2014-04-09 13:28:30 +08:00
Darragh Coy
14b210a082
RefPtr<T> - add move semantics
...
Add support for move semantics to the RefPtr<T> class. Implement a move constructor and a move assignment operator.
2014-04-08 11:34:27 -07:00
Huabing.Xu
409b696bab
remove kmMat4 interface in class Node
2014-04-08 23:05:33 +08:00
Huabing.Xu
3837c23ebe
draw() using Matrix instead of kmMat4
2014-04-08 22:07:35 +08:00
Huabing.Xu
e8596094a4
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-08 16:58:51 +08:00
shujunqiao
fb777b1a1d
[ci skip], delete ShaderFail sample in ShaderTest.cpp.
2014-04-08 14:52:17 +08:00
shujunqiao
fae742c0b8
modify ShaderTest.cpp not crah to autotest.
2014-04-08 14:32:25 +08:00
heliclei
798708f775
fix autotest touch hang:run test scene constructor in cocos thread
2014-04-08 11:29:42 +08:00
Darragh Coy
bb85df66b1
Add an event dispatcher test
...
Add an event dispatcher test to help reproduce crashes fixed by the previous commit and to verify that the fix still works.
2014-04-07 16:46:03 -07:00
Huabing.Xu
1b0c55ef15
issue #4629 : test case add a spriteInGroup instead of sprite, the sprite can not be seen now
2014-04-07 22:31:24 +08:00
Huabing.Xu
beda294be1
issue #4629 : add test case for group command
2014-04-07 22:02:43 +08:00
Ricardo Quesada
f1a2db9006
Merge pull request #6140 from dumganhar/render-clean
...
Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node children Test`.
2014-04-04 13:34:29 -07:00
Huabing.Xu
29c345bd02
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-04 18:45:21 +08:00
James Chen
541d4dea0c
Merge pull request #6105 from andyque/feature3636
...
Added create functions with parameters for all ui controls
2014-04-04 18:34:59 +08:00
Huabing.Xu
6b4451482f
remove matrixToKmMat4 function
2014-04-04 18:13:10 +08:00
Huabing.Xu
f1b1678900
Director::getMatrix returns Matrix instead of kmMat4
2014-04-04 17:31:21 +08:00
James Chen
7b4a1308ea
Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node
...
children Test`.
2014-04-04 12:48:16 +08:00
Huabing.Xu
f9405e0ea9
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-03 17:47:16 +08:00
andyque
c501aa2dec
issue #4636 . replace __String with StringUtils::format
2014-04-03 17:42:04 +08:00
Huabing.Xu
67e62ce73d
readied director::getMatrix again. remove kmGLgetMatrix
2014-04-03 17:26:06 +08:00
Huabing.Xu
5e76c6713d
migrate cpp-tests to director matrix stack
2014-04-03 15:59:55 +08:00
andyque
0875b4e51f
closed #4636 . Done
2014-04-03 15:56:45 +08:00
andyque
8996ab1956
issue #4636 , finish refactorying UITextFieldTest
2014-04-03 15:52:42 +08:00
andyque
ed2c38eb98
issue #4636 , finish UITextBMFont
2014-04-03 15:45:06 +08:00
andyque
08bf6c27f4
issue #4636 . finish UITextAtlasTest
2014-04-03 15:38:52 +08:00
andyque
b59beab61a
issue #4636 , finish UISlider
2014-04-03 15:33:57 +08:00
James Chen
f6859a3ca9
closed #4557 : Adds `EventListener::setEnabled/isEnabled`.
2014-04-03 15:32:16 +08:00
andyque
a7a1a6b05b
issue #4636 , finish UIRichTextTest and UIScrollViewTest
2014-04-03 15:22:23 +08:00
andyque
8b9af0e94c
issue #4636 . finish UIPageViewTest
2014-04-03 11:52:35 +08:00
andyque
48429f5738
issue #4636 . finish UILoadingBar
2014-04-03 11:34:06 +08:00
andyque
278e2c3e3b
issue #4636 . finish UIListViewTest
2014-04-03 11:23:12 +08:00
andyque
fe33588038
issue #4636 . finish UILayout
2014-04-03 11:14:35 +08:00
andyque
1a97ebdcb0
issue #4636 . finish UIImageView
2014-04-03 10:42:30 +08:00
andyque
52bdb840ee
issue #4636 . finish UICheckBox
2014-04-03 10:34:20 +08:00
andyque
10134ccc65
issue #4636 . finish button
2014-04-03 10:31:10 +08:00
andyque
0a6b0a4389
issue #4636 . refactor Scale9Sprite
2014-04-03 10:07:47 +08:00
andyque
b27fe6ecc2
issue #4636 . add parameter create method to UITextBMFont
2014-04-03 10:07:46 +08:00
andyque
0b5c10a0fb
issue #4636 . add parameter create method to UITextAtlas
2014-04-03 10:07:46 +08:00