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 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
..
2d change toolset from 12.0 to 4.0 2014-09-09 15:57:21 +08:00
3d Squashed commit of the following: 2014-09-09 12:18:31 -07:00
audio Squashed commit of the following: 2014-09-09 12:18:31 -07:00
base Squashed commit of the following: 2014-09-09 12:18:31 -07:00
deprecated Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
editor-support Merge pull request #7942 from andyque/deleteRedundantCode 2014-09-04 13:45:12 +08:00
math Squashed commit of the following: 2014-09-09 12:18:31 -07:00
network bugfix: condition variable sleep on unrelated mutex 2014-09-03 23:56:54 +08:00
physics introduce substeps for accurate physics 2014-09-08 00:14:40 +02:00
platform Squashed commit of the following: 2014-09-09 12:18:31 -07:00
renderer roll back, VBO_SIZE to 65536, INDEX_VBO_SIZE to 65536 * 1.5 2014-09-05 16:01:17 +08:00
scripting/lua-bindings Squashed commit of the following: 2014-09-09 12:18:31 -07:00
storage/local-storage Adjust android.mk for cocos2d and related module 2014-08-27 22:54:28 +08:00
ui Squashed commit of the following: 2014-09-09 12:18:31 -07:00
Android.mk android works for trianglesCommand 2014-09-01 13:57:33 +08:00
CMakeLists.txt Squashed commit of the following: 2014-09-09 12:18:31 -07:00
cocos2d-prefix.pch add cocos2d.h into pre-compiled header 2014-08-26 16:45:24 +08:00
cocos2d.cpp update version 2014-08-22 11:48:14 +08:00
cocos2d.h Squashed commit of the following: 2014-09-09 12:18:31 -07:00