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

3458 Commits

Author SHA1 Message Date
James Chen f219f480cc issue #1712: DPI return integer on android. 2013-02-17 17:18:38 +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
James Chen 541dd357fa issue #1712: Getting DPI support for Linux. 2013-02-17 16:54:45 +08:00
James Chen edfe4c2a0c issue #1712: Adding empty CCDevice.cpp for linux, mac and marmalade. 2013-02-17 16:26:59 +08:00
James Chen 2626005d20 issue #1712: Updating project setting for blackberry. 2013-02-17 16:26:08 +08:00
James Chen 2b8ea8145a issue #1712: Getting DPI support for Blackberry. 2013-02-17 16:25:15 +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
James Chen ac17f67686 issue #1712: Adding getting dpi support for iOS and Android. 2013-02-16 19:36:21 +08:00
James Chen 373706d3b3 Merge pull request #1977 from moadib/master 
Added window_group creation to CCEGLView for blackberry.
 2013-02-15 19:59:09 -08:00
billy1380 a1753113b5 CCLens3d can be concave 
added boolean operator to enable the lens to be concave as well as
convex
 2013-02-16 03:12:12 +00:00
James Chen ad61fa3e9b fixed #1703: fixed compilation errors for BlackBerry. 2013-02-16 11:05:30 +08:00
moadib fa1fee307a Added window_group creation to CCEGLView for blackberry 2013-02-12 19:00:02 +04:00
Ben Ward 5f6ce9db92 Adding Portuguese and Arabic language support 2013-02-11 15:29:56 +00:00
minggo ba8f26fed9 Merge pull request #1969 from minggo/iss1702-writablePath 
modify writable path for iOS and Android
 2013-02-06 22:16:46 -08:00
minggo 59c1f33ad5 fixed #1702:modify writable path to the return value of Context.getFilesDirectory() 2013-02-07 14:11:23 +08:00
James Chen ca9cc14d5d Merge pull request #1965 from fape/marmalade_tinyxml2 
Marmalade tinyxml2 fixes
 2013-02-06 19:24:33 -08:00
James Chen 3f0a5ab945 Merge pull request #1964 from fape/marmalade_webp 
Marmalade webp fixes
 2013-02-06 19:21:12 -08:00
ivzave 165faf49df prevent unintentional tinyxml2.cpp deletion during make clean on linux 2013-02-07 05:17:46 +04:00
fape 1ed9d643c5 prevent WEBP_USE_SSE2 2013-02-06 17:44:06 +01:00
fape 7e19a5464a Include missing header files to libwebp's marmalade project file. 2013-02-06 16:17:47 +01:00
fape 19c266ef47 include missing CCPlatformMacros.h 2013-02-06 16:16:40 +01:00
fape 05eb3a59f5 include missing CCPlatformMacros.h 2013-02-06 15:50:09 +01:00
fape 948732d617 marmalade tinyxml2 fixes 2013-02-06 14:49:04 +01:00
fape b51102d234 marmalade webp fixes 2013-02-06 14:40:48 +01:00
minggo 404cdf1122 issue #1702:return documents for iOS 2013-02-06 18:11:27 +08:00
minggo 0c5bcb3f7b issue #1702:fix a typo error 2013-02-06 18:04:40 +08:00
James Chen fb9ac31d08 fixed bugs in CCUserDefault.cpp after using tinyXML2, fixed warnings in SpriteTest.cpp. 2013-02-06 17:20:54 +08:00
James Chen 564939ee16 Merge pull request #1962 from dumganhar/iss1770-webp 
fixed #1770: Adding the library of webp for linux 32bit.
 2013-02-06 00:49:03 -08:00
