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

406 Commits

Author SHA1 Message Date
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
CocosRobot 8507d7e5a4 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-30 01:44:07 +00:00
CocosRobot bea6fe3ce5 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-28 13:35:07 +00:00
CocosRobot ef82d9fa3a [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-27 07:46:12 +00:00
CocosRobot dbdb29464b [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-24 03:13:32 +00:00
zhangbin 61cf0ad28b Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb 2015-04-23 15:46:19 +08:00
CocosRobot 941c8d9f14 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-23 02:27:24 +00:00
minggo 8ab03a62d1 Merge pull request #11543 from yinjimmy/runtime 
Add lua runtime template
 2015-04-23 10:25:00 +08:00
CocosRobot d7e32f270c [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-22 02:53:00 +00:00
CocosRobot e218110107 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-21 09:02:58 +00:00
CocosRobot ebd76defe6 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-20 07:53:34 +00:00
CocosRobot 9b09fb1f6a [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-20 05:37:44 +00:00
CocosRobot fb9cdc28e3 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-20 02:38:23 +00:00
yinjimmy 1e32322350 revert runtime files 2015-04-17 18:26:47 +08:00
zhangbin b8b49a387e Update the js template. 2015-04-17 14:59:12 +08:00
zhangbin 1f491cf656 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb 
Conflicts:
	build/cocos2d-wp8.sln
 2015-04-16 17:04:07 +08:00
CocosRobot 870eb7519b [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-16 06:34:18 +00:00
zhangbin 2c7bd7ec35 Update cocos2dx files. 2015-04-15 15:12:04 +08:00
CocosRobot b7065407fc [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-14 09:52:18 +00:00
CocosRobot a8079d593a [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-13 10:15:05 +00:00
CocosRobot 3b0573392d [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-08 13:30:05 +00:00
CocosRobot deb44cc0e8 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-08 06:36:26 +00:00
CocosRobot 567af9d0d8 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-08 03:48:57 +00:00
CocosRobot cfb11f2acf [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-08 01:56:07 +00:00
CocosRobot 738d03d2db [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-07 01:34:23 +00:00
CocosRobot f65f20e270 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-01 02:57:37 +00:00
CocosRobot 6410eca425 [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-31 05:53:58 +00:00
CocosRobot 43c030205b [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-27 03:16:06 +00:00
CocosRobot 342edc5904 [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-20 04:49:27 +00:00
CocosRobot 182d4958f8 [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-19 12:42:16 +00:00
CocosRobot 2b14d11bb9 [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-17 06:18:34 +00:00
CocosRobot 5203d1e7be [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-13 07:20:18 +00:00
CocosRobot 54ac9ef67f [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-11 07:32:59 +00:00
Mazyad Alabduljaleel 983ffd96c7 Now, mac uses ObjC HTTP client 2015-03-10 14:48:57 +04:00
CocosRobot 3f7e2eb1ff [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-09 09:45:58 +00:00
CocosRobot f46817eac7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-09 02:59:36 +00:00
CocosRobot d7d85625fa [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-09 02:23:45 +00:00
CocosRobot 1498c18d1b [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-06 08:12:23 +00:00
CocosRobot 721804a30e [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-04 08:13:38 +00:00
CocosRobot a5a1bd3994 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-27 10:12:08 +00:00
minggo 503c46a9e8 Merge pull request #10286 from flamefox/v3_fix_dos2unix 
fix dos2unix not in run path, on new lua project
 2015-02-27 16:35:02 +08:00
CocosRobot 9cecd68064 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-26 04:26:17 +00:00
Ray bfb5c1ca23 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-02-26 10:44:20 +08:00
CocosRobot 0072400fc9 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-26 01:40:45 +00:00