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

19 Commits

Author SHA1 Message Date
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
fape 30b026421e The S3E data dir ONLY used by the emulator/simulator. 2012-11-17 13:49:01 +01:00
Mat Hopwood 148a558405 Tiff support and resource location 
* Tiff support added to CCImage
* CCFileUtils updated to support resource folders
* Examples updated to support multiple resolution assets
 2012-11-14 17:46:09 +00:00
Mat Hopwood 2b265929e2 Marmalade Sample data removed and merged changes 
* Marmalade samples now use Resources folder, excess data removed
* Merged in James' changes
* CCNode::updateTransform() added
 2012-10-25 21:40:37 +01:00
Mat Hopwood 6074dea6cc Marmalade fixes and optimisation of TestCpp assets 
* .gitignore added to folders that contain app.icf to ensure that these
files get included in the repo
* Made TestCPP compatible with Marmalade
* Removed data folder from TestCPP example, now points at the samples
Resource folder
 2012-10-24 01:03:06 +01:00
Mat Hopwood 988835560d Marmalade Support 
Full Marmalade support added for Cocos2d-x
 2012-10-19 16:26:34 +01:00
James Chen deed3ddc33 Updated AppDelegate of SampleGame for iOS port. 2012-10-15 18:50:46 +08:00
walzer d18eecf247 UIInterfaceOrientationMaskLandscape -> UIInterfaceOrientationMaskAllButUpsideDown, developers still need to set orientation in xcode->targets 2012-09-27 10:28:00 +08:00
walzer c9772c76ec fix compilation error in xcodebuild command line, which are caused by ios6 deprecated marcos and enums 2012-09-27 00:44:40 +08:00
walzer 609c4b12f9 revert back SimpleGame to enableRetinaDisplay approach. Update background image of HelloCpp to 640x1136. 2012-09-24 21:14:08 +08:00
walzer 7088b19a1a add sample code in HelloCpp & SimpleGame to teach how to adapt design resolution to different iPhone screens (HVGA, 3.5 inch retina, and 4.0 inch retina) 2012-09-24 13:59:16 +08:00
walzer ed936dcd48 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into adapt-4inch-iphone5 2012-09-24 12:03:36 +08:00
walzer 5b3bb2a087 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts fixed:
	cocos2dx/platform/ios/FontLabel/FontLabel.m
	cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m
	template/xcode4/lib_js.xctemplate/TemplateInfo.plist
 2012-09-24 11:03:26 +08:00
walzer c50a62be7a issue #1482, fix typos, mehod -> method. 2012-09-24 10:54:03 +08:00
walzer 59a4b0460b HelloCpp and SimpleGame teaches how to adapt on all iPhone/iPad multi-resolutions, especially for 4-inch retina screen. 2012-09-24 10:46:15 +08:00
Walzer 88b98faa88 fixed #1482, fix orientation problem caused by ios6 api change. 
AppDelegate.mm & RootViewController.mm are updated.
 2012-09-23 20:24:51 +08:00
minggo 0a1f0369e6 fixed #1481: merge Nicolas's pull request and do some bug fixes 2012-09-21 17:01:19 +08:00
Walzer 11b5ae5cef add proj.android to samples/SimpleGame, use getVisibleSize & getVisibleOrigin instead of getWinSize 2012-09-09 21:41:48 +08:00
Walzer 7e4615cd7b upgrade Cocos2dSimpleGame to v2.0.2 framework, add it into samples folder 2012-09-09 20:20:29 +08:00