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

23 Commits

Author SHA1 Message Date
billy1380 cdfe693583 - changed cocos2d mac project to support universal build and x86 
- fixed issues associated with that
 2013-03-23 16:04:51 +00:00
James Chen a889322a47 Fixed compilation error for MAC port. 2013-03-10 16:34:41 +08:00
minggo 7c8bb82c67 issue #1686:fix some compiling error 2013-03-01 09:51:42 +08:00
James Chen 3f74cd8190 fixed #1753: Adding ccUTF8.h/.cpp for MAC, LINUX and MARMALADE port. 2013-02-28 09:44:37 +08:00
James Chen cda7da3d43 fixed #1712: Adding default dpi for marmalade and mac since i don't know how to get DPI for these platforms. 2013-02-17 17:13:06 +08:00
minggo 60d36ed3aa issue #1703:fix conflicts when synchronized to latest codes 2013-02-06 16:18:37 +08:00
minggo fcc6ed89ae add tinyxml2 to mac and marmalade project 2013-02-06 13:57:16 +08:00
James Chen cc690c5a86 issue #1770: Adding webp support for mac port. 2013-02-06 13:06:48 +08:00
James Chen a0bf0d8655 issue #1687: Moving the implementation of NS2CC.mm to CCFileUtilsIOS(MAC).mm. 2013-02-03 10:56:59 +08:00
James Chen 3a9346e6ff issue #1687: Refactoring CCFileUtils, abstracting the same implementations for all platforms. 2013-02-01 11:20:46 +08:00
minggo bd025c94c3 use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok 2012-11-26 15:08:40 +08:00
minggo 96ecb05ca9 issue #1564: make tests run on mac osx 2012-11-23 14:22:50 +08:00
minggo a246d11110 issue #1564: update some test cases 2012-11-20 17:30:05 +08:00
minggo b497143f93 issue #1555:menu can receive touch event now 2012-11-16 14:51:48 +08:00
Ed Bartley 925c21cdde Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 2012-09-18 18:42:41 -04:00
Ed Bartley c67412618d Merge branch 'gles20' of github.com:FlowerpotGames/cocos2d-x; branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 
Conflicts:
	extensions/GUI/CCScrollView/CCScrollView.cpp
 2012-09-10 10:50:30 -04:00
Ed Bartley 01103c4cb1 Remove optimization of the mac debug build 2012-09-10 10:48:34 -04:00
James Chen 1460f4e42f issue #1458: Updated project configuration for all platforms. 
CCTableView::viewWithSource --> CCTableView::create, adding TableViewTest.
 2012-09-10 13:39:12 +08:00
Ed Bartley a392b17182 MAC project is missing the header search path to /include 2012-09-07 13:14:22 -04:00
YuLei da79992275 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-02 00:38:57 +08:00
YuLei a38b8d4a00 [Lua] CCNode:onEnter() and CCNode:onExit() pass {name = "enter"/"exit"} to Lua function 
[Lua] fix CCMenuItem:registerScriptTapHandler() and CCMenuItem:unregisterScriptTapHandler()
[Lua] update luabinding
 2012-08-25 17:08:33 +08:00
minggo 9ccf3cefdf fixed #1417:add header search path and add CCTouch.cpp into mac project 2012-08-06 11:08:06 +08:00
Nat Weiss 9f0be2de05 Added Mac cpp HelloWorld and Tests. 2012-07-24 19:07:31 -07:00