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

783 Commits

Author SHA1 Message Date
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
andyque 4e754dd999 modify changelog 2015-06-10 10:54:50 +08:00
andyque 9721621ecc update changelog and authors 2015-06-08 17:30:59 +08:00
andyque f4d6d05787 update changelog 2015-06-08 17:28:00 +08:00
andyque 4af5ba11a6 update changelog 2015-06-02 10:26:09 +08:00
andyque 8bb4e6b75b update changelog 2015-06-01 11:24:53 +08:00
andyque 2eeaa5c198 update changelog 2015-05-28 17:21:53 +08:00
andyque 578fda54ba fix a memory issue in AudioEngine. 
This PR also update AUTHORS and CHANGELOG files.
 2015-05-28 11:49:27 +08:00
andyque 63a5a65456 added mp3 support to winrt audio. 2015-05-28 09:52:18 +08:00
andyque b58bb59fd7 update changelog 2015-05-27 15:59:48 +08:00
andyque 452248c0dd fix iOS 64bit implicit conversion error. 2015-05-27 13:45:07 +08:00
andyque 16f0718e9c update change log 2015-05-27 10:14:36 +08:00
minggo 35533abec0 [ci skip]update CHANGELOG 2015-05-25 16:51:46 +08:00
minggo 41f84c9f11 [ci skip]update CHANGELOG 2015-05-25 16:50:25 +08:00
minggo 42fba34d62 [ci skip]update CHANGELOG 2015-05-25 16:32:52 +08:00
minggo ca3c42362b [ci skip]update CHANGELOG 2015-05-25 15:20:13 +08:00
minggo de5cdb34d5 [ci skip]update CHANGELOG 2015-05-22 14:40:05 +08:00
minggo d7a00b686a [ci skip]update CHANGELOG 2015-05-22 09:53:47 +08:00
minggo ef8e7958cd [ci skip]update CHANGELOG 2015-05-21 10:37:35 +08:00
minggo 6205d043b0 [ci skip]update CHANGELOG 2015-05-20 13:41:59 +08:00
minggo e365c33379 [ci skip]update CHANGELOG 2015-05-20 11:22:51 +08:00
minggo fedd3c46e1 [ci skip]update CHANGELOG 2015-05-19 11:44:06 +08:00
minggo 2489ca176e [ci skip]update CHANGELOG 2015-05-15 10:14:26 +08:00
minggo f090c12030 [ci skip]update CHANGELOG 2015-05-14 10:21:11 +08:00
minggo 9e02b230c7 [ci skip]update CHANGELOG 2015-05-13 17:03:37 +08:00
minggo a587b28e38 Merge pull request #11792 from super626/v3 
particle3d can not be seen when added to scene with terrain
 2015-05-13 09:38:21 +08:00
minggo 14605301ef [ci skip]update CHANGELOG 2015-05-13 09:33:56 +08:00
yangxiao 2c2589c34f modify change log 2015-05-12 13:25:47 +08:00
minggo 38b0cf7bf1 [ci skip]update CHANGELOG 2015-05-08 17:04:52 +08:00
minggo b6ec472985 [ci skip]update CHANGELOG 2015-05-08 10:43:40 +08:00
minggo 761a35cca2 [ci skip]update CHANGELOG 2015-05-07 09:36:49 +08:00
minggo 14f8c75c8c [ci skip]update CHANGELOG 2015-05-07 09:32:50 +08:00
minggo 1d03579966 [ci skip]update CHANGELOG 2015-05-06 10:03:00 +08:00
minggo 35c25edf37 [ci skip]update CHANGELOG 2015-05-06 09:55:43 +08:00
minggo f843466e8e [ci skip]update CHANGELOG 2015-05-05 18:36:46 +08:00
minggo 0ccdf00726 [ci skip]update CHANGELOG 2015-05-05 09:37:05 +08:00
minggo 3a4a0a47c0 [ci skip]update CHANGELOG 2015-05-05 09:34:33 +08:00
minggo dbc036fef4 [ci skip]update CHANGELOG 2015-04-30 10:51:09 +08:00
minggo d96e19dea8 [ci skip]update CHANGELOG 2015-04-29 09:46:31 +08:00
minggo b9a994f06d [ci skip]update CHANGELOG 2015-04-28 16:44:24 +08:00
minggo e7bbb2b04c [ci skip]update CHANGELOG 2015-04-28 16:42:04 +08:00
minggo 3c2528d323 [ci skip]update CHANGELOG 2015-04-28 16:40:39 +08:00
minggo 2596c8dd28 [ci skip]update CHANGELOG 2015-04-28 16:39:18 +08:00
minggo 30a646f769 [ci skip]update CHANGELOG 2015-04-27 17:41:40 +08:00
minggo 2441e1290f [ci skip]update CHANGELOG 2015-04-27 17:17:36 +08:00
minggo d932d1e7e1 [ci skip]update CHANGELOG 2015-04-27 10:17:56 +08:00
minggo bdce0d955b [ci skip]update CHANGELOG 2015-04-21 17:12:16 +08:00
minggo e55e19923b [ci skip]update CHANGELOG 2015-04-20 13:37:19 +08:00
minggo 707c7170b1 [ci skip]update CHANGELOG 2015-04-20 10:37:40 +08:00
minggo 133ca38513 [ci skip]update CHANGELOG 2015-04-20 09:56:10 +08:00
minggo 425b2b62e1 [ci skip]update CHANGELOG 2015-04-17 17:59:13 +08:00
minggo cfb232f2b0 [ci skip]update CHANGELOG 2015-04-17 17:58:52 +08:00
minggo 5606610b32 [ci skip]update CHANGELOG 2015-04-17 15:24:50 +08:00
minggo 83b9975578 [ci skip]update CHANGELOG 2015-04-16 18:17:37 +08:00
minggo b4acf1beb8 [ci skip]update CHANGELOG 2015-04-16 14:35:10 +08:00
minggo 1803822465 Merge pull request #11446 from super626/v3 
Fix PU clone bug
 2015-04-16 10:13:37 +08:00
