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

2992 Commits

Author SHA1 Message Date
Denis Mingulov eaed42c8bd Zip support: broken CRC check / unzCloseCurrentFile 
A fix for changes at 75ae8d2201
- unzOpenCurrentFile3 has set pfile_in_zip_read_info->crc32_wait
just in case if Zip file has unknown structure / might not be
unpacked, so almost any unpacked file was considered as having
UNZ_CRCERROR.
 2012-11-11 10:22:48 +02:00
minggo ac363576a9 issue #1555:add CCPyhsicsDebugNode 2012-11-09 17:52:12 +08:00
Denis Mingulov 83cf8aaf29 Android: Access to files from APK is boosted - 1st review update 2012-11-09 09:53:40 +02:00
minggo d2a5723973 issue #1555:add CCDrawNode 2012-11-09 12:08:18 +08:00
Denis Mingulov 071d264cc5 Android: Access to files from APK is boosted 
Open APK file just once and cache a file list information (name and
position inside archive). Also a general ZipFile helper class is
created to read multiple files from Zip archives - might be used
for another platforms if needed.

Previously it was so for each separate file access operation:
- Open zip archive, initially parse its structure (unzOpen)
- Locate the particular file there by a linear search through
  full archive (unzLocateFile).
  So if file does not exist - still an archive has to be handled
  fully, even slower than a file exists.
- Read file.
- Close zip archive

After this commit:
- Once - open zip/apk file and collect file list information
  (average consumed time - the same like a search for 2 different
  files by unzLocateFile)
- When needed - directly retrieve file position inside the archive,
  setting it up to the zip reader and reading file

ZipFile class is located in support/zip_support/ZipUtils.h and .cpp
to prevent creation of a new files and adding them to multiple
project files.
 2012-11-08 13:46:53 +02:00
minggo 6159a8b592 issue #1555:add CCClippingNode 2012-11-08 17:55:25 +08:00
James Chen 6d1a7e089b fixed #1556: Removed CCParticleFire::create(const char* pListFile) since particle can be constructed from plist by CCParticleSystemQuad::create(plist). 2012-11-08 12:55:32 +08:00
James Chen 4d48e79d47 fixed #1556: Added a newline at the end of firePngData.h file. 2012-11-08 12:06:02 +08:00
James Chen 4a37c8fa8b fixed #1556: Set a defaut texture for CCParticleFire, CCParticleFireworks, etc. 
Added some static constructors.
 2012-11-08 12:03:49 +08:00
minggo 3f3d09fabb Merge pull request #1532 from wenbin1989/gles20 
Add error handler when read image data using libjpeg.
 2012-11-06 20:10:21 -08:00
James Chen 21e4f80fbd Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS. 2012-11-06 14:18:13 +08:00
James Chen 270676b74d issue #1549: Added some functions for CCNode. 
virtual void removeFromParent();
virtual void removeChild(CCNode* child);
virtual void removeChildByTag(int tag);
virtual void removeAllChildren();
 2012-11-05 18:41:52 +08:00
James Chen 26547c7b30 fixed #1548: Updated libcurl header files to 7.26.0 on iOS. 2012-11-05 13:13:46 +08:00
James Chen 2f5f7a601b issue #1526: Moved implementations of static functions in CCActionEase.h, CCLabelBMFont.h to CCActionEase.cpp, CCLabelBMFont.cpp. 2012-11-02 10:06:48 +08:00
James Chen 0abcd694c6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test-js-device-crash 2012-11-01 22:19:20 +08:00
James Chen 0ace12fc52 issue #1526: Moved implementations of static functions in CCParticleExample.h, CCLayer.h to CCParticleExample.cpp, CCLayer.cpp. 2012-11-01 22:17:12 +08:00
minggo d16a6bbe2f issue #1526:move implementation of static methond into .cpp file 2012-11-01 22:12:13 +08:00
wenbin1989 470fcacc81 Add error handler when read image data using libjpeg. 
Fix errors when read image using libjpeg.
Fix errors when read image with broken data using libjpeg.
 2012-11-01 21:45:51 +08:00
