Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,746 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

1541 Commits

Author SHA1 Message Date
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