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

10 Commits

Author SHA1 Message Date
James Chen b818c0afa6 fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +08:00
James Chen 230b8a386b issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
 2012-04-19 14:35:52 +08:00
dumganhar 4b9cbb85ff #issue 908: Merge marmalade to latest cocos2d-x source 
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade

Conflicts:
	cocos2dx/platform/CCFileUtils.cpp
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/support/zip_support/ioapi.cpp
 2011-12-12 17:46:21 +08:00
Giovanni Zito 0a7a000c2d Changed symbols from "airplay" to "marmalade", added files and folders for marmalade 2011-12-08 12:21:48 +01:00
dumganhar bfdb908d01 add Cocos2dx project 
add HelloWorld project and rename proj.blackberry fold to proj.qnx
 2011-12-06 14:56:37 +08:00
dumganhar c94adc58b9 changed bada projects directory, add bada macro 2011-09-19 17:53:45 +08:00
natural-law ed2566e201 issue #434,Refactor class CCFileUtils on platform airplay. 2011-03-28 16:27:26 +08:00
natural-law cee82fe9fa issue #434,refactor class CCFileUtils on android and ios. 2011-03-26 17:24:37 +08:00
walzer ed492bbd1e [airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution! 2011-03-23 22:16:20 +08:00
natural-law 95e697d316 fixed #262 Add namespace for the project CocosDenshion. 2010-12-15 18:28:18 +08:00