Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/3d
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
..
3dExport.h Add a newline for some files 2014-08-18 15:27:54 +08:00
Android.mk remove Sequence3D 2014-09-09 11:34:17 +08:00
CCAABB.cpp deal aabb 2014-08-18 17:02:13 +08:00
CCAABB.h merge cocos2d 2014-08-19 13:19:42 +08:00
CCAnimate3D.cpp remove from map when release 2014-09-02 10:40:29 +08:00
CCAnimate3D.h remove from map when release 2014-09-02 10:40:29 +08:00
CCAnimation3D.cpp remove unneeded includes 2014-08-28 17:03:29 +08:00
CCAnimation3D.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCAnimationCurve.h remove unneeded includes 2014-08-28 17:03:29 +08:00
CCAnimationCurve.inl Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCAttachNode.cpp remove unneeded includes 2014-08-28 17:32:23 +08:00
CCAttachNode.h remove unneeded includes 2014-08-28 17:32:23 +08:00
CCBundle3D.cpp static model load problem of old version . 2014-09-02 17:33:22 +08:00
CCBundle3D.h remove unneeded includes 2014-08-28 17:32:23 +08:00
CCBundle3DData.h engine adjust 2014-08-22 13:25:26 +08:00
CCBundleReader.cpp Code Standards 2014-08-29 10:43:26 +08:00
CCBundleReader.h Code Standards 2014-08-29 10:43:26 +08:00
CCMesh.cpp fix bug on custom mesh 2014-09-04 14:26:23 +08:00
CCMesh.h remove unneeded includes 2014-08-28 17:32:23 +08:00
CCMeshSkin.cpp remove unneeded includes 2014-08-28 17:32:23 +08:00
CCMeshSkin.h remove unneeded includes 2014-08-28 17:32:23 +08:00
CCMeshVertexIndexData.cpp Adds `std::nothrow` to `new` 2014-08-27 16:31:57 -07:00
CCMeshVertexIndexData.h remove unneeded includes 2014-08-29 15:39:52 +08:00
CCOBB.cpp modify function name and add default to switch block. 2014-08-14 13:15:37 +08:00
CCOBB.h Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project 2014-08-17 23:45:56 +08:00
CCObjLoader.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCObjLoader.h Squashed commit of the following: 2014-05-18 14:49:16 -07:00
CCRay.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCRay.h remove unneeded includes 2014-08-29 15:39:52 +08:00
CCSkeleton3D.cpp Merge branch 'newcode' into transition 2014-09-01 15:14:30 +08:00
CCSkeleton3D.h remove unneeded includes 2014-08-29 15:39:52 +08:00
CCSprite3D.cpp Set the node name 2014-09-03 15:55:11 +08:00
CCSprite3D.h remove unneeded includes 2014-08-29 15:39:52 +08:00
CCSprite3DMaterial.cpp remove unneeded includes 2014-08-29 15:39:52 +08:00
CCSprite3DMaterial.h remove unneeded includes 2014-08-29 15:39:52 +08:00
cocos3d.h Squashed commit of the following: 2014-09-09 12:18:31 -07:00