minggo ed332770c3 fixed #1703:remove depence of libxml2 for vs project 2013-02-06 16:37:20 +08:00
James Chen e547735730 fixed #1770: Adding the library of webp for linux 32bit. 2013-02-06 16:33:54 +08:00
minggo 60d36ed3aa issue #1703:fix conflicts when synchronized to latest codes 2013-02-06 16:18:37 +08:00
James Chen 561f6ca435 issue #1770: Adding webp image format support for linux 64bit. 2013-02-06 15:47:23 +08:00
minggo 396230bb77 issue #1703:remove dependence of libxml2 for marmalade and linux 2013-02-06 14:16:06 +08:00
minggo 9a7cca5ed4 issue #1703:remove dependence of libxml2 2013-02-06 14:12:52 +08:00
minggo fcc6ed89ae add tinyxml2 to mac and marmalade project 2013-02-06 13:57:16 +08:00
minggo 3d9a0dc99d issue #1703:add tinyxml2 codes into vs project 2013-02-06 13:49:35 +08:00
James Chen c7fdb1e637 Merge branch 'iss1770-webp' of https://github.com/dumganhar/cocos2d-x into iss1770-webp 2013-02-06 13:07:22 +08:00
James Chen cc690c5a86 issue #1770: Adding webp support for mac port. 2013-02-06 13:06:48 +08:00
minggo e136476fb3 issue #1703:add tinyxml2 in makefile 2013-02-06 11:55:36 +08:00
minggo 682910b5f8 Merge https://github.com/cocos2d/cocos2d-x into tinyxml 2013-02-06 11:53:58 +08:00
James Chen 95dc349b77 issue #1770: Adding webp support for win32. 2013-02-06 11:23:10 +08:00
minggo 7d02925d7e issue #1703:include tinyxml2 files in android/iOS project 2013-02-06 11:15:54 +08:00
James Chen 1e5431bcc5 issue #1770: Adding webp support for blackberry and marmalade. 2013-02-06 10:52:13 +08:00
minggo 6e3409a30c issue #1703:move tinyxml2 to cocos2dx/support 2013-02-06 10:18:31 +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 da91e97e17 Merge branch 'add_webp_support' of https://github.com/dualface/cocos2d-x into iss1770-webp 
Conflicts:
	scripting/javascript/bindings/generated
 2013-02-05 11:22:53 +08:00
James Chen c42ef7e44a Merge pull request #1953 from dualface/add_CCFileUtils_Lua_support 
issue #1687: Adding CCFileUtils Lua support. Adding CCFileUtils::addSearchPath, addSearchResolutionsOrder.
 2013-02-04 18:59:49 -08:00
minggo ca0b9ca521 Merge pull request #1957 from thomaslee/initwithimage-without-release 
Don't call release() if CCTexture2D::initWith* fails
 2013-02-04 02:12:32 -08:00
Tom Lee 4023fcc094 Return false instead of NULL 2013-02-04 01:38:22 -08:00
minggo 5f9e0b5ac2 Merge branch 'tinyxml2' of https://github.com/martell/cocos2d-x into tinyxml 2013-02-04 17:24:22 +08:00
Tom Lee 610aeb28cf Don't call release() if initWith* fails 2013-02-04 01:04:54 -08:00
minggo 0465a950c7 Merge pull request #1951 from dumganhar/iss1697-render-texture 
issue #1697: fixed two logical errors in CCRenderTexture::initWithWithAndHeight.
 2013-02-04 00:28:54 -08:00
minggo 8511e75745 fixed #1689:fixed a compiling error 2013-02-04 16:17:59 +08:00
dualface 5904512ac6 add CCFileUtils Lua support 2013-02-04 12:41:24 +08:00
dualface c13965c939 remove duplicate codes 2013-02-04 11:52:16 +08:00
James Chen 7f81db038c issue #1697: fixed two logical error in CCRenderTexture::initWithWithAndHeight. 2013-02-04 11:33:13 +08:00
minggo 744bfb3cb2 Merge pull request #1945 from dualface/add_CCLuaObjcBridge 
add CCLuaObjcBridge
 2013-02-03 19:32:17 -08:00
minggo 7f594f00b8 Merge pull request #1930 from NatWeiss/tmxpolygons 
Added TMX polygon parsing.
 2013-02-02 19:17:44 -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