minggo 95d3f87bd7 fix compiling error on linux 64 bit 2012-11-01 15:38:48 +08:00
minggo 21900c26db update xcode template and version string 2012-11-01 12:06:15 +08:00
James Chen e8bf21e6a6 fixed #1543: The CCLayerGradient background of CocosBuilderTest can't be shown. 2012-10-31 18:00:51 +08:00
YuLei Liao 4fe16a262b fix incorrect delete 2012-10-31 14:08:28 +08:00
YuLei Liao 01866ddc95 fix win32 CCLuaLog memory leaks, and invalid Console UTF8 output 2012-10-31 11:02:36 +08:00
minggo af12b8dfc2 revert CCSpriteBatchNode::removeSpriteFromAtlas() 2012-10-30 18:20:47 +08:00
minggo 4d8f1aa678 Merge pull request #1420 from sburavtsov/gles20-fixSpriteBatch 
Fix removeTileAt crash corresponding this post: http://www.cocos2d-x.org...
 2012-10-29 20:12:21 -07:00
James Chen 9f6d263c15 fixed #1531: The CCSprite::updateTransform() function needs to inherited from a base function on the CCNode. 2012-10-30 10:24:28 +08:00
James Chen 9113702903 Merge pull request #1510 from dumganhar/gles20 
fixed #1312: Upgraded libcurl to 7.26.0 for linux port
 2012-10-29 01:24:29 -07:00
James Chen 2cfad104fa issue #1530: Corrected the logic of CClayer::registerWithTouchDispatcher function. 2012-10-29 15:38:44 +08:00
Rohan Kuruvilla d6753f8a2f Adding accelerometer setInterval support to Android 2012-10-29 15:08:16 +08:00
Rohan Kuruvilla ecee64d07c Adding accelerometer setInterval support to iOS 2012-10-29 15:08:07 +08:00
Rohan Kuruvilla a2ee6c3761 Changing Touch API in cocos2d-x. Also change ScriptEngine callbacks for targetted Touches 2012-10-29 15:01:30 +08:00
Rohan Kuruvilla 16d5659b17 Adding ScriptingEngine callback for onCleanup event 2012-10-29 15:00:52 +08:00
minggo 5aad6eeb9b Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into update-curl 2012-10-29 14:44:26 +08:00
minggo e992408a86 issue #1312:update libcurl for linux 64 2012-10-29 14:39:44 +08:00
James Chen 45783574fd Upgraded libcurl to 7.26.0 for linux port(32bit). 2012-10-29 11:27:25 +08:00
James Chen 6d34e66018 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-10-29 10:51:58 +08:00
James Chen 9673b20775 issue #1312: Upgraded libcurl to 7.26.0 for windows port. 2012-10-29 10:49:28 +08:00
Andrew Perrault 138ea49b0e fixed a couple typos 2012-10-27 09:58:49 -04:00
minggo 9d530c8d54 fix a compiling error 2012-10-26 12:04:45 +08:00
minggo 77b69262c8 not invoke CCDirector::reshapeProjection() in EAGLView::layoutSubViews 2012-10-26 10:10:34 +08: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
minggo 81ff3d3495 issue #1312: use --strip-unneeded parameter to strip lib 2012-10-25 16:30:14 +08:00
minggo 84e48ed7e7 issue #1312:update libcurl for android and strip all libs 2012-10-25 14:32:28 +08:00
James Chen 7d9b3d3969 Merge pull request #1488 from dumganhar/iss1520-comments 
fixed #1520: Added comments for using multiresolution in HelloCpp.
 2012-10-24 01:00:39 -07:00
