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

9864 Commits

Author SHA1 Message Date
James Chen 93b6328303 issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
James Chen 0a0bada9c2 issue #2129: Removing CC prefix for CocosDenshion module. 2013-06-20 14:12:43 +08:00
James Chen 31cbc0cbf8 issue #2129: [TestCpp] A typo fix. 2013-06-20 14:08:22 +08:00
James Chen 74048d7eec issue #2129: [TestCpp] Renaming some class name to avoid conflicts after removing CC prefix. 2013-06-20 14:04:44 +08:00
James Chen e3ed28a8fb issue #2129: no need to write namespace since we are using *using namespace cocos2d::extension::armature;*. 2013-06-20 14:02:14 +08:00
James Chen b55a0dee2b issue #2129: using cocos2d::extension::armature namespace for Armature extension. 2013-06-20 13:48:43 +08:00
James Chen 7ce6ef04f8 issue #2129: [TestCpp] LayerGradient --> LayerGradientTest, TexturePVR --> TexturePVRTest. 2013-06-20 13:43:40 +08:00
James Chen e281fdfa73 issue #2129: Renaming EditBoxImplIOS to EditBoxImplIOS_objc since it will be conflict with CCEditBoxImplIOS after removing CC prefix. 2013-06-20 13:07:09 +08:00
James Chen b60e891b09 issue #2129: Don't use CGPoint in chipmunk since we are using cocos2d-x rather than cocos2d-iphone. 2013-06-20 13:02:20 +08:00
James Chen 78a5dff06d issue #2129: Resetting the namespace of armature to 'cocos2d::extension::armature'. 2013-06-20 12:59:32 +08:00
James Chen 136a9743d4 issue #2129: [Removing CC Prefix] Removing backward compatible macros, since they are conflict with no CC Prefix ones. 2013-06-20 12:56:51 +08:00
James Chen e75c58584e Merge pull request #2935 from samuele3hu/opengl_develop 
issue #2277: Add OpenGL lua bining and some test samples
 2013-06-19 20:49:24 -07:00
samuele3hu fb075d7a7d issue #2277: Delete some conflict file and resolve some error 2013-06-20 11:28:16 +08:00
James Chen 7cc1912892 Merge pull request #2937 from growingdever/patch-2 
Update .gitignore
 2013-06-19 20:09:23 -07:00
growingdever f05a375d4e Update .gitignore 
tools/project-creator/create_project.py is generating multi-platform project on COCOS2DX_DIR/prjoects
 2013-06-20 12:06:09 +09:00
minggo 227e95d429 Merge pull request #2936 from minggo/iss2304-refator-cclayer 
issue #2304:accelerometer fix of mac
 2013-06-19 19:58:15 -07:00
minggo 924ba1bdca issue #2304:accelerometer fix of mac 2013-06-20 10:56:13 +08:00
samuele3hu 3879d7ce75 issue #2277: add a new line 2013-06-20 10:52:09 +08:00
samuele3hu 08b951fa12 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop 2013-06-20 10:38:52 +08:00
samuele3hu 0c4f99080b issue #2277: modify platform config except win32 2013-06-20 10:19:46 +08:00
James Chen 12c21172c0 Merge pull request #2930 from natural-law/develop 
Optimize class ProtocolAds for more Ads plugins.
 2013-06-19 05:13:09 -07:00
James Chen 76188585b8 [emscripten] Updating .travis.yml, export environment variables for emscripten port. 2013-06-19 21:10:34 +09:00
James Chen bcd2701b84 Update AUTHORS [ci skip] 2013-06-19 20:05:38 +08:00
James Chen 1ea7fd2594 Merge pull request #2904 from edwardzhou/master 
closed #2312: WebSocket url parse error for 'ws://domain.com/websocket' pattern
 2013-06-19 05:04:11 -07:00
minggo 8d4f715008 Merge pull request #2929 from minggo/iss2304-refator-cclayer 
issue #2304:use function to simplify acceremeter call back
 2013-06-19 01:43:18 -07:00