dualface f8c372ca9b fix CCLuaLog() 2013-02-02 15:05:30 +08:00
dualface c58a63aa92 fix for android 2013-02-02 14:56:09 +08:00
dualface d6686fe57c Merge branch 'upstream_master' into add_webp_support 2013-02-02 12:24:05 +08:00
dualface 7839ceb45b add CCLuaObjcBridge 2013-02-02 02:05:52 +08:00
James Chen e25c79f1ec issue #1687: CCFileUtils::isFileExist now support relative path. 2013-02-01 22:19:58 +08:00
James Chen ae0b973cf1 issue #1687: Moving the global function( ccFileUtils_dictionaryWithContentsOfFileThreadSafe, ccFileUtils_arrayWithContentsOfFileThreadSafe) to the CCFileUtils class. 
)
 2013-02-01 18:48:44 +08:00
James Chen 1acdf1c957 issue #1687: Updating the comments for CCFileUtils. 2013-02-01 17:16:33 +08:00
James Chen 357da4f2fc issue #1687: Updating the comments for CCFileUtils. 2013-02-01 16:46:15 +08:00
James Chen a110778739 issue #1687: Updating comments for CCFileUtils. 2013-02-01 15:41:41 +08:00
James Chen c296ab363f issue #1687: Comments some logs output for CCFileUtils. 2013-02-01 11:53:05 +08:00
James Chen 63778570d2 issue #1687: [Marmalade] If the font name wasn't end with `.ttf`, skip making a full path. 2013-02-01 11:40:55 +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 9b5d0bd251 Merge pull request #1935 from moadib/bb_eglview_event_handler 
fixed #1015: Added CCEGLView::EventHandler class for Blackberry platform.
 2013-01-30 22:31:03 -08:00
James Chen eb7cae93fd Merge pull request #1937 from dumganhar/revert-ttf-update 
Reverted the logic of CCLabelTTF::updateTexture.
 2013-01-30 22:28:48 -08:00
James Chen da59570214 Reverted the logic of CCLabelTTF::updateTexture. 2013-01-31 14:26:45 +08:00
James Chen 157e229f8c fixed #1634: Added the very first implementation of CCEditBox for Win32. 2013-01-31 14:04:49 +08:00
moadib 4d271e782b Added CCEGLView::EventHandler class for Blackberry platform 
Added CCEGLView ::getWindowGroupId() method for Blackberry platform
 2013-01-30 18:28:06 +04:00
James Chen 6b0417902c Merge pull request #1932 from Weeds/feature_linux-font-alignment 
fixed #1689: [Linux] fixed horizontal font alignment.
 2013-01-29 22:22:01 -08:00
Andre Rudlaff 9b8f3ca01e [Linux] fixed horizontal font alignment 
kAlignTop and kAlignBottom should center text horizontally
 2013-01-30 02:04:59 +01:00
Andre Rudlaff 5959c24b80 [Linux] fixed loading truetype fonts from resource directory 
We should use CCFileUtils to get the full path to font resources.
Additionally the input font is converted to lowercase for checking if it is
a ttf file. So we can also load .TTF or .tTf files.
 2013-01-30 01:43:21 +01:00
Nat Weiss 9b98e4548f Added TMX polygon parsing. 2013-01-29 14:45:41 -08:00
James Chen bb431c54ed Comments some logs in CCFileUtils. 2013-01-29 19:12:55 +08:00
minggo fb1a32e696 Merge pull request #1923 from dumganhar/master 
Updating doxygen comments for CCFileUtils.h.
 2013-01-29 02:50:16 -08:00
minggo de7dfdbc2c Merge pull request #1925 from minggo/master 
update js-tests codes from upstream and fix a logical bug of CCRect
 2013-01-29 02:08:08 -08:00
