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

43 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
Huabing.Xu 4e9e893c8e 1. Add C++ code to decode ETC file 
2. Configuration and function supportsETC()
 2013-07-01 17:40:57 +08:00
James Chen 0d040bae76 closed #2347: Macros like CC_KEYBOARD_SUPPORT should not be in header file. 2013-07-01 16:48:42 +08:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
James Chen b870488aad issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port. 2013-06-24 15:31:18 +08:00
minggo ccbd0a831d issue #2304:use function to simplify acceremeter call back 2013-06-19 16:10:53 +08:00
minggo a221f06592 issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
Ricardo Quesada af49023741 Fixes for iOS7 and Xcode5 2013-06-11 12:11:05 -07:00
James Chen bb635c280c Updating multi-platform-xxx template for iOS and Android after enabling c++ 11. 2013-06-04 20:52:29 +08:00
Ricardo Quesada 39928d6a80 Adds std::function support in CCCallFunc 
And fixes some minor issues on the iOS and OS X projects
 2013-06-03 12:13:24 -07:00
James Chen 5386dfcbfd Enabling c++ 11 support for iOS. cocos2dx/proj.ios/cocos2dx.xcodeproj also needs to be updated. 2013-06-03 16:34:41 +08:00
Jaroslaw Lewandowski 3f7c506638 Ability to save/retrieve CCData into/from CCUserDefault 2013-05-29 01:06:41 +01:00
minggo 98b1d95a74 modify ORGANIZATIONNAME 2013-05-28 18:04:42 +08:00
minggo beef61fc90 issue #2161: android supports ETC format now 2013-05-27 14:42:22 +08:00
James Chen cbafaf67a6 fixed #2142: Adding CCDataVisitor and Implementing CCPrettyPrinter, iOS port is ok. 2013-05-10 15:07:05 +08:00
Ricardo Quesada ea30d21799 updates Xcode project to detect more warnings 2013-05-03 11:59:44 -07:00
James Chen 29aa62d923 fixed #1830: Using JS::CompileOptions::setUTF8(true) to compile script. 2013-03-13 18:10:54 +08:00
minggo 648e9a7bf1 issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault 2013-03-06 16:36:44 +08:00
minggo f37b1525b4 issue #1529:use NSUserDefault to implement CCUserDefault on iOS 2013-03-05 14:53:37 +08:00
Bite 85fd30aacf fix compile error when run xcode on case-sensive file system. 2013-03-02 18:15:05 +08:00
James Chen 8ba46c574a fix for conflict of project.pbxproj. 2013-02-28 13:37:45 +08:00
James Chen 7dc64fc9a6 issue #1686: sync to CCLayer 2013-02-27 09:38:30 +08:00
James Chen ac17f67686 issue #1712: Adding getting dpi support for iOS and Android. 2013-02-16 19:36:21 +08:00
minggo 60d36ed3aa issue #1703:fix conflicts when synchronized to latest codes 2013-02-06 16:18:37 +08:00
James Chen cc690c5a86 issue #1770: Adding webp support for mac port. 2013-02-06 13:06:48 +08:00
minggo 7d02925d7e issue #1703:include tinyxml2 files in android/iOS project 2013-02-06 11:15:54 +08:00
James Chen a94e1b2a9d issue #1770: Webp works ok on Android and iOS. 2013-02-05 18:18:53 +08:00
James Chen 64248386a2 issue #1770: Updating iOS project configuration and adding WEBP test demo. 2013-02-05 11:37:13 +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 a246d11110 issue #1564: update some test cases 2012-11-20 17:30:05 +08:00
minggo 6661f2c88d issue 1555:add CCPhysicsSprite 2012-11-12 15:22:26 +08:00
minggo ac363576a9 issue #1555:add CCPyhsicsDebugNode 2012-11-09 17:52:12 +08:00
minggo d2a5723973 issue #1555:add CCDrawNode 2012-11-09 12:08:18 +08:00
minggo 6159a8b592 issue #1555:add CCClippingNode 2012-11-08 17:55:25 +08:00
minggo 93d702e3cc fixed #1491:remove dependency of FontLabel lib 2012-10-15 12:03:15 +08:00
Rohan Kuruvilla 8d7516a0ef Test project for cocos2d-x js. 2012-08-27 10:07:31 -07:00
Donald Alan Morrison d6ec91807c For Release Builds: 
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NS_BLOCK_ASSERTIONS=1",
+                                       "NDEBUG=1",
+                               );
For All Builds:
+                               WARNING_CFLAGS = "-fdiagnostics-show-option";
 2012-08-20 16:11:11 -07:00
Walzer 0431cb455b fixed #1413, add CCTouch::getLocation(), getDelta() method 
return OpenGL coordinates directly, to make the usage more convenient.
 2012-07-31 17:41:53 +08:00
minggo f9c40f7372 issue #1399: work ok on iOS after adjusting directory structure 2012-07-19 17:22:36 +08:00
minggo 2666df9472 issue #1269:mrege latest code and fix conflict 2012-06-19 13:57:33 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00