minggo d04e05e943 [ci skip]update CHANGELOG 2015-04-16 10:12:12 +08:00
yangxiao 4236d973c0 reset submodule and modify changelog 2015-04-15 16:53:05 +08:00
minggo 7060af7fa7 [ci skip]update CHANGELOG 2015-04-14 18:11:09 +08:00
minggo 561123d4cc [ci skip]update CHANGELOG 2015-04-14 17:49:17 +08:00
minggo fe207fe8e0 [ci skip]update CHANGELOG 2015-04-14 17:02:20 +08:00
minggo 1e4c22c043 [ci skip]update CHANGELOG 2015-04-14 16:39:49 +08:00
minggo 793f7cd1e7 [ci skip]update CHANGELOG 2015-04-14 14:29:49 +08:00
minggo d4d7a3a7b0 [ci skip]update CHANGELOG 2015-04-14 10:01:49 +08:00
minggo f8cf6822b9 [ci skip]update CHANGELOG 2015-04-14 09:38:03 +08:00
minggo 8a160d76a3 [ci skip]update CHANGELOG 2015-04-10 18:34:45 +08:00
minggo 9876f0765e [ci skip]update CHANGELOG 2015-04-10 16:43:21 +08:00
minggo 68fc4ad741 [ci skip]update CHANGELOG 2015-04-10 15:25:46 +08:00
minggo 554901bb12 [ci skip]update CHANGELOG 2015-04-10 15:24:43 +08:00
minggo 16cb5f32d3 [ci skip]update CHANGELOG 2015-04-10 09:37:45 +08:00
minggo 1765d53413 [ci skip]update CHANGELOG 2015-04-09 15:49:34 +08:00
minggo 64c45fa3ca [ci skip]update CHANGELOG 2015-04-08 22:40:18 +08:00
minggo 3ce6602f3a Merge pull request #11335 from super626/v3 
Modify changelog and add getAABBRecursively
 2015-04-08 18:03:48 +08:00
minggo 0b8f9ad269 [ci skip]update CHANGELOG 2015-04-08 17:52:16 +08:00
yangxiao 3b01222787 modify changelog 2015-04-08 16:27:26 +08:00
minggo c8bc8779fd [ci skip]update CHANGELOG 2015-04-08 16:24:18 +08:00
yangxiao 0d0bad186f resolve conflict 2015-04-08 16:23:35 +08:00
yangxiao 427c15e53f modify changelog 2015-04-08 16:13:41 +08:00
yangxiao 37d75654f4 modify changelog 2015-04-08 16:09:13 +08:00
minggo e4fb954fde [ci skip]update CHANGELOG 2015-04-08 14:46:06 +08:00
minggo 6892ec85ee [ci skip]update CHANGELOG 2015-04-08 09:47:01 +08:00
minggo 31b21b56fe [ci skip]update CHANGELOG 2015-04-07 18:18:22 +08:00