James Chen 2ca28d7e3d Updating comments for CCFileUtils.h. 2013-01-29 16:45:11 +08:00
James Chen 632b91ee08 Updating comments for CCFileUtils.h. 2013-01-29 16:31:28 +08:00
James Chen 0cd9efcf6d Updating comments for CCFileUtils.h. 2013-01-29 16:28:59 +08:00
James Chen 3cff253446 Updating comments for CCFileUtils.h. 2013-01-29 16:10:18 +08:00
James Chen 558a4bb3cc Updating comments for CCFileUtils.h. 2013-01-29 16:07:50 +08:00
James Chen 0bd2e11d75 Updating comments for CCFileUtils.h. 2013-01-29 15:56:08 +08:00
James Chen 0141b7856d Updating comments for CCFileUtils.h. 2013-01-29 15:52:33 +08:00
James Chen 13c494ad69 Updating doxygen comments for CCFileUtils.h. 2013-01-29 15:50:57 +08:00
James Chen 170fb32b6c Updating CCFileUtils.cpp for BlackBerry. 2013-01-29 15:07:36 +08:00
minggo fbcb33eefd make CCRect accept width<0 and height<0 2013-01-29 14:03:03 +08:00
James Chen 0c01711293 Comments some LOGs in CCFileUtils::fullPathForName. 2013-01-29 10:48:31 +08:00
James Chen 31681e005e CCFileUtils::fullPathFromRelativePath -> fullPathForFilename. 2013-01-29 10:40:44 +08:00
James Chen 6baeee3ff9 Adding LOG in CCFIleUtils::fullPathForFilename for Marmalade port. 2013-01-29 10:27:36 +08:00
James Chen 2694cb150b CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths. 2013-01-29 09:56:38 +08:00
James Chen d5237d637d Absolute path check for blackberry. 2013-01-29 00:42:21 +08:00
James Chen 1f0b422112 Fix a typo. 2013-01-28 23:40:56 +08:00
James Chen c160d3ed0a Using full path in CCFileUtils::getFileData. 2013-01-28 23:37:04 +08:00
James Chen 7c89086173 Merge remote-tracking branch 'cocos2d-x/master' 2013-01-28 23:29:41 +08:00
James Chen 341193eec6 Updating comments for CCFileUtils. 2013-01-28 23:28:14 +08:00
minggo 3ea562b4ad fix some logical errors and compiling errors 2013-01-28 23:19:57 +08:00
James Chen 2e421304ca Merge pull request #1911 from dumganhar/iss1683-ccfileutils 
issue #1683: Updating CCFileUtils for Blackberry and Marmalade.
 2013-01-28 05:43:41 -08:00
James Chen f0fc414a81 Fixing a bug in CCLabelTTF.cpp, checking the return value of CCTexture2D::initWithString. 2013-01-28 21:17:43 +08:00
James Chen 75d926f810 issue #1683: Fixing complication errors for blackberry. 2013-01-28 21:16:01 +08:00
minggo 05363ee8dd Merge pull request #1908 from minggo/master 
fix some warnings
 2013-01-28 04:36:01 -08:00
minggo 249b935be8 fix some warnins 2013-01-28 20:34:52 +08:00
James Chen 59f2ae13f8 issue #1683: Updating CCFileUtils for Blackberry and Marmalade. 2013-01-28 20:12:48 +08:00
James Chen 6bceb2ac6f Merge remote-tracking branch 'cocos2d-x/master' into iss1683-ccfileutils 2013-01-28 19:54:02 +08:00
James Chen ba852e8606 issue #1683: Adding default path to the vector of searching path. 2013-01-28 19:53:16 +08:00
James Chen 0d8756c900 Merge pull request #1907 from dumganhar/iss1683-ccfileutils 
issue #1683: Updating CCFileUtils.cpp for Win32.
 2013-01-28 03:51:59 -08:00
James Chen 031380d4e9 issue #1683: Updating CCFileUtils.cpp for Win32. 2013-01-28 19:49:34 +08:00
James Chen c5975dd7c4 Merge pull request #1905 from dumganhar/iss1683-ccfileutils 
issue #1683: Fixed compilation errors for linux.
 2013-01-28 02:34:24 -08:00