James Chen c797af0fe9 fixed #1522: CCEGLView class of desktop platforms should override CCEGLViewProtocol::setScissorInPoints. 2012-10-24 10:03:19 +08:00
James Chen b3db7e91f8 fixed #1520: Updated some comments. 2012-10-23 14:01:48 +08:00
James Chen 9b644f2757 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1520-comments 2012-10-23 10:51:05 +08:00
James Chen f4f63fd824 fixed #1520: Added comments for using multiresolution in HelloCpp. 2012-10-23 10:50:47 +08:00
James Chen 56cdb76867 fixed #1493: Updated one comment. 2012-10-22 15:52:11 +08:00
James Chen 7af2f7c5ce fixed #1493: Updated one comment. 2012-10-22 15:51:06 +08:00
James Chen 6f4e56cd92 fixed #1493: Corrected some comments for CCNotificationCenter. 2012-10-22 15:49:33 +08:00
James Chen 1c0240b5de fixed #1493: Added doxygen comments in CCNotificationCenter.h 2012-10-22 13:48:11 +08:00
minggo 677ba22b5c Merge pull request #1485 from mingulov/menu_cast 
CCMenu - prevent a crash if some child item is not CCMenuItem
 2012-10-21 19:18:20 -07:00
minggo 9cf3f4c5f6 Merge pull request #1474 from wenbin1989/gles20 
Add kLanguageKorean to ccLanguageType and getCurrentLanguage()
 2012-10-21 18:49:42 -07:00
Denis Mingulov d4f65b5348 CCMenu - prevent a crash if some child item is not CCMenuItem 
CCMenu::itemForTouch expects that all children are CCMenuItems.
But it is still possible to add other child types, for example
if CCAssert is disabled or some other addChild method is called.

In this case dynamic_cast to CCNode and later try to do
((CCMenuItem*)pChild)->isEnabled() triggers an undefined behaviour
- up to a crash or something else.

Fixed by a dynamic_cast straightforward to CCMenuItem.
 2012-10-21 11:16:10 +03:00
Mat Hopwood 24115675b0 Marmalade Cocos2d-x Main Repo Changes 
These are changes to the main Cocos2d-x repo that Marmalade would like
to request for inclusion in the main repo
 2012-10-19 16:38:58 +01:00
Mat Hopwood 988835560d Marmalade Support 
Full Marmalade support added for Cocos2d-x
 2012-10-19 16:26:34 +01:00
James Chen 5751d82e6b Renamed "setFrameZoom" to "setFrameZoomFactor", added 'getFrameZoomFactor'. 2012-10-19 17:39:55 +08:00
James Chen e905da1b73 Merge branch 'gles20' of https://github.com/ImperialPenguin/cocos2d-x into iss1024-bb-ttf 2012-10-19 16:19:55 +08:00
James Chen c9ce1892af Merge branch 'gles20' into iss1024-bb-ttf 2012-10-19 16:18:30 +08:00
minggo f40b6ac4eb fixed #1515: implement zoom function on mac os 2012-10-19 11:33:06 +08:00
John Garrison f4d68a707f More BB Font fixes 2012-10-18 13:43:31 -04:00
wenbin1989 62351462a8 Add kLanguageKorean to ccLanguageType and CCApplication::getCurrentLanguage() 2012-10-18 17:17:11 +08:00
minggo 986a0a34c0 Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into zoom-scale 2012-10-18 17:01:27 +08:00
minggo fa044d3cee Merge pull request #1472 from wenbin1989/gles20 
Fix stack overflow in CCLog
 2012-10-18 01:57:27 -07:00
