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

25237 Commits

Author SHA1 Message Date
honghui 9656a31be9 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 
Conflicts:
	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
 2014-11-12 18:12:07 +08:00
honghui d4e0460ed4 revert commit a7f8199e65 2014-11-12 18:05:32 +08:00
honghui a6e1c40db7 can't build IPA using developer certificate in Mac OS X 10.10 2014-11-12 18:05:32 +08:00
Ricardo Quesada 706f49cb59 Merge pull request #9083 from ricardoquesada/release_fixes 
Release fixes
 2014-11-11 14:09:43 -08:00
Ricardo Quesada 46004f3d7e renamed RELEASING_RULES to RELEASE ENGINEERING 2014-11-11 14:09:08 -08:00
Ricardo Quesada 3d4b477fc4 more RELEASING_RULES.md fixes 2014-11-11 14:08:21 -08:00
minggo 6c67c6921d Merge pull request #8977 from pipu/v3_Modify_TextReader 
Modify that parsing attribute "fontName" of TextReader
 2014-11-11 12:05:49 +08:00
Ricardo Quesada 7417d59447 Merge pull request #9078 from ricardoquesada/releasing_fixes 
fixes for releasing
 2014-11-10 19:30:08 -08:00
Ricardo Quesada 9da8188012 fixes for releasing 2014-11-10 19:29:44 -08:00
Ricardo Quesada 377af3b447 Merge pull request #9076 from ricardoquesada/android_build_fix 
fixes how to check for CPU in android-build
 2014-11-10 16:09:00 -08:00
Ricardo Quesada 4d2752e84f fixes how to check for CPU in android-build 2014-11-10 16:08:12 -08:00
minggo 8e3590978d Merge pull request #9072 from andyque/fixCompileError 
fix compile error
 2014-11-10 16:03:21 +08:00
andyque 16d0419136 fix compile error 2014-11-10 16:02:06 +08:00
minggo 23430c0190 Merge pull request #9069 from CocosRobot/update_lua_bindings_1415547046 
[AUTO]: updating luabinding automatically
 2014-11-10 14:39:30 +08:00
CocosRobot a908c391b0 [AUTO]: updating luabinding automatically 2014-11-09 15:33:08 +00:00
minggo 6ac6e07a4d [ci skip] Update CHANGELOG 2014-11-09 23:30:39 +08:00
minggo 8476956ef9 Merge pull request #9057 from andyque/fixScale9FlipIssueNew 
fix scale9sprite flip issue
 2014-11-09 23:27:40 +08:00
minggo d2fd1a1152 [ci skip]Update Authors 2014-11-09 23:27:13 +08:00
minggo e7d5e79e88 Merge pull request #8998 from aeonmine/v3 
fix memory leak cocos studiov2.0 engine v3.3
 2014-11-09 23:24:16 +08:00
minggo 0bbb9e9368 Merge pull request #9056 from CocosRobot/update_lua_bindings_1415327766 
[AUTO]: updating luabinding automatically
 2014-11-09 23:19:53 +08:00
minggo c1d25e18ce Merge pull request #9055 from CocosRobot/update_cocosfiles_1415327684 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-11-09 23:19:28 +08:00
honghui a7f8199e65 can't build IPA using developer certificate in Mac OS X 10.10 2014-11-07 16:24:44 +08:00
andyque 5483bc834d fix scale9sprite flip issue 2014-11-07 11:09:22 +08:00
CocosRobot aae2fd9e2a [AUTO]: updating luabinding automatically 2014-11-07 02:38:01 +00:00
CocosRobot 80ce1537e7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-07 02:34:46 +00:00
minggo db659107d3 Merge pull request #9052 from huangshiwu/v3_fixbug 
fix ui crash bug caused by DrawNode
 2014-11-07 10:33:08 +08:00
minggo 3b8ddf1b54 Merge pull request #9005 from joshuastray/add-resource-folder-def 
Update CCFileUtils-linux.cpp
 2014-11-07 10:25:14 +08:00
huangshiwu ace9933d72 fix ui crash bug caused by DrawNode 2014-11-07 10:05:29 +08:00
Ricardo Quesada 9558d97517 Merge pull request #9047 from ricardoquesada/releasing 
Adds releasing rules
 2014-11-06 14:44:21 -08:00
Ricardo Quesada 120e31f4fe Adds releasing rules 2014-11-06 14:43:45 -08:00
Ricardo Quesada 738deddd42 Update CONTRIBUTE.md 2014-11-06 14:30:00 -08:00
Ricardo Quesada 9e795777b3 Merge pull request #9042 from ricardoquesada/contribute 
How to contribute to cocos2d-x
 2014-11-06 14:17:07 -08:00
Ricardo Quesada 8926e115cd How to contribute to cocos2d-x 2014-11-06 14:16:39 -08:00
Ricardo Quesada f8b1915970 Merge pull request #9040 from ricardoquesada/warnings_fixes 
fixes some compiler warnings
 2014-11-06 12:26:30 -08:00
Ricardo Quesada 3d448e86ef fixes some compiler warnings 
don't call deprecated functions
 2014-11-06 12:25:55 -08:00
minggo 4911ae448d Merge pull request #9032 from cocoscodeide/v3 
runtime demo is ugly when screen orientation is portrait
 2014-11-06 11:59:53 +08:00
honghui 8af00cdb06 runtime demo is ugly when screen orientation is portrait 2014-11-06 11:30:01 +08:00
minggo 0402ed37f6 Merge pull request #9027 from winipcfg/patch-1 
Update CHANGELOG
 2014-11-06 10:19:39 +08:00
Summoner 3109b40df9 Update CHANGELOG 
fix typo
 2014-11-06 09:13:47 +08:00
Ricardo Quesada bffe5e09e0 Merge pull request #9024 from ricardoquesada/readme_fixes 
fixes types in readme
 2014-11-05 10:27:25 -08:00
Ricardo Quesada e83de40592 fixes types in readme 
thanks @kidproquo
 2014-11-05 10:26:46 -08:00
minggo 25053b80bc Merge pull request #8930 from super626/fixsprite 
add Sprite3D::getMeshArrayByName and refactor re-skin test
 2014-11-05 18:11:51 +08:00
minggo 666fdac7cb Merge pull request #9012 from CocosRobot/update_lua_bindings_1415148600 
[AUTO]: updating luabinding automatically
 2014-11-05 18:09:23 +08:00
minggo 7565b9b1eb Merge pull request #8969 from kaylyun/v3 
BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP
 2014-11-05 17:58:28 +08:00
minggo 46972eb477 [ci skip]Update Authors 2014-11-05 17:53:38 +08:00
minggo 8a49ae0b07 Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization 
Cleanup order of fields initialization.
 2014-11-05 17:51:58 +08:00
minggo 7123902f11 [ci skip] Update CHANGELOG 2014-11-05 17:51:35 +08:00
minggo e56c84ebf0 Merge pull request #8983 from super626/camera 
fix wrong camera lookat computation
 2014-11-05 17:49:59 +08:00
minggo dd7ef28145 Merge pull request #8954 from andyque/modifyChangeLog 
modify changelog
 2014-11-05 17:49:12 +08:00
minggo c1caa8515c Merge pull request #9015 from CocosRobot/update_lua_bindings_1415166130 
[AUTO]: updating luabinding automatically
 2014-11-05 13:54:19 +08:00