James Chen 733a334ec2 issue #1683: Fixed compilation errors for linux. 2013-01-28 18:32:34 +08:00
James Chen 57eb58df42 Merge pull request #1904 from dumganhar/iss1683-ccfileutils 
issue #1683: Adding FileUtilsTest.Adding default search path if developer didn't pass it.
 2013-01-28 01:57:46 -08:00
James Chen 632f99b611 issue #1683: Updating CCFileUtils for MAC. 2013-01-28 17:54:49 +08:00
James Chen e736ed487f issue #1683: Adding default search path if developer didn't pass it. 2013-01-28 17:44:53 +08:00
minggo cd75f37d06 change version string 2013-01-28 15:24:13 +08:00
James Chen 13881ba8a8 issue #1683: Updating CCApplication.h/.cpp for linux. 2013-01-28 11:56:56 +08:00
James Chen 345f18ebeb issue #1683: Refactoring CCFileUtils::setResourceRootPath for BB, Linux, MAC. 2013-01-28 10:48:47 +08:00
James Chen c24ca63a0c issue #1683: Making CCApplication::setResourceRootPath deprecated. 2013-01-28 10:36:37 +08:00
James Chen 78c16fdd22 issue #1683: Fixing absolute path check for Android. 2013-01-28 10:23:19 +08:00
James Chen f2dad83610 issue #1683: Refactoring CCFileUtils for MAC port. 2013-01-27 20:53:32 +08:00
James Chen d532670640 Removing some CCLOG. 2013-01-27 20:16:46 +08:00
James Chen 09cef5511a issue #1683: Updating CCFileUtils. 2013-01-26 23:24:41 +08:00
James Chen be6c0c9d9b Updated CCFileUtils of linux. 2013-01-26 23:20:40 +08:00
James Chen 119115502d issue #1683: Making some api of CCFileUtils more c++ friendly by using std::vector rather than CCArray. 2013-01-26 22:31:57 +08:00
James Chen ca9e96213f issue #1683: Commented one LOG. 2013-01-26 15:02:04 +08:00
martell 0e3560bcd5 final fix.. tested 2013-01-26 06:27:49 +00:00
James Chen d9fd3c6c60 issue #1683: Fixed an issue about OPENGLES ERROR 501 Warning in CCTextureAtlas.cpp. 2013-01-26 14:20:24 +08:00
James Chen 3328cfd6a4 Refactoring some logic of CCFileUtils. 2013-01-26 14:19:14 +08:00
James Chen 522e860205 issue #1683: Fixed a bug in file lookup for Android. 2013-01-26 12:10:55 +08:00
martell 05bece9d07 added ccuserdefault tinyxml2 ver 2013-01-26 02:41:27 +00:00
James Chen f71df5a873 Fixed an issue in CCFileUtils::setResourceDirectory for android. 2013-01-25 23:01:47 +08:00
James Chen 2c399de28e issue #1683: Moved CCFileUtils::setResourceDirectory. And fix a compatible issue for android. 2013-01-25 22:55:20 +08:00
James Chen 2235f745d3 issue #1683: Fixed compilation error for Win32. 2013-01-25 22:30:16 +08:00
James Chen ef131beed1 Merge pull request #1885 from dumganhar/refactor-ccfileutils 
issue #1683 :Refactoring CCFileUtils.TO BE DONE: 
Making the api of CCFileUtils more c++ friendly.
 2013-01-25 05:55:10 -08:00
James Chen fde39c6dcb Adding cache support for CCFileUtils. 2013-01-25 21:52:35 +08:00
James Chen 55af1fd3bf Removing unneeded codes in CCFileUtils.mm for iOS port. 2013-01-25 21:17:28 +08:00
James Chen a1574fe9f6 Reverted this commit (be305f84b6) since i didn't find the crash. 2013-01-25 20:59:58 +08:00
James Chen 6f3b22031f Using new API of getting full path for file name. 2013-01-25 20:51:52 +08:00
martell 684b46dd74 Initial Import of tinyxml2 to replace libxml2 2013-01-25 10:39:54 +00:00
James Chen b3f54f6c1d Merge remote-tracking branch 'origin/refactor-ccfileutils' into refactor-ccfileutils 2013-01-25 17:23:58 +08:00
James Chen 70b8e624d6 Merge pull request #8 from rohankuruvilla/fileutils_test 
Merged @Rohan's improvements for CCFileUtils.
 2013-01-25 01:20:51 -08:00