zhangbin ee7ae3d995 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-19 16:43:17 +08:00
samuele3hu b818001007 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop 2013-06-19 16:43:15 +08:00
zhangbin 776efaf458 Adjust ProtocolAds for more Ads plugins. 2013-06-19 16:41:15 +08:00
samuele3hu b48cf5997d issue #2277: Add OpenGL lua test samples 2013-06-19 16:40:02 +08:00
minggo ccbd0a831d issue #2304:use function to simplify acceremeter call back 2013-06-19 16:10:53 +08:00
James Chen c8415b15b5 Merge pull request #2928 from dumganhar/develop 
[Win32] Deprecating VS2010, removing unused template files.
 2013-06-19 00:25:35 -07:00
James Chen 42e1b70d8e [Win32] Updating build-win32.bat, it only supports vs2012 now. 2013-06-19 15:23:09 +08:00
James Chen 247dcb7a4c [win32] multi-platform-xxx template only support vs2012 now. 2013-06-19 15:23:09 +08:00
James Chen 74e9be0a85 Removing blackberry template, please use tools/project-creator instead. 2013-06-19 15:23:09 +08:00
James Chen 24da0d6de5 Deprecating vs2010 support. 2013-06-19 15:23:09 +08:00
James Chen ecde1377a8 Removing 'install-template-msvc.bat', please use tools/project-creator instead. 2013-06-19 15:23:09 +08:00
James Chen 54221162b4 Merge pull request #2927 from dumganhar/develop 
[iOS][Marmalade] Compilation errors fix after merging https://github.com/cocos2d/cocos2d-x/pull/2919
 2013-06-19 00:10:55 -07:00
James Chen 016d34d889 Compilation errors fix after merging https://github.com/cocos2d/cocos2d-x/pull/2919 2013-06-19 15:08:09 +08:00
James Chen 7b9ee7c8ed Update AUTHORS [ci skip] 2013-06-19 15:57:24 +09:00
James Chen e432496dc4 Merge pull request #2869 from xyhl515/develop 
issue #2307: JSB function getCPBody return type is not right.
 2013-06-18 23:56:21 -07:00
James Chen 86f7fd4988 Merge pull request #2925 from dumganhar/musikov-develop 
fixed #2303: Missing precision when getting strokeColor and fontFillColor
 2013-06-18 23:27:57 -07:00
James Chen 98c6594eb3 Update AUTHORS [ci skip] 2013-06-19 14:27:13 +08:00
James Chen e6c14edf18 Merge pull request #2907 from waiter/master 
fixed #2306: update “solve android crash with CCLabelTTF setString function”
 2013-06-18 23:22:54 -07:00
James Chen b7a33afc71 fixed #2303: float assignment fix. 2013-06-19 14:09:23 +08:00
James Chen f007819f74 Merge branch 'develop' of https://github.com/musikov/cocos2d-x into musikov-develop 
Conflicts:
	cocos2dx/textures/CCTexture2D.cpp
 2013-06-19 14:05:55 +08:00
James Chen b91e432258 Merge pull request #2924 from dumganhar/j4m3z0r-emscriptenate 
fixed #2301: Asynchronous Image loading for Emscripten.
[emscripten] Merge PR https://github.com/cocos2d/cocos2d-x/pull/2919
 2013-06-18 22:56:02 -07:00
minggo ef254fe6b0 Merge pull request #2918 from superrad/patch-1 
CCTexturePVR now sets its _format when unpacking from PVRv3 as well as P...
 2013-06-18 22:53:29 -07:00
James Chen 8f33bf7e05 issue #2301: _pTextures --> _textures. 2013-06-19 13:40:21 +08:00
James Chen fa21674f6c issue #2301: Updating travis-scripts for emscripten. 2013-06-19 13:15:29 +08:00
James Chen fa6a0d4051 issue #2301: m_pTextures --> _pTextures. 2013-06-19 13:15:03 +08:00