James Chen 549dd92d8e fixed #1516: The font size of labels for displaying FPS,SPF,DrawCount is incorrect in different design resolutions. 2012-10-18 15:53:08 +08:00
wenbin1989 29a63a3b0f Fix stack overflow in CCLog 2012-10-18 14:39:56 +08:00
James Chen a5639281ec Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20 2012-10-18 12:01:55 +08:00
James Chen a5e260dbdb issue #1515: Refactored some codes for win32 port. 2012-10-18 12:01:30 +08:00
James Chen 41c784ec61 issue #1515: [LINUX support] Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop. 2012-10-18 11:51:02 +08:00
James Chen 0b101bedd0 issue #1515: Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop. 2012-10-18 10:54:19 +08:00
James Chen c1ab8a6ead fixed #1511: Changed '#if(WINVER >= 0x0601)' to '#if(_MSC_VER >= 1600)'. 2012-10-18 09:54:24 +08:00
James Chen 9f7019e48c Updated a comment. 2012-10-17 16:52:09 +08:00
James Chen 5ab37c86b2 Fix a bug about calculating client area on win32. 2012-10-17 16:50:07 +08:00
James Chen 249ef92697 fix a bug about wrong touch area for windows. 2012-10-17 15:38:03 +08:00
James Chen 3f7b79fb08 issue #1511: Rename some static variables. 2012-10-17 15:14:34 +08:00
James Chen 2779b4f1ab Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into johnangel 2012-10-17 15:08:25 +08:00
James Chen ddfc08904a issue #1024: Made blackberry/CCImage.cpp compiled ok. 2012-10-17 10:57:21 +08:00
John Garrison 8e7b939f61 Added TTF support to Blackberry 2012-10-16 13:47:04 -04:00
johnangel cd82403638 Fix to make MultiTouchTest work properly 2012-10-16 19:02:24 +02:00
johnangel 054128c5ee Correction for touch and display area 2012-10-16 18:53:31 +02:00
johnangel a2e1400402 Merge remote branch 'upstream/gles20' into gles20 2012-10-16 08:42:30 +02:00
minggo 2ded8ea034 Merge pull request #1442 from dumganhar/iss1486-multi-res 
Multiresolution support
 2012-10-15 02:15:21 -07:00
johnangel 8d0dc8d2a7 Windows Touch support for desktop 2012-10-15 10:39:42 +02:00
James Chen a6b57f7d79 Merge pull request #1451 from micahli/gles20 
fixed #1508: Potential observer array modification while it's traversed in CCNotificationCenter.
 2012-10-14 22:50:47 -07:00
James Chen a65f13defe issue #1486: Fix bugs for CCEditBox iOS port. 2012-10-15 13:01:36 +08:00
minggo 93d702e3cc fixed #1491:remove dependency of FontLabel lib 2012-10-15 12:03:15 +08:00
micahli c69a11296e fix the potential Container iterator bug with CCNotification 
revert last fix which may contain other bugs
 2012-10-15 09:55:37 +08:00
minggo 67383ff7ce Merge pull request #1453 from shinriyo/patch-2 
getDelta() is delta function
 2012-10-14 18:34:03 -07:00
minggo eadbbf6928 Merge pull request #1447 from minggo/android-effect 
use SoundPool.OnLoadCompleteListener to play effect if it is not preloaded
 2012-10-14 18:29:35 -07:00
shinriyo 1569550528 getDelta() is delta function 
I'm sorry, I mistook the pull request.
 2012-10-14 21:20:31 +09:00
James Chen 2c670a9efc issue #1486: Fix a bug in CCRenderTexture.cpp about calculate width and height by multiply CC_CONTENT_SCALE_FACTOR(). 2012-10-13 18:19:37 +08:00
micahli 7d1d46ee3f fix a bug with CCNotificationCenter that observer->performSelector(observer) may call CCNotificationCenter::removeObserver and cause CCARRAY_FOREACH(m_observers, obj) access invalid address 2012-10-13 16:44:46 +08:00
James Chen 6cf602ea3b issue #1486: CCDirector::getWinSizeInPixel return 'winSize* CC_CONTENT_SCALE_FACTOR()'. This change fixes the wrong display bug in CCRenderTexture. 2012-10-13 10:18:03 +08:00
minggo 0a39fa8bef fixed #1507: use SoundPool.OnLoadCompleteListener to play effect if it is not preloaded 2012-10-12 17:43:43 +08:00
James Chen 965540ecec issue #1486: fix a warning in CCAutoreleasePool.cpp. 2012-10-12 16:03:53 +08:00
James Chen f5abe422ea Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1486-multi-res 2012-10-12 15:50:11 +08:00
James Chen e1c0ea761b issue #1486: Removed some unused codes, made it works on WINDOWS. 2012-10-12 09:58:42 +08:00
Rohan Kuruvilla 540b41c091 Fixing LabelAtlas to read texture relative to path of plist file 2012-10-11 18:44:46 -07:00
James Chen cdf54a872f issue #1486: A bug fix. 2012-10-11 17:02:27 +08:00
James Chen ade54a3de7 Merge branch 'multi_resolution_support' of https://github.com/BorMor/cocos2d-x into bormor-multi-res 
Conflicts:
	samples/HelloCpp/Classes/AppDelegate.cpp
	samples/HelloCpp/Classes/HelloWorldScene.cpp
 2012-10-11 16:12:22 +08:00
