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

20 Commits

Author SHA1 Message Date
Huabing.Xu 041bef148a Merge branch 'origin/develop' 
Conflicts:
	cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
	cocos2dx/proj.win32/cocos2d.vcxproj.filters
 2013-07-02 13:47:02 +08:00
James Chen 4e5ee103ec Fixing errors on windows. 2013-07-01 18:22:09 +08:00
Huabing.Xu 4e9e893c8e 1. Add C++ code to decode ETC file 
2. Configuration and function supportsETC()
 2013-07-01 17:40:57 +08:00
flaming0 bd0c40026f Fixed windows build (added CCComponent, CCArmature files to win32 project) 2013-06-16 00:34:23 +04:00
Jaroslaw Lewandowski 3f7c506638 Ability to save/retrieve CCData into/from CCUserDefault 2013-05-29 01:06:41 +01:00
minggo 5f37e854c4 issue #2161: resolve conflict 2013-05-28 11:50:14 +08:00
minggo d6e547cd02 issue #2161:add CCTextureETC.cpp/.h into vs2010 project 2013-05-28 10:04:19 +08:00
James Chen 8448280ed3 issue 2217: Updating Make file and project configuration to add ccFPSImage.c. 2013-05-23 16:50:48 +08:00
James Chen db464530fb fixed #2142: updating win32. 2013-05-10 15:46:24 +08:00
minggo 2842719e35 issue #1529:add user_default into vs2010 project 2013-03-07 10:31:01 +08:00
James Chen 0d70e6f92f issue #1753: Win32 works ok. 2013-02-27 15:45:23 +08:00
James Chen 3dd792475f issue #1712: Moved CCDevice.cpp to platform/win32. 2013-02-17 11:52:30 +08:00
James Chen 9f6df60be0 issue #1712: Adding win32 support. 2013-02-17 11:34:55 +08:00
minggo ed332770c3 fixed #1703:remove depence of libxml2 for vs project 2013-02-06 16:37:20 +08:00
James Chen 95dc349b77 issue #1770: Adding webp support for win32. 2013-02-06 11:23:10 +08:00
James Chen 3a9346e6ff issue #1687: Refactoring CCFileUtils, abstracting the same implementations for all platforms. 2013-02-01 11:20:46 +08:00
James Chen e8cf71407d issue #1564: Deleted physics_nodes in cocos2dx since it was moved to extension. 2012-11-20 16:27:47 +08:00
James Chen c5b5b978fa issue #1555: Made win32 works ok. 2012-11-16 17:08:34 +08:00
Walzer ba224cc283 add CCTouch.cpp into proj.win32, android.mk, xcode4 template. 2012-07-31 23:32:19 +08:00
James Chen 2ab5e4ab9c issue #1399: Added vs2010 support. 2012-07-23 11:57:34 +08:00