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

449 Commits

Author SHA1 Message Date
CocosRobot 0fc077d196 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-29 09:08:15 +00:00
CocosRobot ebee5e9a26 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-29 07:39:05 +00:00
CocosRobot 4185715c06 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-27 15:10:43 +00:00
CocosRobot 2aa835536f [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-21 10:37:59 +00:00
CocosRobot 50052856f2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-18 16:26:08 +00:00
CocosRobot 5af1eaebe0 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-18 13:58:52 +00:00
CocosRobot 29a4e861ed [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-18 13:55:26 +00:00
CocosRobot 5be2cf3e5e [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-18 08:15:36 +00:00
CocosRobot 6957b73939 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-18 06:08:31 +00:00
CocosRobot f9119bf3c1 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-18 04:01:07 +00:00
CocosRobot 0ccb92a10c [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-16 14:26:42 +00:00
CocosRobot 0f3e43344b [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-16 06:03:19 +00:00
CocosRobot f8eb3a9b1a [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-14 02:57:12 +00:00
CocosRobot c2e18e9737 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-09 02:49:42 +00:00
CocosRobot df4da8ffa0 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-09 02:28:31 +00:00
CocosRobot f427ae2f06 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-06 02:05:42 +00:00
CocosRobot 64b9c2b51f [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-24 06:07:38 +00:00
CocosRobot 7bb25d8c66 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-21 04:24:34 +00:00
CocosRobot 7839a23c62 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-21 03:53:16 +00:00
CocosRobot 217c698ef4 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-20 09:49:05 +00:00
CocosRobot e532dcfd13 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-14 03:27:08 +00:00
CocosRobot 2a3ac56df0 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-13 07:09:49 +00:00
CocosRobot 6c6a792295 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-12 05:59:36 +00:00
CocosRobot a26fdd0ff3 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-09 02:27:11 +00:00
CocosRobot a0b0c020f8 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-06 01:38:44 +00: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
CocosRobot 08a44e818b [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-31 01:30:53 +00:00
CocosRobot 9b969598bf [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-30 16:23:47 +00:00
CocosRobot e75f15ebb1 [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-30 10:43:43 +00:00
CocosRobot 12523e2f4e [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-30 03:31:32 +00:00
CocosRobot 07686aa803 [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-28 10:32:41 +00:00
CocosRobot 6e7c3c636f [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-28 07:11:50 +00:00
CocosRobot f751234b7f [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-27 05:38:54 +00:00
CocosRobot 42c42ccd7e [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-26 06:27:09 +00:00
CocosRobot 3c1a3677ff [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-25 05:34:07 +00:00
CocosRobot cbf830196b [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-23 10:12:40 +00:00
CocosRobot 7241f72f47 [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-23 07:35:52 +00:00
CocosRobot ac9d65f3f7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-22 08:19:17 +00:00
pandamicro 436564f922 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	docs/RELEASE_NOTES.md
	web
 2015-07-15 14:39:40 +08:00
CocosRobot 3ba4d7230e [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-14 10:15:18 +00:00
Neo Kim 86cbd59bfd Add UIScrollViewBar.cpp into CMake and Windows project configuration. 2015-07-04 09:56:53 +09:00
CocosRobot 50703b262c [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-03 10:30:38 +00:00
pandamicro 1b22438792 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 
Conflicts:
	cocos/ui/UICheckBox.cpp
 2015-07-03 10:23:49 +08:00
CocosRobot c3693b8948 [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-01 09:22:38 +00:00
Neo Kim a64e50688e Add the new files into CMake and Windows project configurations. 2015-07-01 12:21:42 +09:00
CocosRobot 48f03adc3f [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-26 04:56:58 +00:00
CocosRobot 7486c74209 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-19 09:24:40 +00:00
CocosRobot b64c2c13d0 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-19 01:27:24 +00:00
CocosRobot c7ad47908e [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-17 07:11:15 +00:00
CocosRobot 734382026a [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-17 06:42:39 +00:00
CocosRobot 4ae7489e28 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-17 03:39:08 +00:00
CocosRobot 0b73b53d3a [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-16 20:26:30 +00:00
CocosRobot 22ce7e6ee7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-16 02:05:57 +00:00
CocosRobot f7ec4b2db5 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-15 05:41:07 +00:00
CocosRobot c58927e7fc [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-11 06:12:41 +00:00
CocosRobot 369b7d9926 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-10 01:49:13 +00:00
CocosRobot 297945cca5 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-05 02:13:10 +00:00
CocosRobot 1b8ff0e595 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-04 14:05:38 +00:00
CocosRobot c722dd76d6 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-04 10:49:25 +00:00
CocosRobot 7607b81bfd [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-04 01:25:04 +00:00
CocosRobot f306edee8b [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-02 09:40:03 +00:00
CocosRobot a15766adab [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-02 05:47:44 +00:00
CocosRobot bae9082fc7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-02 02:03:05 +00:00
CocosRobot 27ed47cdfd [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-29 07:34:09 +00:00
子龙山人 039c0036be Merge pull request #12072 from iris-wy/v3 
Add enhance service  API
 2015-05-29 15:32:06 +08:00
CocosRobot 635d5a43d2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-29 06:04:54 +00:00
iris-wy 0007799794 modify Enhance API 
modify Enhance API
 2015-05-28 10:47:12 +08:00
CocosRobot 509d5f5718 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-27 14:49:12 +00:00
CocosRobot 08c70e9478 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-27 08:02:47 +00:00
CocosRobot e6a7d6f150 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-26 01:37:23 +00:00
CocosRobot eea661a5c2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-25 08:31:54 +00:00
CocosRobot 88c4ed664b [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-25 07:16:13 +00:00
CocosRobot 7879b25cdc [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-22 23:57:26 +00:00
CocosRobot b9ffada9cc [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-22 09:19:24 +00:00
CocosRobot 3c96bbbd80 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-22 06:47:26 +00:00
CocosRobot ff6f505a61 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-22 01:57:03 +00:00
CocosRobot 7e392635ce [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-21 20:01:07 +00:00
CocosRobot 5005c77d45 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-21 01:45:44 +00:00
CocosRobot a5a6515332 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-20 06:44:01 +00:00
CocosRobot 181f225eb7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-18 08:19:22 +00:00
CocosRobot fd55bb8e68 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-18 05:35:55 +00:00
iris-wy 68ec7c8ca1 Add enhance service API 
Add enhance service  API
 2015-05-15 14:29:22 +08:00
CocosRobot 4240632c68 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-14 10:32:18 +00:00
CocosRobot 5bf26f9f10 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-13 04:07:11 +00:00
CocosRobot 90ce442616 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-13 01:37:33 +00:00
CocosRobot d170a79919 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-12 05:49:49 +00:00
CocosRobot 507e94b77f [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-12 05:15:34 +00:00
CocosRobot 299e355152 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-08 09:02:36 +00:00
CocosRobot a3b8f6bcb1 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-08 06:13:28 +00:00
minggo bf93289718 Merge pull request #11751 from samuele3hu/v3_7_remove_vs2012 
Remove vs2012 support in v3
 2015-05-08 14:11:13 +08:00
CocosRobot 745fe13ecb [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-08 02:46:01 +00:00
samuele3hu 23e4e0d4e3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012 2015-05-07 16:21:03 +08:00
CocosRobot c570f60606 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-06 01:43:46 +00:00
CocosRobot 91b608697a [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-06 00:59:51 +00:00
samuele3hu f1b5729183 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012 2015-05-05 16:14:57 +08:00
samuele3hu 037c17fe5d Remove vs2012 support in v3 2015-05-05 16:11:26 +08:00
CocosRobot b3042d771d [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-05 03:28:05 +00:00
CocosRobot 038ac5ab2a [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-30 09:23:48 +00:00
CocosRobot 1759fa96fe [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-30 06:50:33 +00:00
minggo 4acd231f89 merge v3.6 2015-04-30 13:46:08 +08:00