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

270 Commits

Author SHA1 Message Date
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
CocosRobot 92806f7919 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-24 01:27:05 +00:00
CocosRobot 2947fd95d6 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-20 01:14:18 +00:00
CocosRobot 83fed82923 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-15 12:00:05 +00:00
CocosRobot 33be077835 [AUTO][ci skip]: updating cocos2dx_files.json 2015-02-15 11:50:10 +00:00
flamefox deb5fd46ff add dos2unix.exe to templates\cocos2dx_files.json 2015-01-30 11:14:51 +08:00
CocosRobot ebf6f2728f [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-29 02:57:47 +00:00
CocosRobot c1e586ebab [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-21 08:07:36 +00:00
CocosRobot 8a78a7e8fd [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-21 05:41:12 +00:00
CocosRobot e221424a64 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-21 03:06:58 +00:00
CocosRobot ef9fabbc51 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-21 02:35:37 +00:00
CocosRobot 945be7529d [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-19 01:34:14 +00:00
CocosRobot f9192835c9 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-16 16:13:41 +00:00
CocosRobot b2db3c13dd [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-14 15:39:55 +00:00
CocosRobot b703c7b169 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-14 09:30:59 +00:00
CocosRobot 88029d33bd [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-14 08:45:40 +00:00
CocosRobot 29d85ca8c2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-14 08:12:14 +00:00
CocosRobot 5faeb6919a [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-14 03:39:38 +00:00
CocosRobot 27da58e4b5 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-12 12:13:39 +00:00
CocosRobot f6de697bde [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-08 06:05:46 +00:00
CocosRobot 6a88a51e24 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-07 02:23:16 +00:00
CocosRobot 85ccfb2209 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 07:14:27 +00:00
CocosRobot ced43a1c2b [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 05:50:50 +00:00
CocosRobot d4c9205320 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 05:01:17 +00:00
CocosRobot 1f8bb3f808 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 04:51:26 +00:00
CocosRobot a3e15a3d29 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 01:59:46 +00:00
CocosRobot cb7a63b413 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-30 10:34:54 +00:00
CocosRobot e7a7ee750f [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-29 05:48:30 +00:00
CocosRobot b385ce58d0 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-29 02:31:59 +00:00
CocosRobot 0a4785d6fc [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-29 01:45:01 +00:00
CocosRobot a8fedda82c [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-26 01:29:15 +00:00
CocosRobot 542b2b6bd2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-25 06:10:51 +00:00
youyou f678d1027c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-25 12:09:31 +08:00
CocosRobot 95df9ba145 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-24 09:37:39 +00:00
kaile.yin 942abfc654 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-12-24 10:53:09 +08:00
CocosRobot 94d96b5ad1 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-23 04:01:55 +00:00
CocosRobot 7170e85a7a [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-19 22:37:52 +00:00