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

563 Commits

Author SHA1 Message Date
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
pandamicro 6f010f5316 Update release docs for v3.7.1 2015-08-12 13:02:35 +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
pandamicro a2a32ef58c Release docs for v3.7.1 2015-07-25 15:16:39 +08:00
WenhaiLin 41bc3a1900 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8 
Conflicts:
	AUTHORS
 2015-07-09 11:11:34 +08:00
andyque cbfbda6e71 update Author 2015-07-09 10:35:50 +08:00
子龙山人 45844cb54a Merge pull request #12747 from zilongshanren/improve-template-dialy-build 
[ci skip]unassigned shouldn't trigger jenkins rebuild
 2015-07-09 10:13:03 +08:00
andyque 8b1f0fe3f3 update AUTHORS 2015-07-09 10:12:16 +08:00
WenhaiLin 6127aa5df2 [ci skip]Update AUTHORS. 2015-07-08 18:07:24 +08:00
子龙山人 a567b7b795 Update Authors 2015-07-07 17:52:58 +08:00
pandamicro 992ea8ac4b Release docs for Cocos2d-x v3.7rc0 2015-07-01 18:44:15 +08:00
Zachary Lester f3afd51ff5 Fix typo in AUTHORS.txt 
Altered sentence explaining how authors were ordered so as to fix its grammar and more clearly convey its meaning.
 2015-06-08 23:28:30 -07:00
andyque 9721621ecc update changelog and authors 2015-06-08 17:30:59 +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 b58bb59fd7 update changelog 2015-05-27 15:59:48 +08:00
minggo 43b5983abe [ci skip]update AUTHORS 2015-05-19 11:46:04 +08:00
minggo 182877ff6a [ci skip]update AUTHORS 2015-05-15 10:16:54 +08:00
minggo 43fb8d842b [ci skip]update AUTHORS 2015-05-13 17:04:55 +08:00
minggo 1cfb8c88a6 [ci skip]update AUTHORS 2015-05-08 10:46:20 +08:00
minggo b9925dad40 [ci skip]update AUTHORS 2015-05-07 09:35:51 +08:00
minggo 4acd231f89 merge v3.6 2015-04-30 13:46:08 +08:00
minggo e75ea4c892 [ci skip]update AUTHORS 2015-04-28 16:43:43 +08:00
minggo bd5f4e0285 [ci skip]update AUTHORS 2015-04-27 17:43:57 +08:00
minggo f80220cbfe [ci skip]update AUTHORS 2015-04-27 17:19:42 +08:00
minggo d792e3dc94 [ci skip]update AUTHORS 2015-04-20 10:38:19 +08:00
minggo 1a9febcbed [ci skip]update CHANGELOG 2015-04-20 09:54:45 +08:00
minggo 2656f766c9 [ci skip]update CHANGELOG 2015-04-17 17:57:20 +08:00
minggo d24247a833 [ci skip]update CHANGELOG 2015-04-16 18:21:56 +08:00
minggo bb7679979c [ci skip]update CHANGELOG 2015-04-16 16:34:41 +08:00
minggo bf7a9bf1b2 [ci skip]update AUTHORS 2015-04-14 18:13:32 +08:00
minggo ee36556563 [ci skip]update AUTHORS 2015-04-14 09:41:07 +08:00
minggo e59e61b34f [ci skip]update AUTHORS 2015-04-10 09:35:26 +08:00
minggo 4bdc3ec3ca [ci skip]update AUTHORS 2015-03-31 11:59:57 +08:00
minggo 7b6502c78b [ci skip]update AUTHORS 2015-03-19 21:49:24 +08:00
minggo 16803fb919 [ci skip]update AUTHORS 2015-02-28 11:20:19 +08:00
minggo cf36d1fadd [ci skip]update AUTHORS 2015-02-26 15:52:34 +08:00
minggo de2f39be4e [ci skip]update AUTHORS 2015-02-26 10:54:07 +08:00
minggo b37cb2b277 [ci skip]update AUTHORS 2015-02-26 10:34:00 +08:00
minggo 7d9527280c [ci skip]update AUTHORS 2015-02-15 19:06:59 +08:00
minggo ea9d9f889c [ci skip]Update Authors 2015-01-23 16:43:22 +08:00
minggo 6ec03fd602 [ci skip] Update CHANGELOG 2015-01-23 09:46:11 +08:00
Huabing.Xu b18cfe3f80 [ci skip] update Authors 2015-01-12 20:03:36 +08:00
minggo e1c575b7b7 [ci skip]Update Authors 2015-01-09 15:36:23 +08:00
Huabing.Xu ca7fe406f4 [ci skip] update Authors 2015-01-09 14:56:00 +08:00
minggo 961487d3fa [ci skip]Update Authors 2015-01-06 16:12:40 +08:00
minggo fd1cca2a02 [ci skip]Update Authors 2014-12-26 09:32:59 +08:00
minggo 825888be1c [ci skip]Update Authors 2014-12-02 15:49:37 +08:00
James Chen cf7377a5bb Update AUTHORS 2014-11-25 16:17:28 +08:00
James Chen 34550422c0 Update AUTHORS 2014-11-21 09:37:07 +08:00
minggo d2fd1a1152 [ci skip]Update Authors 2014-11-09 23:27:13 +08:00