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

15 Commits

Author SHA1 Message Date
minggo eada29ee40 issue #2404:created CCDprecated.h and move all global functions and variables into it 2013-07-15 16:14:26 +08:00
James Chen 4b2165e648 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into socketio 2013-07-13 19:24:41 +08:00
James Chen e88ec5ba06 Adding SocketIO source files to iOS and Mac project. 2013-07-13 19:22:18 +08:00
minggo 15096b0716 issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated 2013-07-12 14:30:26 +08:00
minggo bb758df0d0 issue #2393:mark ccp as deprecated 2013-07-12 14:11:55 +08:00
James Chen a517e68c59 closed #2379: Removing CCZone.h/.cpp. 2013-07-09 14:50:31 +08:00
minggo dfde41b932 issue #2129:fix conflicts 2013-07-05 17:32:50 +08:00
minggo 04465622b7 issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
James Chen d2746bbe90 issue #2373: Removing inline for virtual function. Adding more const getter functions. 2013-07-05 15:08:52 +08:00
James Chen 8f5dba6c44 issue #2371: Using the same prefix header for iOS and Mac. 2013-07-05 10:53:16 +08:00
James Chen 740d0b7cab issue #2371: Delete unused files 2013-07-04 17:09:51 +08:00
James Chen 808ce2e208 close #2371: Adding Lua projects for Mac. 2013-07-04 16:29:06 +08:00
James Chen 397b698f07 [iOS] Adding lua projects. 2013-07-04 13:50:09 +08:00
Ricardo Quesada 22b42bfe7d SimpleGame and HelloCpp works as expected 
their Info.plist was broken
 2013-07-03 13:24:39 -07:00
Ricardo Quesada 2b73d0cb5f ios and mac projects unified in one simple xcode project 
Not finished yet:
 - iOS only includes Test Cpp (Simple Game not working yet on iOS)

It is easier to maintain and add more targets, files, etc.
 2013-07-02 18:20:38 -07:00