James Chen 26a5f31f0e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1469-moonwarriors 2012-10-10 15:25:49 +08:00
James Chen 48b146a098 issue #1469: Exported 'cocos2dVersion'. 2012-10-10 15:08:11 +08:00
minggo d8b0c75675 fixed #1500:fix a memory leak 2012-10-10 12:02:56 +08:00
minggo 96b3232910 fixed #1500:make rendertexture work ok on certain Qualcomm Andreno gpu 2012-10-10 11:36:02 +08:00
johnangel e510bee238 Displaying window size in Debug mode 2012-10-09 10:58:56 +02:00
johnangel e7340f6c1b ESC button on Windows will now behave like Back button on mobile phones 2012-10-08 18:46:19 +02:00
johnangel 72aa46afe5 Refactoring code 2012-10-08 18:38:04 +02:00
johnangel c6da27b793 Debug app uses executable directory; Non-debug app uses local app data 
directory
 2012-10-08 17:22:27 +02:00
johnangel ad7dacc281 Merge remote branch 'upstream/gles20' into gles20 2012-10-08 16:35:43 +02:00
James Chen be236155e9 Fix a typo. 2012-10-08 14:58:24 +08:00
James Chen f6c34e23e6 Adding some comments for CCDictionary::objectForKey method. 2012-10-08 14:55:46 +08:00
James Chen 70286073e1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-10-08 14:53:22 +08:00
James Chen 719cb7b7a6 fixed #1496: An error of comparing font's face name in CCImage of win32 port. 2012-10-08 14:52:08 +08:00
James Chen 6d29e63294 fixed #1494: Change the value of CCObject::m_uAutoreleaseCount in CCAutoreleasePool class. 2012-10-08 14:05:03 +08:00
James Chen 54b4c690d1 fixed #1494: Missing removing auto-release object from AutoReleasePool if invoking 'autorelease' method more times. 2012-10-08 13:41:48 +08:00
Ed Bartley 04527f7378 Added some flexibility to the Cocos2dxActivity. View creation can be overridden by developers that use a custom Layout and custom views. 2012-10-06 23:39:47 -04:00
Ed Bartley a9177fed6f Fix Typo. 
Make mGLSurfaceView public so that subclasses can may initialize mGLSurfaceView from a custom xml layout.
 2012-10-05 10:24:17 -04:00
Sergey Buravtsov 9eec2d69ee Fix removeTileAt crash corresponding this post: http://www.cocos2d-x.org/boards/6/topics/4336 2012-10-01 16:08:11 +04:00
johnangel 0f2dac9d8e Saving data to C:\Documents and Settings\<User Name>\Local 
Settings\Application Data as designed for Windows apps
 2012-10-01 11:55:21 +02:00
minggo 6b9affae65 Merge pull request #1402 from Horcruxes/patch-1 
Update cocos2dx/platform/ios/CCFileUtils.mm
 2012-09-29 00:35:35 -07:00
minggo 936cb19684 Merge pull request #1405 from dualface/complete_delete_ccdirector 
Complete delete CCDirector after called CCDirector::purgeDirector()
 2012-09-28 19:20:36 -07:00
walzer 0cca568ffe fixed #1492, assert if user add an CCObject* into CCAutoreleasePool twice. 2012-09-28 18:22:00 +08:00
Horcruxes cb66f1673e Update cocos2dx/platform/ios/CCFileUtils.mm 
fixing cannot read data using CCArray::createWithContentsOfFile
 2012-09-27 12:31:53 +10: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