minggo dcaa3900a4 fixed #1679: use unstripped libs for armeabi-v7a 2013-01-25 14:49:25 +08:00
James Chen 805067b046 Refactored CCFileUtils for blackberry port. 2013-01-25 14:09:56 +08:00
James Chen 314445e1ca Refectored CCFileUtils for MAC port. 2013-01-25 11:12:38 +08:00
Rohan Kuruvilla 9750bbab95 removing absolute path lookup in fullPathForFilename 2013-01-24 19:04:27 -08:00
Rohan Kuruvilla f5c74d9022 Adding support for getInstance in Cocos2dxGLSurfaceView, to allow for running tasks on GL Thread 2013-01-24 18:37:24 -08:00
Rohan Kuruvilla be305f84b6 Fixing bug where it doesn't use embedded texture data, if texture filename is not available 2013-01-24 18:37:23 -08:00
Rohan Kuruvilla 287b5575f4 Changing architecture of CCFileUtils 2013-01-24 18:37:23 -08:00
James Chen cefef60e11 Refactored CCFileUtils for Marmalade port. 2013-01-24 17:38:43 +08:00
James Chen 73389d68d5 Refactor CCFileUtils for Linux port. 2013-01-24 16:44:13 +08:00
James Chen e954ce4f75 Made compatibility with old api CCFileUtils::setResourceDirectory. 2013-01-24 14:07:48 +08:00
James Chen 7589be6fb7 Refactoring CCFileUtils for win32. CrystalCraze works ok on WIN32 now. 2013-01-24 13:56:50 +08:00
James Chen dcf1127d31 Merge branch 'master' into refactor-ccfileutils 2013-01-24 11:21:23 +08:00
Ed Bartley 908035bdee Fixed a CCMenu bug that prevented the touch priority from being set to the value specified by a call to CCMenu::setTouchPriority(int). 2013-01-23 14:00:23 -05:00
James Chen 46f38c57fb issue #1661: CrystalCraze works ok on android. 2013-01-24 00:32:22 +08:00
James Chen 8cfd912a06 CrystalCraze works ok on iOS. 2013-01-23 23:17:44 +08:00
James Chen 388e1d82c3 Added resource structure which is the same as cocos2d-iphone. 2013-01-23 22:29:00 +08:00
James Chen 294509c4c0 Merge branch 'master' of https://github.com/dumganhar/cocos2d-x into myccfileutils 2013-01-23 19:52:17 +08:00
James Chen f2303b854a Fixed a typo, and regenerated luabinding codes. 2013-01-23 15:59:13 +08:00
James Chen c92d00dfa1 Merge pull request #1857 from walzer/master 
fixed #1678: Well documented CCNode member functions and variables.
 2013-01-22 23:35:14 -08:00
James Chen 2b9f79efc0 Merge pull request #1882 from dumganhar/memoryleak-action 
Fixed memory leaks in CCActionCatmullRom class.
 2013-01-22 22:41:44 -08:00
James Chen 317ac3dd95 Fixed memory leaks in CCActionCatmullRom class. 2013-01-23 14:38:46 +08:00
James Chen de8a237d73 Merge pull request #1881 from dumganhar/linux-fix 
fixed #1676: Refactoring Makefile and eclipse project configuration for LINUX port.
 2013-01-22 03:22:41 -08:00
James Chen 8ec1a66db4 Removed glew-1.7.0.tgz. 2013-01-22 18:34:51 +08:00
James Chen 3f57b01f94 Fix for 32bit. 2013-01-22 18:30:16 +08:00
James 1d7650767b Updated Makefile and project configurations for linux port. 2013-01-22 16:45:35 +08:00
James Chen 219657ee1a Merge pull request #1872 from moadib/android_manifest_gles20 
fixed #1673: Added <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.
 2013-01-21 23:52:32 -08:00
