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

775 Commits

Author SHA1 Message Date
minggo 690db56f44 Merge v3.14.1 (#17231) 
* update cocos console to fix compiling error with Android Studio projects (#17129) (#17145)

* fix crash if physics3d camera is not set (#17139) (#17144)

* fix linking error with vs2015 (#17146)

* fix issue #17116 & #17119 for v3.14.1

* tests cases

* better documentation

* doc: updates sprite doc

* Fix scale9sprite polygon info (#17161)

* add guard code to Scale9Sprite

* add new test code

* Glfw linux issue (#17166)

* purge glfw3 before installing glfw3.2

* purge glfw3 before installing glfw3.2

* Update web engine ref (#17169)

* update version and release note (#17170)

* issue ##17119 improved v3.14.1 (#17189)

* update version (#17230)
 2017-01-20 09:59:30 +08:00
pandamicro 41abefd082 Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14 
# Conflicts:
#	CHANGELOG
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
#	cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
 2016-12-26 18:53:42 +08:00
pandamicro 8c71531338 Fix test case issues and add change log 2016-12-26 18:36:19 +08:00
minggo 9e57d6b7d4 [ci skip]Update changelog releasenote (#17050) 
* update changelog

* update changelog and release note for v3.14

* update top content of doc
 2016-12-21 13:49:44 +08:00
pandamicro a715e3169f Sync issue fixes from creator (#17041) 
* Add EventDispatcher#hasEventListener (sync from creator)

* Fix function wrapper using js object during its gc

* Support more system languages

* Direct log/error for better understanding problems & add sys.now

* Synchronize Editbox APIs

* Synchronize Scheduler.PRIORITY_NON_SYSTEM const

* Upgrade web engine

* Upgrade test cases

* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue

* Manual bind EventListeners’ create to avoid memory issue

* Fix compilation issue when COCOS_DEBUG = 2

* Unify function name of Texture2D::releaseTexture

* Fix compilation issues and update web & bindings-generator

* Fix lua compilation issue

* Use %ld instead of %zd

* Separate FinalizeHook for ref objects and non ref objects

* Fix spine TrackEntry recursive conversion issue by using getter

* Fix crash during Wrappers deallocation (possible to have leak)

* Increase default JS heap to 32 mb

* Update engine version

* Add change log of web engine

* Improve cc.formatStr

* Fix chipmunk crash issues when using setDefaultCollisionHandler

* Add change log for JSB and update web engine ref
 2016-12-21 13:39:34 +08:00
pandamicro 3dd8271241 Add change log for JSB and update web engine ref 2016-12-21 11:10:48 +08:00
pandamicro 6c159654df Add change log of web engine 2016-12-20 01:05:57 +08:00
minggo f13fde4fc4 update changelog (#16969) 2016-12-07 15:31:00 +08:00
minggo 02e943075b update changelog and release note (#16548) 2016-09-08 18:36:25 +08:00
minggo e122b902a9 update changelog and release note (#16537) 2016-09-07 13:58:48 +08:00
minggo c233a5bdf7 [ci skip]V3.13.1 doc (#16528) 
* update release note and changelog

* update engine version
 2016-09-06 17:01:23 +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 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