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

2632 Commits

Author SHA1 Message Date
minggo 1e271a9d96 Merge pull request #10899 from super626/v3 
Bug fix
 2015-03-17 19:29:21 +08:00
Dale Stammen 5606fad642 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:47:55 -07:00
Vincent Yang 6bbb89a098 Add doxygen config for white book and cocos/doxygen_modules.h for doc mudules. 2015-03-17 11:26:33 +08:00
Dale Stammen 65c83378d0 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:22:28 -07:00
Dale Stammen 08ceae3de2 removed no-gl_PointSize shaders for Windows Phone 8.1 2015-03-16 08:08:02 -07:00
yangxiao 5b26ba3c68 override setCameraMask 2015-03-16 17:11:17 +08:00
yangxiao f56d8c4784 fix camra mask for label does not work 2015-03-16 15:31:29 +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
Huabing.Xu 03c3a4d5ed Merge pull request #10836 from pipu/reconstruct_object_extension_data 
To reconstruct object extension data.
 2015-03-13 15:04:41 +08:00
pipu c72c8e865d To reconstruct object extension data. 2015-03-12 15:47:15 +08:00
yangxiao 50c3a9cb4c fix removeAllChildren cause camera to be destroyed bug 2015-03-12 10:39:21 +08:00
Jacky 605ce58293 disable MoveTo::reverse() 2015-03-11 09:55:32 +08:00
minggo 5ac2fb398c Merge pull request #10774 from minggo/sync-from-v4 
Label:Fixed transform not update correctly
 2015-03-10 09:54:20 +08:00
Dale Stammen 24d706cb7a added /bigobj to C++ compiler command line options 2015-03-09 09:39:36 -07:00
Dale Stammen 35222a8193 Merge branch 'v3' into v3-wp8-fix 2015-03-09 09:20:25 -07:00
Dale Stammen a828f73ccb updated expiration date of project certificates 2015-03-09 08:31:06 -07:00
WenhaiLin cd95905a04 Label:Fixed transform not update correctly if this camera mask of Label isn't visible by the current visiting camera 2015-03-09 17:26:43 +08:00
Dale Stammen 6cd881d8f8 added missing Particle3D files 2015-03-08 21:37:29 -07:00
Dale Stammen 362edec6d6 added missing Particle3D files 2015-03-08 21:31:43 -07:00
yangxiao 8137b01f23 merge cocos 2015-03-06 18:31:57 +08:00
XiaoYang 27ae60e626 Merge pull request #249 from songchengjiang/particle_merge 
support win8.1
 2015-03-06 17:57:34 +08:00
songchengjiang 4ca90341b9 support win8.1 2015-03-06 15:35:02 +08:00
yangxiao 457ac3fdd7 reset unproject with viewport cocostudio using it 2015-03-06 11:29:40 +08:00
songchengjiang 444dbfdf9e replace .mesh with .c3b 
modify ParticleUniverse file structure
 2015-03-05 14:54:32 +08:00
yangxiao 3db3d9ae11 merge cocos 2015-03-03 17:23:33 +08:00
Dale Stammen 44b951a51a Merge branch 'v3' into v3-wp8-fix 2015-03-02 16:42:05 -08:00
songchengjiang 5c460ebb2d add/update particle files 2015-03-02 13:07:32 +08:00
minggo 0755400a79 Merge pull request #10279 from seobyeongky/motionstreak_bug_fix 
MotionStreak MoveTo/MoveBy action OK
 2015-02-28 11:17:28 +08:00
Dale Stammen e4db9f396e disable LTCG. set warning level to W3 2015-02-27 11:16:40 -08:00
Dale Stammen f68a966485 disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 11:07:51 -08:00
Dale Stammen e04fd6eb1d updated cocos2d dll name from 3.4 to 3.5 2015-02-27 10:54:27 -08:00
Dale Stammen d486cc78fb updated cocos2d dll name from 3.4 to 3.5 2015-02-27 10:52:32 -08:00
Dale Stammen 8bc5b37b40 removed missing include files from project 2015-02-27 10:48:53 -08:00
Dale Stammen b5e936c657 disabled LTCG to speed up release builds 2015-02-27 10:43:13 -08:00
Dale Stammen 2eb919bb7a disabled Check SDL to allow CC_DEPRECATED to work as warning and not error 2015-02-27 10:36:48 -08:00
Dale Stammen e9ef92291f renamed cocos2d dll from 3.4 to 3.5 2015-02-27 10:26:58 -08:00
Dale Stammen 49b16718a2 removed missing .h files from solution 2015-02-27 10:24:02 -08:00
yangxiao 437a59fb9a modify project & unproject api 2015-02-27 10:01:57 +08:00
yangxiao 6f395edf0e modify according to minggo 2015-02-26 17:37:45 +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 a1642757f9 merge setcameramask 2015-02-26 15:33:18 +08:00
yangxiao 9a64eb18dd add project function 2015-02-26 15:20:20 +08:00
Ray 1a2aa8633f fix w8 project 2015-02-26 10:27:12 +08:00
Ray 83a7b8012c 3DParticle Reader and tests 2015-02-26 09:19:14 +08:00
Ray c66a4f28bc Add CocosStudio UserCameraReader 
fix Sprite3DReader Test
 2015-02-25 14:19:08 +08:00
Ray fbe9e5b767 complate project file 2015-02-23 00:52:50 +08:00
Ray 8eb201797d 工程文件修改 2015-02-19 17:52:50 +08:00
Dale Stammen 76233d4c6e added missing Particle3D files and tests 2015-02-16 10:41:03 -08:00
Dale Stammen 795f65c85f added missing Particle3D files and tests 2015-02-16 10:01:09 -08:00