Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/platform
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
..
android Move constructor from private to public 2014-09-09 11:34:48 +09:00
apple Squashed commit of the following: 2014-09-09 12:18:31 -07:00
desktop Update CCGLViewImpl.cpp 2014-09-02 11:13:30 +08:00
ios Merge branch 'v3' into mergeExtensionEditBox 2014-09-01 15:26:25 +08:00
linux OpenGL context attributions setting revise -2 2014-08-22 16:22:16 +08:00
mac Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
win32 fix: win32 cpp-tests sometimes cannot display font correctly 2014-09-03 11:34:40 +08:00
winrt fix wp8 compile error and modify default resource path 2014-09-05 11:21:08 +08:00
wp8 merge v3 into v3_wp8glviewhookpr 2014-08-04 16:49:42 +08:00
wp8-xaml fix winrt complie error 2014-08-07 18:38:11 +08:00
CCApplicationProtocol.h OpenGL context attributions setting revise -2 2014-08-22 16:22:16 +08:00
CCCommon.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCDevice.h setKeepScreenOn method 2014-08-19 15:00:58 +04:00
CCFileUtils.cpp Adds MARK: TODO: FIXME: in code 2014-08-29 12:54:24 -07:00
CCFileUtils.h add 2014-07-29 17:06:43 +08:00
CCGLView.cpp getAllTouches() in GLView 2014-09-03 23:25:30 +04:00
CCGLView.h getAllTouches() in GLView 2014-09-03 23:25:30 +04:00
CCImage.cpp fix compiling error on android and fix some coding style 2014-08-21 15:41:05 +08:00
CCImage.h use macro to control whether to use jpeg, tiff, webp or not 2014-08-21 15:19:26 +08:00
CCSAXParser.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCSAXParser.h Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCThread.cpp Squashed commit of the following: 2014-05-16 14:36:00 -07:00
CCThread.h remove unneeded includes 2014-08-29 15:39:52 +08:00