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

214 Commits

Author SHA1 Message Date
CocosRobot e02558e391 [AUTO]: updating luabinding automatically 2014-10-20 10:17:27 +00:00
CocosRobot 5e09b1e3b1 [AUTO]: updating luabinding automatically 2014-10-20 06:06:43 +00:00
CocosRobot 96d709aff3 [AUTO]: updating luabinding automatically 2014-10-18 07:36:54 +00:00
CocosRobot 20781825f2 [AUTO]: updating luabinding automatically 2014-10-17 14:56:22 +00:00
CocosRobot e8373e9b41 [AUTO]: updating luabinding automatically 2014-10-17 06:28:36 +00:00
CocosRobot 4a084a4ebc [AUTO]: updating luabinding automatically 2014-10-16 09:55:07 +00:00
minggo 064f0d9042 Merge pull request #8708 from dabingnn/v3_updateSpine 
V3 update spine
 2014-10-16 17:50:07 +08:00
CocosRobot c4985c45e4 [AUTO]: updating luabinding automatically 2014-10-16 08:55:11 +00:00
Huabing.Xu 644aa19b2d Merge branch 'v3' into v3_updateSpine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-16 16:48:16 +08:00
CocosRobot 2bfad920ce [AUTO]: updating luabinding automatically 2014-10-16 04:01:10 +00:00
Huabing.Xu c12f88d63c lua compiles ok－need to make it works later 2014-10-15 17:33:58 +08:00
CocosRobot 64a7ef9173 [AUTO]: updating luabinding automatically 2014-10-14 18:01:12 +00:00
CocosRobot 51e714bdae [AUTO]: updating luabinding automatically 2014-10-14 06:32:12 +00:00
CocosRobot 971d3a6653 [AUTO]: updating luabinding automatically 2014-10-11 08:12:44 +00:00
CocosRobot 53cde3f3b2 [AUTO]: updating luabinding automatically 2014-10-10 08:39:46 +00:00
CocosRobot 70a2195ccf [AUTO]: updating luabinding automatically 2014-10-08 09:53:11 +00:00
CocosRobot a96a2a992d [AUTO]: updating luabinding automatically 2014-09-30 07:13:25 +00:00
CocosRobot 50a06a13ad [AUTO]: updating luabinding automatically 2014-09-29 10:11:17 +00:00
CocosRobot fd9ed15d6d [AUTO]: updating luabinding automatically 2014-09-29 01:25:31 +00:00
CocosRobot 021d21a2a7 [AUTO]: updating luabinding automatically 2014-09-26 15:37:17 +00:00
CocosRobot 963c02eb3d [AUTO]: updating luabinding automatically 2014-09-26 05:45:33 +00:00
CocosRobot 7192681618 [AUTO]: updating luabinding automatically 2014-09-25 06:50:06 +00:00
CocosRobot 7920ff425b [AUTO]: updating luabinding automatically 2014-09-18 03:05:04 +00:00
CocosRobot 9b5d47c61e [AUTO]: updating luabinding automatically 2014-09-17 03:35:46 +00:00
CocosRobot b37659a448 [AUTO]: updating luabinding automatically 2014-09-16 09:16:17 +00:00
CocosRobot 526c28bea9 [AUTO]: updating luabinding automatically 2014-09-15 15:21:18 +00:00
CocosRobot 8c7eb81271 [AUTO]: updating luabinding automatically 2014-09-15 01:50:32 +00:00
CocosRobot 29f9cbfd6a [AUTO]: updating luabinding automatically 2014-09-12 08:15:54 +00:00
CocosRobot 434d4fbfdd [AUTO]: updating luabinding automatically 2014-09-11 07:11:40 +00:00
CocosRobot 0e49107514 [AUTO]: updating luabinding automatically 2014-09-10 01:52:43 +00:00
Ricardo Quesada 0ead7b6307 Squashed commit of the following: 
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:34:40 2014 -0700

    Compiles luasocket on Mac

commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:12:30 2014 -0700

    disables luasockets

commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 08:10:48 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx

    Conflicts:
    	cocos/3d/cocos3d.h

commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:21:03 2014 -0700

    compiles on Linux

commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:16:46 2014 -0700

    all projecs compiles with CMake

commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:47:27 2014 -0700

    CCUserDefualt.mm better includes

commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:26:36 2014 -0700

    cpp-tests compiles and works on Mac using CMake

commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 20:12:09 2014 -0700

    Adds missing files to CMakeLists.txt

commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:52:34 2014 -0700

    Adds more box2d missing files

commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:39:54 2014 -0700

    Adds missing box2d files

commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 18:44:15 2014 -0700

    Initial CMake support for Mac
 2014-09-09 12:18:31 -07:00
CocosRobot ed8835d262 [AUTO]: updating luabinding automatically 2014-09-09 06:43:49 +00:00
CocosRobot a2dcb71a24 [AUTO]: updating luabinding automatically 2014-09-09 02:53:20 +00:00
CocosRobot af6b6bb7b9 [AUTO]: updating luabinding automatically 2014-09-09 02:32:49 +00:00
CocosRobot ffb36d577e [AUTO]: updating luabinding automatically 2014-09-03 03:29:43 +00:00
CocosRobot dc15287ac3 [AUTO]: updating luabinding automatically 2014-09-02 05:45:07 +00:00
CocosRobot cdc41711f6 [AUTO]: updating luabinding automatically 2014-08-29 10:38:25 +00:00
minggo 826e1018cb fix conflict 2014-08-29 16:55:09 +08:00
CocosRobot 3b3747d518 [AUTO]: updating luabinding automatically 2014-08-29 08:12:40 +00:00
minggo 1dcdbca4e0 revert lua-bindings 2014-08-29 15:54:20 +08:00
minggo e4920ffdea fix conflict 2014-08-29 15:45:21 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
CocosRobot ebe75e702a [AUTO]: updating luabinding automatically 2014-08-28 08:58:52 +00:00
CocosRobot 31a9997922 [AUTO]: updating luabinding automatically 2014-08-28 02:15:00 +00:00
CocosRobot 5db16cdc23 [AUTO]: updating luabinding automatically 2014-08-25 02:34:32 +00:00
CocosRobot 899e0a4182 [AUTO]: updating luabinding automatically 2014-08-22 11:25:33 +00:00
CocosRobot 4236e89245 [AUTO]: updating luabinding automatically 2014-08-18 15:26:32 +00:00
CocosRobot 85d505b427 [AUTO]: updating luabinding automatically 2014-08-18 14:47:35 +00:00
CocosRobot bdfc48b127 [AUTO]: updating luabinding automatically 2014-08-15 07:44:57 +00:00
CocosRobot 24f0e8aada [AUTO]: updating luabinding automatically 2014-08-15 07:23:17 +00:00