James Chen 0d8e7deb10 Reverted CCNotificationCenter.cpp. 'object' and 'target' should not be retained. We must use weak reference, otherwise the life-cycle of target object will be delayed until the destruction of CCNotificationCenter. 2012-09-26 16:25:13 +08:00
James Chen a4e04d70c9 A memory leak fix in CCNotificationCenter. 2012-09-26 15:51:14 +08:00
James Chen 48a5ed22c8 Merge pull request #1379 from jzgenius/fix_CCNotificationObserver_performSelector 
fixed #1485: [1] The parameters 'target' and 'object' in the constructor of CCNotificationObserver needs to be retained;
[2] perform m_object to performSelector target.
 2012-09-26 00:47:28 -07:00
James Chen 0ca7e00700 fixed some compilation errors for linux platform. 2012-09-26 15:23:10 +08:00
jzgenius 0517372557 add CC_SAFE_RETAIN into constructor of CCNotificationObserver. 2012-09-26 14:10:52 +08:00
James Chen 0dfa1b566b Fixed compilation errors of blackberry platform. 2012-09-26 11:16:44 +08:00
James Chen 4a3127f41f Updated android template. Added 'cocos2dx/platform/android/java/res/.gitignore' since res folder is needed for eclipse. 2012-09-25 21:52:30 +08:00
James Chen 3e442d161f Merge pull request #1381 from dumganhar/iss1483_sync_cccontrol 
issue #1483: Synchronizing CCControlExtension to latest version.
 2012-09-25 02:30:30 -07:00
James Chen f7229f74d8 issue #1483: Synchronizing CCControlExtension to latest version. 2012-09-25 16:57:51 +08:00
jzgenius e24ad0380b [fix] CCNotificationObserver performSelector & CCNotificationObserver function. Let's m_object is right perform to target. 2012-09-25 14:54:13 +08:00
minggo 364d7a487a Update cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java 
Comment some debug codes, because it will cause auto-building fail.
 2012-09-25 14:42:45 +08:00
minggo df24c919a4 Merge pull request #1377 from minggo/gles20 
fix auto building error
 2012-09-24 21:14:10 -07:00
minggo 74b9e2539b fix auto building error 2012-09-25 12:13:06 +08:00
Walzer 450f8f3a30 Merge pull request #1360 from jzgenius/NEWplatform-third_party-ios-libraries-libcurl 
Ne wplatform third party ios libraries libcurl
 2012-09-24 21:05:17 -07:00
minggo 3d177f926b Merge pull request #1373 from ByungChoi/fontconfig_link_fix 
fixed cocos2dx linux TestCpp build break
 2012-09-24 19:18:12 -07:00
walzer 06f639edab update copyright to 2012, update cocos2d version to 2.0.3 
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
 2012-09-24 21:22:20 +08:00
Byung Choi 624bedad38 fixed cocos2dx linux makefile to link libfontconfig 2012-09-24 20:14:42 +09:00
Sergey Vikhirev 05eb4352e8 Remove retina specific methods and logic 2012-09-24 14:22:02 +04:00
minggo 88952396e4 Merge branch 'ptr_int_casting_issue' of https://github.com/ByungChoi/cocos2d-x into ptr_int 2012-09-24 15:16:30 +08:00
minggo 2ed7b9febe Merge pull request #1365 from dualface/luafix 
luabinding bugfix
 2012-09-23 20:17:23 -07:00
minggo 37f508b415 Merge pull request #1327 from Weeds/gles20 
[linux] font rendering enhancements
 2012-09-23 19:58:48 -07:00
dualface 863b0b89a3 Revert "[iOS] fix: enableRetina() and setDesignResolutionSize() can not be used simultaneously. FROM kunlun.com, THANKS" 
This reverts commit 6eabead4e3.
 2012-09-24 10:58:43 +08:00
Donald Alan Morrison dec9fff7a7 UITextAlignment deprecated for NSTextAlignment. 
UITextAlignment on NSTextAlignment is injective, not surjective.
There is an equivalence relationship for a subset of NSTextAlignment.

http://en.wikipedia.org/wiki/One-to-one_function
 2012-09-22 20:56:10 -07:00
Byung Choi 68f38914b1 fixes #1359 , MSVC's stdint absence 2012-09-22 17:36:36 +09:00
jzgenius ad5b687848 [lib] New libcurl.a, armv7 & armv7s & simulator Supported. 2012-09-22 13:16:23 +08:00