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

320 Commits

Author SHA1 Message Date
pandamicro ec52cf4aa4 [ci skip] Remove LayerRGBA in scripts to avoid issues and update web ref (#16412) 
* Remove LayerRGBA in scripts to avoid issues and update web ref

* Doctoc docs
 2016-08-22 10:55:21 +08:00
pandamicro f0be4f3069 Merge part of Cocos2d-x-lite (#16380) 
* Update js auto binding settings with new ndk version

* Remove unnecessary property from Ref

* Merge part of Cocos2d-x-lite :
1. Improve network bindings
2. Use nullptr instead of NULL
3. Remove usage of some deprecated APIs
4. Add some defensive code and cleanup

* Fix spine track entry circle referencing issue

* cocos2d/cocos2d-x#16327: Fix global object leak issue in JSB

* Improve ScriptingCore::evalString, old implementation have been deprecated in Spidermonkey

* Update JS versions

* Add docs for web v3.13

* Improve ScriptingCore

* Manual merge cocos2d/cocos2d-x#16383 by DavidDeSimone

* Fix auto bindings configurations

* Update web ref
 2016-08-19 16:28:47 +08:00
minggo e9a5a4e2bd Revert luajit (#16397) 
* revert to use lua

* comment lua bytecode test

* update release note
 2016-08-19 11:49:19 +08:00
minggo fe3fb42f49 update release note & changelog (#16376) 2016-08-17 15:40:10 +08:00
minggo 6a5bf06848 moidfy release note 2016-08-04 09:48:55 +08:00
minggo 95e60d4124 update version 2016-07-31 22:56:19 +08:00
mogemimi b8e483bdd1 Fix minor typo in Doxygen configs 2016-07-17 05:07:59 +09:00
mogemimi 56e8f4246a Fix typos in README and other markdown docs 2016-07-07 23:59:57 +09:00
minggo c579cd48f4 update VR link 2016-07-07 10:55:27 +08:00
slackmoehrle a68c82f2f2 updated link to VR doc, capitalized some headers, corrected Cocos2d-x branding. 2016-07-06 10:15:56 -04:00
pandamicro 927fd73ff0 Update release notes 2016-07-06 18:02:25 +08:00
minggo 995cd6fcfd update release note 2016-07-06 14:41:13 +08:00
minggo 01fe35a24b update release note 2016-07-06 14:40:25 +08:00
minggo be24cc8137 update release note 2016-07-06 14:39:40 +08:00
minggo 214f250622 update release note 2016-07-06 14:36:37 +08:00
minggo 2b07f3785a update release note 2016-07-06 14:35:15 +08:00
minggo 46c38fff62 update release note 2016-07-01 17:21:26 +08:00
minggo a10398ad66 update engine version 2016-06-29 10:05:59 +08:00
Slack-Moehrle d17709565d Update Release Notes -> add Tizen, add VR, removed some old test 
add Tizen, add VR, removed some old test, fixed some language.

Please delete this branch when merged.
 2016-06-28 16:55:59 -04:00
minggo 23d16494fa update release note 2016-06-28 17:21:43 +08:00
minggo c782626285 Update releasenote changelog (#15967) 
* update changelog

* update changelog
 2016-06-27 13:37:38 +08:00
minggo 251ee4e85a Add web engine feature in release note (#15648) 2016-05-16 14:01:55 +08:00
minggo 1c77d8fd5c update release note 2016-05-11 14:59:15 +08:00
Slack-Moehrle c4f3ad7e47 change Culr to Curl 2016-05-10 17:38:56 -04:00
minggo aa94836190 update release note 2016-05-10 10:36:14 +08:00
minggo b74ed7de20 update release note 2016-05-04 11:54:38 +08:00
slackmoehrle a18ea0036c added step for incrementing dependency version number 2016-04-28 21:46:53 -04:00
slackmoehrle 0c427541c0 updated OpenSSL section 2016-04-28 20:15:41 -04:00
slackmoehrle b1da4b9c80 started Release Notes changes for v3.11 2016-04-28 15:17:55 -04:00
minggo 79d659e46b update changelog and release note 2016-04-27 15:01:02 +08:00
pandamicro bb2cfc7308 Update engine version 2016-04-11 11:11:17 +08:00
zhangcheng a19cceedb5 [ci skip]Update RELEASE_NOTES. 2016-01-06 09:50:00 +08:00
zhangcheng 5f85f6154b fix error 2016-01-05 11:24:55 +08:00
zhangcheng a6123bee06 Fix error. 2016-01-05 10:52:03 +08:00
zhangcheng 524a4f4c22 Update RELEASE_NOTES. 2016-01-05 10:27:06 +08:00
zhangcheng 324d1f905e [ci skip]Update RELEASE_NOTES.md. 2016-01-05 10:23:52 +08:00
zhangcheng d3525d8a1d 1, Fix error english explain. 
2, Fix error API.
3, Fix some bugs.
 2015-12-31 15:07:48 +08:00
zhangcheng 92d5d0bde7 [v](#v310) -> [v3.10](#v310) 2015-12-29 09:48:14 +08:00
zhangcheng 722669b3e2 Update Release notes. 2015-12-25 18:58:31 +08:00
zhangcheng c4ed577589 Update cocos2d-x 3.10 Release note. 2015-12-21 16:56:35 +08:00
XiaoFeng 4815ec8b9a Update version number to v3.10 2015-12-14 10:32:29 +08:00
XiaoFeng 4cf252475b update RELEASE_NOTES.md 2015-11-06 21:41:34 +08:00
XiaoFeng 7a0d014194 update file 2015-11-06 21:08:47 +08:00
XiaoFeng c0c35c603e Update version number & RELEASE_NOTES.md, prepare 3.9 release 2015-11-06 18:38:09 +08:00
pandamicro d3504a9216 Update versions and html5 engine 2015-09-22 02:31:21 +08:00
WenhaiLin a3b5becb45 Sync v3.8 to v3 2015-08-31 22:05:37 +08:00
pandamicro 8f6f5c1191 Update engine versions 2015-08-31 13:52:15 +08:00
andyque 6a7922caf1 rename contribute.md to contributing.md 2015-08-28 14:10:41 +08:00
pandamicro 4a3ace6ff5 Add release note for v3.8 2015-08-25 18:24:31 +08:00
pandamicro 6ee33499b4 Update changelog and versions for v3.8 rc0 2015-08-22 11:56:25 +08:00
andyque 82f597ce98 Merge branch 'v3.7.1' into v3 
# Conflicts:
#	cocos/scripting/lua-bindings/auto/api/CheckBox.lua
#	cocos/ui/UICheckBox.cpp
#	cocos/ui/UICheckBox.h
 2015-08-12 17:59:50 +08:00
minggo f40a0c14d5 add some pictures and gif for release note 2015-08-12 14:18:19 +08:00
pandamicro 6f010f5316 Update release docs for v3.7.1 2015-08-12 13:02:35 +08:00
子龙山人 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