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

29851 Commits

Author SHA1 Message Date
yangxiao f13237c013 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-02-26 17:27:42 +08:00
minggo e69e648d7c Merge pull request #10483 from redism/ios-network-header-fix 
apply custom request header for every request type (ios)
 2015-02-26 16:40:12 +08:00
minggo 080369f6e5 Merge pull request #10607 from super626/particle_merge 
clear the particle pool when start
 2015-02-26 16:01:52 +08:00
minggo cf36d1fadd [ci skip]update AUTHORS 2015-02-26 15:52:34 +08:00
minggo 1828f7eb33 [ci skip]update CHANGELOG 2015-02-26 15:45:20 +08:00
minggo e37bbee1c2 Merge pull request #10545 from Mazyod/ios-http-request-leaks 
Fix major memory leaks in iOS http request
 2015-02-26 15:41:10 +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
Krishna 2018943d6d Removed template argument from ontouchescommon 2015-02-26 07:05:44 +01:00
minggo 179a601513 Merge pull request #10606 from CocosRobot/update_cocosfiles_1424924776 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-02-26 14:05:42 +08:00
yangxiao c216984b6f clear the particle pool when start 2015-02-26 13:57:18 +08:00
Krishna 58df860b4e Made the loadeffect utility method into a static method. Removed declaration of old method from header file 2015-02-26 06:53:20 +01:00
CocosRobot 9cecd68064 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-26 04:26:17 +00:00
Nite Luo dbba9e36a1 Merge pull request #10431 from vovkasm/dev/fix-win32-resource-search-path 
Fix win32 resource search path to be relative to the executable.
 2015-02-25 20:24:07 -08:00
minggo 366a938a86 Merge pull request #10603 from sun-ray/v3 
CocosStudio 3DReader
 2015-02-26 11:01:28 +08:00
minggo de2f39be4e [ci skip]update AUTHORS 2015-02-26 10:54:07 +08:00
minggo 614cb73c1a [ci skip]update CHANGELOG 2015-02-26 10:53:17 +08:00
minggo 5d8071bdcf Merge pull request #10597 from loadrunner/v3 
added Romanian language
 2015-02-26 10:51:46 +08:00
Ray bfb5c1ca23 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-02-26 10:44:20 +08:00
minggo 01d404c9d4 [ci skip] update version 2015-02-26 10:41:10 +08:00
minggo 39d2f0629c [ci skip] update version 2015-02-26 10:40:30 +08:00
minggo e6ce627632 [ci skip]update version 2015-02-26 10:39:37 +08:00
minggo 31ac484b07 [ci skip]update CHANGELOG 2015-02-26 10:38:10 +08:00
minggo 21fd9113fd [ci skip]update CHANGELOG 2015-02-26 10:36:23 +08:00
minggo b37cb2b277 [ci skip]update AUTHORS 2015-02-26 10:34:00 +08:00
minggo 31e8d0dccd Merge pull request #10521 from ryule/fix_httpclient-ios 
Fixed HttpClient-ios request to work when the data is started by 0x00.
 2015-02-26 10:32:20 +08:00
Ray 1a2aa8633f fix w8 project 2015-02-26 10:27:12 +08:00
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 3b54af1763 Introduced missing function declarators 2015-02-25 10:26:59 +01: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