James 680fbe3517 Fixed compilation errors for linux port. 2013-01-22 15:21:37 +08:00
PickleMan ae9c56f084 Fixed syntax, integrated lines.png and lines.plist 2013-01-21 21:30:22 -05:00
ivzave 03f1efff78 ignore unpacked glew 2013-01-21 18:01:57 +04:00
walzer db59b047f0 remove "inline" keyword from set/getPositionX/Y() methods to make the compilation property without additional flags. 2013-01-21 20:57:06 +08:00
PickleMan 5c915fc584 Added rotationIsDir to Particle System. It sets the rotation of each particle to its direction 2013-01-21 04:39:48 -05:00
moadib e39829269d Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml 2013-01-21 13:03:55 +04:00
walzer b1285ca7a7 CCNode: add [set|get]Position[X|Y](void) back. 2013-01-21 16:26:33 +08:00
walzer 996d2be2b6 CCNode: add [set|get]Position[X|Y](void) back. 2013-01-21 16:26:02 +08:00
James Chen b810aac103 issue #1667: Updated the comments for CCFileUtils.h. 2013-01-21 10:11:57 +08:00
James Chen 30b2a8a882 issue #1867: Updated CCFileUtils.cpp for android. 2013-01-18 22:18:55 +08:00
James Chen 9eb149efda Updated CCFileUtils.mm. 2013-01-18 22:14:03 +08:00
James Chen bc76cf09c4 Added filename lookup support for win32. 2013-01-18 21:54:48 +08:00
walzer 8657da80a6 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-01-18 18:06:51 +08:00
James Chen 0a42829428 issue #1667: Adding file name lookup support for iOS and Android, TBD: Other platform supports. 2013-01-18 18:05:32 +08:00
minggo 6379b61400 fixed #1664:fixed a logical error in CCAtlasNode::setOpacityModifyRGB() 2013-01-18 16:40:42 +08:00
minggo fcecd43f55 Merge pull request #1862 from Horcruxes/master 
getFileData("a.png") doesn't work on iOS.
 2013-01-17 17:46:23 -08:00
Michael Ding 088e568c8e Update cocos2dx/platform/ios/CCFileUtils.mm 
fix the problem when calling CCFileUtils::sharedFileUtils()->getFileData("a.png") doesn't work.
 2013-01-18 09:27:22 +11:00
James Chen c8dfa45993 Merge pull request #1859 from dumganhar/crystal-game 
issue #1661: Adding jsb sample game CrystallCraze.
 2013-01-17 01:09:18 -08:00
James Chen 31e91e554e issue #1661: Added CrystalCraze for win32 and fix some compilation errors. 2013-01-17 17:07:18 +08:00
minggo 3e482e30d3 Merge pull request #1861 from minggo/iss1547-ccmenuitem 
fixed #1547:set selected menu item to null when it is removed from a menu
 2013-01-16 23:06:53 -08:00
minggo a7dca5c05a fixed #1547:set selected menu item to null when it is removed from a menu 2013-01-17 15:04:48 +08:00
James Chen f70e4db254 fixed #1662: Getting full path will fail if texture name in the plist is without relative path. 2013-01-17 11:42:41 +08:00
walzer 7b16494862 well documented CCNode 2013-01-17 11:20:25 +08:00
James Chen 375666fd6c fixed #1468: Exported CCPoint, CCSize and CCRect. 2013-01-15 18:59:35 +08:00
James Chen 5d7cc39edd issue #1650: Inline function needs to be implemented in header file on Android platform. 2013-01-15 18:15:14 +08:00
James Chen 547f95d761 issue #1650: Made the destructor of CCDictElement as public method. 2013-01-15 17:20:04 +08:00
James Chen c3d697a0f8 issue #1650: Adding detailed doxgen comments for CCDictionary. 2013-01-15 17:09:25 +08:00