Commit Graph

764 Commits

Author SHA1 Message Date
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 fe3fb42f49 update release note & changelog (#16376) 2016-08-17 15:40:10 +08:00
minggo 5c021ee645 update changelog 2016-08-03 17:23:10 +08:00
pandamicro 927fd73ff0 Update release notes 2016-07-06 18:02:25 +08:00
minggo 5ecb23a26e update release date 2016-07-06 14:03:15 +08:00
minggo c782626285 Update releasenote changelog (#15967)
* update changelog

* update changelog
2016-06-27 13:37:38 +08:00
minggo 3c12cce352 update changelog 2016-06-17 18:09:20 +08:00
minggo 8564dbd921 update changelog 2016-05-26 10:34:35 +08:00
minggo ae7c91c1b8 update changelog 2016-05-11 16:12:18 +08:00
minggo 072424e296 update changelog 2016-05-11 16:10:58 +08:00
minggo 7dcd2fe7cd update changelog 2016-05-04 11:54:30 +08:00
minggo 79d659e46b update changelog and release note 2016-04-27 15:01:02 +08:00
minggo 2f86809804 update release note 2016-04-15 09:46:56 +08:00
minggo 009c7926f6 update changelog (#15424) 2016-04-14 15:09:58 +08:00
minggo b21c6f37d5 update changelog for v3.11 2016-03-29 11:32:34 +08:00
XiaoFeng ab0efd933a Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
	CHANGELOG
	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
	tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
zilongshanren 67f4be538b Update CHANGELOG 2016-01-07 17:08:40 +08:00
zilongshanren a05e15d17e Update CHANGELOG 2016-01-07 16:58:48 +08:00
zilongshanren 7d730d7c21 Update CHANGELOG 2015-12-22 13:46:29 +08:00
zilongshanren e8d3e3f136 Update CHANGELOG 2015-12-22 13:44:30 +08:00
肖峰 a6a9e30287 remove duplicate change log 2015-12-21 17:00:20 +08:00
肖峰 23c51145ec update changeling 2015-12-21 10:12:24 +08:00
肖峰 7b8db23a9e Update change log and authors 2015-12-20 15:34:21 +08:00
zilongshanren ba74e8fc17 Update CHANGELOG 2015-12-19 17:07:50 +08:00
zilongshanren 7b64bbc3cb Update CHANGELOG 2015-12-19 10:13:55 +08:00
zilongshanren a9f404c200 Update CHANGELOG 2015-12-11 13:56:29 +08:00
zilongshanren e1751db195 Update CHANGELOG 2015-11-28 15:41:42 +08:00
zilongshanren 4fbe8a62bf Update CHANGELOG 2015-11-28 14:29:40 +08:00
zilongshanren 5e02b7f20a Update CHANGELOG 2015-11-28 14:28:44 +08:00
zilongshanren 9639208ce3 Update CHANGELOG 2015-11-27 17:32:31 +08:00
zilongshanren f5d2ea11b7 Update CHANGELOG 2015-11-27 10:58:48 +08:00
zilongshanren 6321357c56 Update CHANGELOG 2015-11-26 13:54:34 +08:00
zilongshanren b89700b7d6 Update CHANGELOG 2015-11-26 10:30:36 +08:00
pandamicro 21d0ff846c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-11-19 17:20:42 +08:00
肖峰 d0c3275281 Change version in change log 2015-11-19 13:33:05 +08:00
pandamicro c990703b8b Merge branch 'v3.8.1' of github.com:cocos2d/cocos2d-x into v3
Conflicts:
	CHANGELOG
	CMakeLists.txt
	cocos/cocos2d.cpp
	cocos/scripting/js-bindings/manual/ScriptingCore.h
	cocos/scripting/js-bindings/script/jsb_cocos2d.js
	docs/RELEASE_NOTES.md
	external/config.json
	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
	tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/Info.plist
	tools/simulator/frameworks/runtime-src/proj.win32/game.rc
2015-11-17 10:41:41 +08:00
XiaoFeng ae93112ec6 Fix spell error 2015-10-21 10:13:27 +08:00
XiaoFeng 18b7b533ce Update 3.9 beta0 change log & version info 2015-10-20 16:46:31 +08:00
pandamicro c870d1daf1 Update docs and versions for v3.8.1 2015-09-17 12:13:10 +08:00
pandamicro 08fc2dd36b Update release docs for v3.8 final 2015-09-06 16:28:44 +08:00
pandamicro 8f6f5c1191 Update engine versions 2015-08-31 13:52:15 +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
pandamicro 6f010f5316 Update release docs for v3.7.1 2015-08-12 13:02:35 +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 c126aac35f v3.7 rc1 release doc 2015-07-14 23:21:34 +08: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
andyque 87f815871b update changelog 2015-06-12 10:42:12 +08:00