Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos
History
Ricardo Quesada 0f67247325 Squashed commit of the following: 
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 14:33:49 2014 -0700

    Yeah... everything compiles on win32 and wp8

commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:58:38 2014 -0700

    CCIME moved to base

    and compiles on Android

commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 13:02:57 2014 -0700

    compiles Ok for Windows Phone 8

commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 12:25:31 2014 -0700

    fixes for Windows Phone 8

commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 11:15:13 2014 -0700

    Compiles on Win32

commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 10:08:31 2014 -0700

    Compiles on linux!

commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 09:30:42 2014 -0700

    moves cocos/2d/platform -> cocos/platform

commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 16 08:24:41 2014 -0700

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

commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 15 19:36:23 2014 -0700

    files in the correct directory
 		2014-05-16 14:36:00 -07:00
..
2d Squashed commit of the following: 2014-05-16 14:36:00 -07:00
audio Squashed commit of the following: 2014-05-16 14:36:00 -07:00
base Squashed commit of the following: 2014-05-16 14:36:00 -07:00
deprecated Squashed commit of the following: 2014-05-16 14:36:00 -07:00
editor-support Squashed commit of the following: 2014-05-16 14:36:00 -07:00
math Squashed commit of the following: 2014-05-16 14:36:00 -07:00
network Squashed commit of the following: 2014-05-16 14:36:00 -07:00
physics Squashed commit of the following: 2014-05-14 10:07:09 -07:00
platform Squashed commit of the following: 2014-05-16 14:36:00 -07:00
renderer Squashed commit of the following: 2014-05-16 14:36:00 -07:00
scripting/lua-bindings Squashed commit of the following: 2014-05-16 14:36:00 -07:00
storage upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). 2014-05-07 17:41:04 +03:00
ui Merge pull request #6754 from minggo/monkey-test 2014-05-15 11:10:39 +08:00
Android.mk Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CMakeLists.txt Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d-prefix.pch Squashed commit of the following: 2014-05-16 14:36:00 -07:00
cocos2d.cpp Improvments on the shader2 tests 2014-05-14 13:09:33 -07:00
cocos2d.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00