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

27536 Commits

Author SHA1 Message Date
Ray 0f8f0322c8 fix ccs-res 2015-02-26 10:10:32 +08:00
minggo d3d3c1d9ec Merge pull request #10601 from CocosRobot/update_cocosfiles_1424914844 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-02-26 09:42:50 +08:00
CocosRobot 0072400fc9 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-26 01:40:45 +00:00
minggo 7c283b0a13 Merge pull request #10598 from MSOpenTech/v3-winrt-fix 
Added missing UserCameraReader files to the Windows 8.1 Universal App project
 2015-02-26 09:37:20 +08:00
XiaoYang 5da756c907 Merge pull request #240 from lvlonggame/v3 
setCameraMask for UI
 2015-02-26 09:37:05 +08:00
Ray a2dc8b85c4 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-02-26 09:20:16 +08:00
Ray 83a7b8012c 3DParticle Reader and tests 2015-02-26 09:19:14 +08:00
Dale Stammen 38d513648a added missing UserCameraReader files to Universal App project 2015-02-25 08:33:19 -08:00
loadrunner 9e310ba272 added Romanian language 2015-02-25 17:25:19 +02:00
minggo 524c723daa Merge pull request #10587 from sun-ray/v3 
CocosStudio 3DReader
 2015-02-25 20:19:06 +08:00
minggo 4d46790ec7 Merge pull request #10590 from super626/releasenote 
Releasenote for Particles
 2015-02-25 20:18:34 +08:00
Krishna 75d5e26340 Bug Fix. INcluding the required template type for the function declaration 2015-02-25 12:19:19 +01:00
minggo e4e9259dc1 Merge pull request #10592 from super626/particle_merge 
add Particle Universe copy right
 2015-02-25 18:08:25 +08:00
yangxiao 22d8917100 add Particle Universe copy right 2015-02-25 18:05:41 +08:00
minggo feff3bfb2c Merge pull request #10591 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-02-25 18:04:43 +08:00
zhangbin 6ada496b57 Update the reference of submodule cocos2d-console. 2015-02-25 18:03:05 +08:00
yangxiao 4b53da7a46 correct words 2015-02-25 17:33:56 +08:00
yangxiao ac02899015 correct words 2015-02-25 17:31:50 +08:00
yangxiao 9330b37bca correct wrong words 2015-02-25 17:29:31 +08:00
Krishna 2d80518873 Introduced function declarators that were missing 2015-02-25 10:23:35 +01:00
yangxiao 0793f2ec25 add particles to release note 2015-02-25 17:12:48 +08:00
minggo 8149c109d8 Merge pull request #10588 from minggo/sync-v4 
Fix ListView::setDirection issue
 2015-02-25 16:27:15 +08:00
pandamicro 9bf22a51ea Fix ListView::setDirection issue 2015-02-25 16:17:43 +08:00
Ray ff07f62e83 fix CocosStudio 3DReader test resource 2015-02-25 15:49:04 +08:00
Ray 71f90306f7 update ccs-res submodule 2015-02-25 15:40:46 +08:00
Mazyad Alabduljaleel 23093b9c53 Just a few more leak fixes 2015-02-25 10:56:25 +04:00
Mazyad Alabduljaleel c80312bea6 Two more memory leaks 2015-02-25 10:52:15 +04:00
Mazyad Alabduljaleel 3e60e0ddf6 For some reason, this is causing a conflict 2015-02-25 10:44:00 +04:00
Ray 2f4fbbf4e8 fix the define problem 2015-02-25 14:28:39 +08:00
Ray 94523b667a Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-02-25 14:19:37 +08:00
Ray c66a4f28bc Add CocosStudio UserCameraReader 
fix Sprite3DReader Test
 2015-02-25 14:19:08 +08:00
minggo 2f618a9e09 Merge pull request #10541 from lzbgt/master 
fix the linker ld error when building
 2015-02-25 11:00:49 +08:00
lvlong ac5d34b93d recover bundle3d 2015-02-25 10:56:01 +08:00
lvlong 2d89ee34ef recover bundle3d 2015-02-25 10:54:49 +08:00
minggo 7a0901cb25 Merge pull request #10576 from SunLightJuly/v3_fix 
update sub-module "cocos2d-console"
 2015-02-25 10:52:39 +08:00
SunLightJuly 2b269aab53 update sub-module "cocos2d-console" 2015-02-25 10:45:36 +08:00
lvlong 7437bfad15 recover bundle3D. 2015-02-25 10:33:16 +08:00
minggo 0e303536f7 Merge pull request #10564 from SunLightJuly/v3_fix 
support packages manager
 2015-02-25 09:56:49 +08:00
minggo c2479adc59 Merge pull request #10549 from mogemimi/fix-typo 
Fix typo in Image::Format
 2015-02-25 09:32:58 +08:00
minggo c460a5bfa4 Merge pull request #10569 from MSOpenTech/v3-wp8-fix 
fixed conflict with near and far already  defined in windows.h for Win32, WP8 and WinRT
 2015-02-25 09:27:38 +08:00
Dale Stammen b39b078593 fixed conflict with near and far defined in windows.h for Win32, WP8 and WinRT platforms 2015-02-24 14:39:21 -08:00
SunLightJuly 4dd4e7d703 call function "register_all_packages()" in default template of cpp 2015-02-25 00:25:40 +08:00
SunLightJuly ec22923aa9 modifed AppDelegate.cpp: add function "register_all_packages()" to support packages manager 2015-02-24 20:50:58 +08:00
minggo 0d2566c202 Merge pull request #10520 from mannewalis/v3 
adding CC_DEPRECATE(version) macro
 2015-02-24 09:30:21 +08:00
minggo ffd6c0f57f Merge pull request #10561 from CocosRobot/update_cocosfiles_1424741224 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-02-24 09:27:29 +08:00
CocosRobot 92806f7919 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-24 01:27:05 +00:00
minggo e8e40f202b Merge pull request #10542 from sun-ray/v3 
CocosStudio Sprite3D Reader
 2015-02-24 09:24:45 +08:00
mogemimi d384f7ce1e Fix typo: unkown -> unknown 2015-02-24 02:39:50 +09:00
mogemimi 9e7ce0cd85 Fix typo in Image::Format 2015-02-24 02:36:20 +09:00
Ray bd64321e30 fix commit 2015-02-23 23:57:41 +08:00