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

44 Commits

Author SHA1 Message Date
Ricardo Quesada 9b118e5e96 Squashed commit of the following: 
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:10:06 2014 -0700

    Updates templates files

commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:08:19 2014 -0700

    compiles on Windows

commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:55:30 2014 -0700

    adds cocos2d.h

commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:54:24 2014 -0700

    re-adds missing files

commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:51:12 2014 -0700

    Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes

commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:49:12 2014 -0700

    Adds SimpleAudioEngine

commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:47:45 2014 -0700

    Compiles for Android

commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:13:35 2014 -0700

    Fixes the includes
 2014-04-26 10:11:22 -07:00
CocosRobot 679f8c7750 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-25 03:05:26 +00:00
CocosRobot 617ccbb4fa [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-25 02:43:56 +00:00
CocosRobot d27a3c9642 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-10 08:40:58 +00:00
CocosRobot 1e37906965 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-10 03:30:39 +00:00
CocosRobot e272c66932 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-09 08:09:22 +00:00
CocosRobot 25b24a62cb [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-03 09:42:36 +00:00
CocosRobot 9b9c3f9b07 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-02 07:40:55 +00:00
CocosRobot d93ebe0b37 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-01 03:30:24 +00:00
CocosRobot 9801dc6f50 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-31 09:52:30 +00:00
CocosRobot 12af1b4982 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-29 15:23:46 +00:00
James Chen 10eee24b0f Merge pull request #6029 from natural-law/develop 
Add tools/bindings-generator & tools/tolua into the  lua template.
 2014-03-27 16:47:08 +08:00
zhangbin 0c82a4a3e0 Add tools/bindings-generator & tools/tolua into the lua project template. 2014-03-27 15:38:01 +08:00
CocosRobot b779ef0c27 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-27 07:04:13 +00:00
CocosRobot 41110ec49a [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-26 10:41:17 +00:00
CocosRobot e65315d01e [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-25 08:22:13 +00:00
CocosRobot 1303985165 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-21 06:59:41 +00:00
CocosRobot 3c9acc938b [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-21 03:22:25 +00:00
CocosRobot 0b7a052fa6 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-21 02:54:10 +00:00
samuele3hu 4b25c9f62e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-03-20 17:07:33 +08:00
samuele3hu d3487d2d3c close #4400: Use the newest version of LuaSocket for lua 2014-03-20 17:04:54 +08:00
CocosRobot 789a1496c8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-20 07:22:42 +00:00
CocosRobot 8bd3bdf021 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-14 17:47:32 +00:00
CocosRobot ebe7b37ec2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-14 15:38:36 +00:00
CocosRobot 28f7603f81 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-13 07:18:02 +00:00
CocosRobot 2c59743abf [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-13 03:35:40 +00:00
CocosRobot 0c68e4b1d5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 12:39:13 +00:00
CocosRobot 6d867fb294 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 12:24:03 +00:00
CocosRobot 6721b15217 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 11:38:24 +00:00
CocosRobot 2f582dcdb5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 10:33:14 +00:00
CocosRobot d00be77399 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 04:09:06 +00:00
CocosRobot 33b7be5bea [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 03:16:06 +00:00
andyque cb4acc6311 fix linux compile error 2014-03-12 11:03:23 +08:00
andyque 2c2a5ee38e rename gui to ui 2014-03-12 10:46:49 +08:00
CocosRobot d74eece191 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-11 14:54:20 +00:00
CocosRobot 8f18803959 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-10 09:49:16 +00:00
CocosRobot c8da2c04ce [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-10 06:02:28 +00:00
CocosRobot 5f534016e7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-07 02:33:52 +00:00
CocosRobot e95ce5ab3d [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-06 06:59:49 +00:00
CocosRobot 5490e44192 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-03-06 06:09:07 +00:00
chuanweizhang2013 58cdf07a35 add 2014-03-05 18:31:31 +08:00
Ricardo Quesada 4b57d41fd2 updates templates for Linux 2014-03-04 17:27:37 -08:00
lihex a5e0c08583 update cocos2dx_files.json 2014-03-04 16:53:26 +08:00
lihex ce3f527ebf add console support files 2014-03-04 16:27:59 +08:00