Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,033 Commits 2 Branches 34 Tags 1.2 GiB
Commit Graph

85 Commits

Author SHA1 Message Date
yangxiao ef49e5a169 merge cocos 2015-07-17 17:43:32 +08:00
yangxiao bf20145e35 animate3d callback and test 2015-07-17 11:08:27 +08:00
songchengjiang 282dc23bb2 modify interfaces of Animate3DCallback 2015-07-15 17:34:14 +08:00
songchengjiang 6c83e8d81c Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
 2015-07-15 11:13:27 +08:00
songchengjiang 5a16748273 optimize Animate3DCallback 
add Animate3DCallbackTest
 2015-07-13 11:43:13 +08:00
pandamicro c167e249cd Merge pull request #12790 from pandamicro/shaderNormal 
Use shader with normal while creating mesh with normals
 2015-07-12 21:47:05 +08:00
pandamicro 600568fdba Migrate test case from #10692 @babcca 2015-07-12 11:33:22 +08:00
yangxiao 10fe728eee animation quality default to low, do not interpolation 2015-07-09 17:54:21 +08:00
yangxiao d35bf2305f add clipping test 2015-07-01 14:48:37 +08:00
yangxiao ec69a34c51 add issue9767 test 2015-05-13 16:16:45 +08:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
lvlong 8e51a561b1 modify some about animate3D quality! 2015-04-24 11:49:28 +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
Ricardo Quesada 23b0d4d2f6 more fixes with the namespaces 2015-04-08 21:23:47 -07: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
WenhaiLin 0d51c13743 Make all test cases work fine with new test framework. 2015-04-03 14:31:03 +08:00
lvlong f967fef7d0 modify Sprite3DWithSkinTest, can switch animation quality. 2015-03-30 17:08:49 +08:00
yangxiao a45f0d1a76 merge cocos 2015-03-27 16:50:40 +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
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 6eaa78d1cb add reload mechanism for TextureCube and Skybox 2015-03-24 15:43:59 +08: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 995b7225dd Add test-case for force depth bug 2015-01-29 00:21:33 -08:00
zhukaixy ee99700ec1 add test case TextureCube 2015-01-29 09:28:14 +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
yangxiao cc18a3a955 another use case not finished 2015-01-26 18:44:30 +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
yangxiao 677ee473ff 3d+2d use case, not finished 2015-01-23 18:24:15 +08:00
minggo 301cb558ec Merge pull request #9970 from super626/v3 
correct wrong word
 2015-01-14 11:45:48 +08:00
Nite Luo 4335328e3d Add support for creating empty sprite3D 2015-01-13 16:41:24 -08:00
lvlong 8f16728514 wrong words 2015-01-13 18:00:20 +08:00
minggo d517831e01 Merge pull request #9699 from super626/fixandroid 
fix background/foreground switch
 2014-12-30 17:07:38 +08:00
yangxiao bfb577e385 fix ##9689 2014-12-30 11:48:39 +08:00
yangxiao 060c6ee0b7 add quaternion test 2014-12-29 14:36:25 +08:00
yangxiao 3d77c7535d merge cocos 2014-12-23 10:35:35 +08:00
tangziwen 68177e41e9 update 2014-12-19 17:39:26 +08: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
tangziwen 086bca399f add three samples -- toonshader fakeshadow lightmap 2014-12-18 16:09:29 +08:00