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

217 Commits

Author SHA1 Message Date
子龙山人 4c88f1dd63 Merge pull request #13255 from ZhangMenghe/Docs 
Modify framework architecture graph
 2015-08-07 09:38:28 +08:00
ZhangMenghe ed1a4b9ebb Modify framework architecture graph 2015-08-07 09:20:20 +08:00
pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
 2015-08-02 22:28:27 +08:00
ZhangMenghe 174d9cacf3 Modify name of engine in architecture graph 2015-07-29 10:05:01 +08:00
ZhangMenghe b77dec2b0a Add framework architecture figure to README 2015-07-28 17:31:14 +08:00
pandamicro a2a32ef58c Release docs for v3.7.1 2015-07-25 15:16:39 +08:00
pandamicro f98e9495fe Update release docs for v3.7 2015-07-21 09:49:41 +08:00
pandamicro e2068ab84a Update versions and docs for v3.7 2015-07-16 16:53:43 +08:00
pandamicro 0064dfbc71 Update requirements info 2015-07-15 14:11:59 +08:00
pandamicro c126aac35f v3.7 rc1 release doc 2015-07-14 23:21:34 +08:00
Nite Luo 55037345a4 update release notes for sdkbox 2015-07-13 18:42:35 -07:00
pandamicro 33c5b9b102 Refine release docs for Cocos2d-x v3.7rc0 2015-07-01 19:17:38 +08:00
pandamicro 992ea8ac4b Release docs for Cocos2d-x v3.7rc0 2015-07-01 18:44:15 +08:00
pandamicro 276ce3a0a7 Update versions 2015-06-19 09:56:19 +08:00
linshun c54d4bab31 issue #12078: renamed platform to platform specific. 2015-06-15 10:46:09 +08:00
linshun efed0da8bc issue #12078: added subgroup of physics 2d. 2015-06-15 10:28:37 +08:00
linshun 09b52331d1 issue #12078: added renderer group and removed core and support group. 2015-06-01 13:43:56 +08:00
samuele3hu 037c17fe5d Remove vs2012 support in v3 2015-05-05 16:11:26 +08:00
minggo d825a74d81 update doxygen config 2015-04-29 14:14:10 +08:00
minggo 4ef495e43b [ci skip]update release note 2015-04-29 13:41:57 +08:00
yangxiao 79dc972fe7 modify releasenote 2015-04-28 18:14:52 +08:00
andyque b3f96cb2b2 add button memory optimization 2015-04-22 14:59:22 +08:00
minggo 503aac0bec update release note 2015-04-17 17:46:44 +08:00
minggo dc2de4b803 add releate note for v3.6beta0 2015-04-17 16:53:50 +08:00
yangxiao 9b363e5193 add terrain to release note 2015-04-09 16:05:42 +08:00
minggo 3dcd123c09 [ci skip]update release note 2015-04-09 14:30:06 +08:00
minggo 8436ef1ab6 update release note 2015-04-07 15:59:40 +08:00
minggo 332ce1a8f3 Merge pull request #11249 from super626/v3 
Release note for texturecube skybox and animtion quality
 2015-04-02 09:39:16 +08:00
yangxiao 591fff4046 release note for texturecube skybox and animtion quality 2015-04-01 16:40:40 +08:00
minggo c4ac84d4f6 Merge pull request #11200 from samuele3hu/v3_5_comment 
[ci skip]Update comments of some header files
 2015-03-27 17:08:26 +08:00
minggo af5c0a5648 Merge pull request #11201 from minggo/add-documentation 
[ci skip]fix about content
 2015-03-27 17:06:03 +08:00
minggo e70deabfa3 fix about content 2015-03-27 16:18:28 +08:00
minggo 1ce6044c0d [ci skip]update level information 2015-03-27 16:08:58 +08:00
samuele3hu f54512a618 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment 2015-03-27 15:59:05 +08:00
samuele3hu bb225d052e Update comments of some header files 2015-03-27 15:27:08 +08:00
minggo 0c0404c356 change version, cocos2d-x -> cocos 2015-03-27 14:35:04 +08:00
andyque 813bcc4017 Merge branch 'v3' into fix-comments 2015-03-27 11:26:46 +08:00
andyque bc2ffe4e19 remove unneeded js & lua NA and remove deprecated list from navtree 2015-03-27 11:02:04 +08:00
samuele3hu fb085fc2ea Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_comment 
Conflicts:
	docs/doxygen_white_book.config
 2015-03-26 22:29:37 +08:00
samuele3hu e0bde0f789 Update comments of some header files 2015-03-26 22:07:44 +08:00
andyque 42cd63fe01 fix group error 2015-03-26 15:47:14 +08:00
Vincent Yang 89f538c415 Change module name define in docs/Groups.h, docs/doxygen_modules.h duplicated with group.h, rm it. 2015-03-20 11:31:09 +08:00
Vincent Yang 85a26a32c3 Modify doxygen_white_book.h for ignore some macros like this: CC_DLL... 2015-03-19 20:29:31 +08:00
Vincent Yang 93ccdae7df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-03-19 20:22:59 +08:00
Vincent Yang ca4c71bf0e Add MainPageWhiteBook.h, and move doxygen_modules.h to docs. 2015-03-19 20:21:40 +08:00
Huabing.Xu 18da1ceef7 [ci skip]update releaseNotes 2015-03-19 17:38:52 +08:00
zhangbin a5e148c829 Update comments of some header files. 2015-03-18 20:56:17 +08: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
Huabing.Xu eb1d70c5a9 Update RELEASE_NOTES.md 2015-03-13 19:35:52 +08:00
yangxiao c3d7fbebf4 correct words 2015-03-13 18:12:20 +08:00