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

1272 Commits

Author SHA1 Message Date
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
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 a45f0d1a76 merge cocos 2015-03-27 16:50:40 +08:00
zhukaixy a5bda44f22 Update Sprite3DTest.cpp 2015-03-27 16:47:48 +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