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

3456 Commits

Author SHA1 Message Date
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
ivzave 806398519a repair CCTransitionSplitCols & CCTransitionSplitRows 2013-01-15 00:49:05 +04:00
minggo 78fc7cb5b5 Merge pull request #1840 from walzer/gles20 
Doxygen sample in CCSprite.h
 2013-01-14 06:07:50 -08:00
walzer 4ae43e5901 fix typos in doxygen of CCSprite and CCProtocol 2013-01-14 21:51:47 +08:00
minggo 90a4653530 Merge pull request #1839 from fnz/gles20 
Fix addImageAsync iOS memory leak
 2013-01-14 03:22:11 -08:00
walzer c9c227873f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2013-01-14 17:07:07 +08:00
walzer 1ab552b482 Add a sample doxygen sample in CCSprite.h and CCProtocol.h 2013-01-14 16:54:20 +08:00
Victor K bf01df0f52 Fix addImageAsync iOS memory leak 
Bug: http://www.cocos2d-x.org/issues/1087
Thread: http://www.cocos2d-x.org/boards/6/topics/17031
 2013-01-14 15:32:30 +07:00
James Chen 6733f786a5 fixed #1649: Reverted some invokings of function that returns const reference. 2013-01-14 16:06:18 +08:00
James Chen 22ebf3a5e5 Merge remote-tracking branch 'cocos2d-x/gles20' into iss1649-return-const 2013-01-14 15:52:42 +08:00
James Chen 6565fa92cc fixed #1649: Changed return type to const reference for member variable access. 2013-01-14 15:51:53 +08:00
minggo c08c982f89 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1468-ccpoint 2013-01-14 15:07:21 +08:00
minggo 984b304ec5 issue #1468:change CCPoint CCSize CCRect from class to struct 2013-01-14 14:45:16 +08:00
James Chen 0fd16e7b31 Merge pull request #1827 from folecr/assert_fix 
fixed #1654: Assert fix for android.
 2013-01-13 22:15:11 -08:00
johnangel a1155f52e6 Merge remote branch 'upstream/gles20' into gles20 2013-01-11 21:48:47 +01:00
folecr 58874dc7a5 CCAssert uses CC_ASSERT directly 
* ... after call to cc_assert_script_compatible()
 * CCAssert will now report the correct line number
 2013-01-10 12:26:12 -08:00
johnangel 16269d952d Detect VS2012 Update 1 2013-01-10 11:55:30 +01:00
James Chen 9f322d9646 fix a typo. 2013-01-10 15:58:52 +08:00
folecr e3cf517f32 Assert implementation for Android 
* __android_log_assert is not stable
    * Uses __android_log_print instead
 2013-01-09 18:51:49 -08:00
folecr c0ecad31fe Consistent use of CCAssert 
* Remove @
 * Use CCAssert instead of CC_ASSERT (number of parameters differ between the two)
 2013-01-08 14:11:34 -08:00
johnangel e32a193561 Setting Windows app title for non-Debug mode, also. 2013-01-07 12:17:50 +01:00
johnangel 674bb8e728 Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010. 2013-01-07 11:51:05 +01:00
James Chen b662d5c569 fixed #1620: Added license. Removed LocalStorage.h from cocos-ext.h. 2013-01-07 18:06:53 +08:00
James Chen 3fa771f0c4 fixed #1620: Using sqlite3 to implement sys.LocalStorage for iOS and android. 2013-01-07 17:22:06 +08:00
James Chen 266e6e8acc fixed #1641: The coins in Watermelon Me fail to animate in cocos2d-x JS binding. 2013-01-05 18:54:08 +08:00
James Chen 9ef74bef80 fixed #1636: Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more. 
Added platform macro for CCEditBoxImpl* files.
 2013-01-05 11:10:24 +08:00
dualface 37a0f19c46 remove RGB565 support 2013-01-04 23:34:24 +08:00
minggo 539bb56256 Merge pull request #1799 from tks2shimizu/gles20 
Added CCFloat, CCDouble and CCBool
 2013-01-03 19:32:35 -08:00
James Chen f95d1677df Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into iss-blackberry 2013-01-04 09:52:01 +08:00
James Chen b50bf716a2 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2013-01-03 19:58:10 +08:00
James Chen 760a8c1d39 fix a compilation error for android. 2013-01-03 19:56:34 +08:00
Dale Ducharme 611db78b39 Removing grskia dependancy and adding in freetype support to the builds. 2013-01-02 18:53:31 -05:00
fape 29a2f273b1 reorganize third party libs 2012-12-29 23:56:14 +01:00
fape 4421b6bf7a remove unused libs 2012-12-29 23:53:39 +01:00
dualface d9ef93bbe5 fix some issues 2012-12-30 02:14:30 +08:00
dualface 0b25220f22 update libwebp to 2.1 
add support RGB888, RGB565,RGBA4444
 2012-12-30 02:12:02 +08:00
dualface 1dcb3742e9 fix for win32 2012-12-29 17:43:34 +08:00
James Chen d2ad820a48 fixed #1627: Adding view name for sample applications. 2012-12-29 14:50:00 +08:00
dualface 39c4765423 fix for mac 2012-12-29 14:17:52 +08:00
dualface 806138d990 fix some issues 2012-12-29 13:58:02 +08:00
James Chen 9bd302e35b fixed #1627: VS version check in project file. 2012-12-29 13:54:46 +08:00
James Chen b120874a87 fix compilation errors. 2012-12-29 11:23:31 +08:00
Tomoaki Shimizu 1293c8a6c2 added licence 2012-12-29 11:32:27 +09:00
dualface b50e4cdf2b add WebP support 2012-12-29 10:27:43 +08:00
James Chen f2f3aa55bf Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012 
Conflicts:
	samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
	samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
	samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
	samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
	samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
	samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
	samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
	scripting/javascript/bindings/generated
	scripting/lua/proj.win32/liblua.vcxproj
 2012-12-29 09:48:22 +08:00
Tomoaki Shimizu b4edd167af The variable name was changed.The check of pRet was added. 2012-12-28 12:24:28 +09:00
Tomoaki Shimizu 87146d82e1 Added CCFloat, CCDouble and CCBool 2012-12-27 23:15:13 +09:00
James Chen f159df2e13 Compilation warning fix for CCAssert macro. 2012-12-27 16:48:02 +08:00
minggo 4cdc984b0e Merge pull request #1797 from dumganhar/gles20 
fixed #1597: TestCpp crashes when running ActionEaseTest after running ParticlesTest.
 2012-12-27 00:10:53 -08:00
James Chen b62d254f63 fixed #1597: Added return pointer check. 2012-12-27 16:07:48 +08:00
James Chen ac7755e68b fixed #1597: TestCpp crashes when running ActionEaseTest after running ParticlesTest 2012-12-27 15:42:55 +08:00
minggo 0adc6abe30 Merge pull request #1776 from dualface/make_ccassert_compatible_lua 
[luabinding] make CCAssert compatible Lua
 2012-12-26 23:28:32 -08:00
James Chen f07987418c Merge pull request #1794 from dumganhar/sync 
fixed #1625: Added stackable action support. Exchanged the order of parameter for 3d actions.
 2012-12-26 20:50:32 -08:00
James Chen 7d9f06b48c fixed #1625: Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests. 2012-12-27 10:55:25 +08:00
James Chen bb486af6a7 Added stackable action support. Exchanged the order of action. 2012-12-26 18:59:31 +08:00
dualface 09b1d9f520 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into make_ccassert_compatible_lua 2012-12-26 18:37:51 +08:00
dualface 57bccc7e4a remove CC_LUA_ENGINE_ENABLED macro 2012-12-26 18:33:55 +08:00
fape 3550550568 marmalade acceleromater improvement 2012-12-24 17:24:10 +01:00
johnangel 08cd9e37fc Setting PlatformToolSet to v110_xp for Visual Studio 2012 only. 2012-12-24 10:27:56 +01:00
minggo df73cd12a6 fixed #1623:use file descriptor instead of file path to create media player 2012-12-24 17:20:44 +08:00
minggo 0f669114fc Merge pull request #1775 from mingulov/music 
CocosDenshion Android - missing sound effects with some conditions
 2012-12-23 22:45:47 -08:00
ivzave fcce930188 repair linux eclipse build & add 64-bit project configurations 2012-12-22 07:14:59 +04:00
dualface cc69e39c8a [luabinding] make CCAssert compatible Lua 2012-12-22 10:13:37 +08:00
Denis Mingulov ca00d50259 CocosDenshion Android - missing sound effects with some conditions 
Android SoundPool.load returns 0 if sound might not be loaded - for
example, it does not exist. Previously - 0 has been ignored and
incorrectly written to HashMap, so it was not possible to
understand on the application side that something goes wrong
(and use some additional workaround).

Use case:
1) On the game loading - preload all possible sound effects
   (to speed up their playing later, when it will be needed)
2) Game APK does not have any sound file, they are downloaded
   later in a separate thread.
3) Application tries to play sound effects as usual, when needed.

So due to this bug - as there was no any sound file exist
during the game loading - internal HashMap contains incorrect
0 as id for every effect, and there is no any sound effect during
the first application start.
 2012-12-21 23:15:29 +02:00
James Chen d94a0cf4c7 issue #1603: fixed a warning in unzip.cpp. 2012-12-20 18:39:29 +08:00
James Chen 9a0a5e6b31 issue #1603: fixed some warnings. 2012-12-20 17:18:49 +08:00
johnangel b8eaf00359 ESC button on Windows behaves like Back button 2012-12-19 21:11:26 +01:00
johnangel f409aba724 Setting Windows app title 2012-12-19 20:43:09 +01:00
unknown adb68ddbb6 Enable Windows XP support in Visual Studio 2012 Update 1. 
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
 2012-12-19 19:28:25 +01:00
minggo e9c7db5a36 Merge pull request #1761 from dualface/fix_ccnode_scheduleupdate_lua 
[lua] remove current schedule before register new script schedule
 2012-12-16 17:26:59 -08:00
dualface c3f900d36c [lua] remove current schedule before register new script schedule 2012-12-14 18:06:21 +08:00
dualface 98ea80329e fix android compile warning 2012-12-14 18:01:54 +08:00
dualface d6a84e0d16 fix compile error for ios/mac c++11 2012-12-10 18:10:41 +08:00
minggo e15c0a33ae fixed #1610:skip only white character 2012-12-10 17:18:20 +08:00
James Chen 15251626b0 Merge pull request #1748 from guanqun/fix-doxygen 
fix the doxygen output of CCAtlasNode
 2012-12-10 01:01:21 -08:00
James Chen 0adc070146 Merge pull request #1749 from guanqun/fix-reorder 
fix the reorder warning of class CCCallFunc
 2012-12-10 00:59:00 -08:00
James Chen 6cca9b6548 Merge pull request #1750 from dumganhar/iss1608-lua-scheduleUpdateWithPriority 
fixed #1608: Adding CCNode::scheduleUpdateWithPriorityLua() for LuaBinding.
 2012-12-10 00:54:16 -08:00
James Chen fcead8ba34 Merge branch 'lua_add_CCNode_scheduleUpdateScriptHandlerWithPriority' of https://github.com/dualface/cocos2d-x into lua-schedule-improvement 2012-12-10 16:36:46 +08:00
minggo 0f58987ad1 Merge pull request #1740 from rtissera/gles20 
[android] Cocos2dxHelper/CCFileUtils JNI fixes and improvements
 2012-12-10 00:33:11 -08:00
dualface f08b9c4573 performance fix 2012-12-10 16:31:57 +08:00
dualface 268aa45d2c rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua() 
remove unused functions
 2012-12-10 16:09:23 +08:00
Lu Guanqun b2c13cba9d fix the reorder warning of class CCCallFunc 
../actions/CCActionInstant.h: In constructor 'cocos2d::CCCallFunc::CCCallFunc()':
../actions/CCActionInstant.h:240:25: warning: 'cocos2d::CCCallFunc::<anonymous union>::m_pCallFunc' will be initialized after [-Wreorder]
../actions/CCActionInstant.h:236:6: warning:   'int cocos2d::CCCallFunc::m_nScriptHandler' [-Wreorder]
../actions/CCActionInstant.h:188:5: warning:   when initialized here [-Wreorder]
 2012-12-10 16:07:19 +08:00
Lu Guanqun 497ae7c33f fix the reorder warning of class CCCallFunc 
../actions/CCActionInstant.h: In constructor 'cocos2d::CCCallFunc::CCCallFunc()':
../actions/CCActionInstant.h:240:25: warning: 'cocos2d::CCCallFunc::<anonymous union>::m_pCallFunc' will be initialized after [-Wreorder]
../actions/CCActionInstant.h:236:6: warning:   'int cocos2d::CCCallFunc::m_nScriptHandler' [-Wreorder]
../actions/CCActionInstant.h:188:5: warning:   when initialized here [-Wreorder]
 2012-12-10 16:05:17 +08:00
Lu Guanqun 64772d09b0 fix the doxygen output of CCAtlasNode 2012-12-10 15:31:26 +08:00
James Chen fc16cd8d01 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-12-10 14:21:18 +08:00
James Chen 839288671e fixed #1606: Override update function for ExtraAction. 2012-12-10 14:11:42 +08:00
minggo 71f61596e9 fixed #1580:request focus after keyboard closed 2012-12-10 14:08:01 +08:00
dualface d854f68c63 [scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority() 2012-12-10 13:51:37 +08:00
dualface c8753f72ef [scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority() 2012-12-10 13:48:27 +08:00
James Chen f8c96483a0 fixed #1606: Return CCSequence pointer for CCSequence::create. 2012-12-10 12:02:24 +08:00
James Chen 73dd652604 fixed #1605: Crash occurs when adding just one action to CCSequence. 2012-12-10 11:10:11 +08:00
James Chen 062179c497 fixed #1604: The enum values in ccPVR3TexturePixelFormat are truncated to 32bit 2012-12-10 10:22:06 +08:00
Mat Hopwood f75f6c2b64 Mac OS Marmalade fixes 
Fixed compile issues on Mac OS
 2012-12-10 09:54:34 +08:00
Romain TISSERAND bc0309f1a3 [android] Removed hardcoded /data/data path in CCFileUtils, make use of Context.getCacheDir() through JNI callback instead. Needed in order to get CCUserDefault working fine on Nexus 10 (Androi 4.2 multi-user environment) 2012-12-09 19:40:41 +01:00
Romain TISSERAND 4cb7506932 Added proper JNIEXPORT / JNICALL modifiers to Cocos2dxHelper JNI functions called from Java side 2012-12-09 13:44:41 +01:00
James Chen 0d90fea7b3 Merge branch 'myFeature' of https://github.com/tks2shimizu/cocos2d-x into iss1602-rand-ccdictionary 
Conflicts:
	cocos2dx/cocoa/CCDictionary.cpp
	cocos2dx/cocoa/CCDictionary.h
 2012-12-07 10:40:32 +08:00
Tomoaki Shimizu e680e5f0f2 Add randomObject to CCDictionary 
Although CCArray has randomObject(), CCDictionary does not have it.
So CCDictionary should have randomObject().
 2012-12-06 23:56:49 +09:00
minggo a75f8b7e7a fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
minggo cfd6e6c82a Merge pull request #1726 from fape/hungarian_language_support 
Add Hungarian language support
 2012-12-05 17:39:46 -08:00
fape e488361e3b cosmetics: fix formating 2012-12-05 11:43:04 +01:00
fape 320d532e15 add Hungarian language support 2012-12-05 11:31:05 +01:00
minggo d858ce2fe2 some android devices can not compile this frag 2012-12-05 17:15:47 +08:00
minggo 99781368c4 Merge pull request #1677 from chenium/gles20 
Fix for CCRenderTexture on Android sleep/resume
 2012-12-04 22:40:00 -08:00
minggo c3a5e870af Merge pull request #1725 from minggo/merge_jp_support 
Merge jp support
 2012-12-04 22:11:42 -08:00
minggo a256d35a5b fix some confilcs 2012-12-05 14:01:05 +08:00
minggo 75d7df5bcf Merge pull request #1684 from lvklabs/gles20-for-pull 
Added removeAllObjects() to CCSet
 2012-12-04 20:05:56 -08:00
minggo cb2427e780 do some modification 2012-12-04 17:25:40 +08:00
James Chen 3e88f8d2e4 fix compilation errors in eclipse project for linux. 2012-12-04 16:48:23 +08:00
James Chen 8a8038b342 Enable stencil buffer for linux. 2012-12-04 16:48:23 +08:00
James Chen 6aa15e0636 Added -DCOCOS2D_DEBUG=1 for linux if building in debug mode. 2012-12-04 16:48:23 +08:00
James Chen cedd58bb77 #extension GL_OES_standard_derivatives : enable only valid in GL_ES, this fixes crashes on some Linux machines. 2012-12-04 16:47:57 +08:00
James Chen ed86e2967f Merge pull request #1706 from dumganhar/iss1590-jpeg-fix-mm 
fixed #1590: JPEG and File fixes and CocosDenshion fix for marmalade.
 2012-12-03 19:10:14 -08:00
Mat Hopwood 3b2eea2541 JPEG and File fixes 
* Fixes to JPEG loader
* Fixes to image loader to load tiff and unknown formats properly
 2012-12-04 11:03:34 +08:00
minggo bbcbfa71ef Merge pull request #1704 from minggo/cclayer_script_support 
Cclayer script support
 2012-12-03 18:55:11 -08:00
James Chen 609fce7e2f fix MenuTest crash after the commit(SHA-1:98045f667f80f78fec8452103a114b573f3a3204). 2012-12-04 10:36:13 +08:00
minggo 7ad2484a91 Merge branch 'fix_CCLayer_script_support' of https://github.com/dualface/cocos2d-x into cclayer_script_support 2012-12-04 09:50:01 +08:00
James Chen 7c074d4ced issue #1550: fixed a memory leak in jsbinding. 2012-12-03 22:17:53 +08:00
minggo af530878fd Merge pull request #1690 from dualface/fix_CCCallFunc_script_support 
Fix cc call func script support
 2012-12-02 18:26:05 -08:00
dualface e0ee27cb17 [luabinding] fix CCLayer:getScriptTOuchHandlerEntry() 
[luabinding] add CCLayer keypad, accelerometer support
 2012-12-02 15:17:34 +08:00
dualface 030f5e7079 [luabinding] cleanup script handler when release CCCallFunc 2012-12-02 15:01:12 +08:00
dualface 393ce26330 rollback commit 2012-12-02 14:56:44 +08:00
dualface d929fe2893 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-12-01 22:20:08 +08:00
dualface 058b6e9f65 fix CCCallFunc for script 2012-12-01 22:19:54 +08:00
folecr fc65b786ad Use the "old" particle system quad code. 2012-11-30 13:22:01 -08:00
Andres Pagliano 97efff6e46 Removed unnescessary header 2012-11-30 11:30:45 -03:00
Andres Pagliano 8adb3eb6eb Refactoring in CCSet 2012-11-30 11:23:44 -03:00
Gonzalo Buteler 43cc383346 Implementation of removeAllObjects() methods in CCSet 2012-11-30 10:44:09 -03:00
James Chen 95875112fa Merge branch 'iss1583-js-tests' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests 2012-11-30 21:19:19 +08:00
James Chen 98045f667f issue #1583: Added CCMenu::alignItemsInColumnsWithArray, CCMenu::alignItemsInRowsWithArray, CCLayer::CCLayerMultiplex and CCLayer::initWithArray. 2012-11-30 21:13:25 +08:00
minggo 54309c56b2 change accelerometer accurate to SENSOR_DELAY_GAME 2012-11-30 14:07:01 +08:00
minggo 75fb997513 Merge pull request #1670 from rohankuruvilla/gles20 
Fixing Accelerometer crash on Android
 2012-11-29 22:01:16 -08:00
minggo 84b35c6d48 Merge pull request #1680 from minggo/gles20 
comment codes for FPS controlling
 2012-11-29 21:58:49 -08:00
minggo 61b2e2b880 comment codes for FPS controlling 2012-11-30 13:55:25 +08:00
James Chen 23629b8187 Made all projects compiled ok on Blackberry port. 2012-11-30 12:40:47 +08:00
William Chen 132a76d801 Fix for CCRenderTexture on Android sleep/resume 
When an android app goes into the background, all gl context is lost, including any frame buffer objects that are required for rendering to a texture. When the android app returns to focus, a new FBO is generated for each render texture allowing rendering to the texture to continue.
 2012-11-29 18:04:07 -05:00
James Chen 788b478b3c Make sure HelloCpp can be full screen. 2012-11-29 16:31:29 +08:00
Rohan Kuruvilla a4b55b5217 Fixing Accelerometer crash on Android 2012-11-28 15:56:57 -08:00
Taro Kobayashi 3a814de07e implemented CCApplication::getCurrentLanguage() for linux platform 2012-11-28 19:41:50 +09:00
Taro Kobayashi a37e034e61 added support for Japanese language 2012-11-28 17:53:10 +09:00
fape 1843d576d8 create cocos2dx-ext marmalade project 2012-11-26 20:14:10 +01:00
James Chen d7ebd681ec fix a warning in CCRenderTexture. 2012-11-26 22:11:56 +08:00
James Chen be914811fb fixed #1576: CCNode::setUserObject needs to be retained. 2012-11-26 22:11:04 +08:00
minggo 69f6b3970a Merge pull request #1647 from guanqun/fix-doxygen 
Fix doxygen related errors and warnings
 2012-11-25 23:26:48 -08:00
minggo 6bb11d8d71 Merge branch 'gles20' of https://github.com/minggo/cocos2d-x into gles20 2012-11-26 15:09:34 +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 1b9a38e195 issue #1564:work ok on linux 2012-11-26 11:46:37 +08:00
James Chen a730f8866f Merge pull request #1644 from fape/testcpp_marmalade 
fixed #1575: Update samples/TestCpp to compatible with marmalade
 2012-11-25 17:51:32 -08:00
Lu Guanqun 64bec838c0 fix doxygen rendering output of CCLayerGradient 
Otherwise, the first line of CCLayerGradient is rendered with a box in
doxygen's output.
 2012-11-25 23:27:29 +08:00
fape e259467873 update marmalade languages 2012-11-25 12:13:30 +01:00
fape 3cc5920aac Update samples/TestCpp to compatible with marmalade 2012-11-24 20:14:01 +01:00
minggo 1cf237d296 Merge pull request #1643 from minggo/gles20 
issue #1564:make iOS test work ok
 2012-11-23 00:31:06 -08:00
minggo a423317abc issue #1564:make iOS test work ok 2012-11-23 16:30:09 +08:00
minggo 3980a710a3 Merge pull request #1641 from minggo/gles20 
issue #1564: make tests run on mac osx
 2012-11-22 22:24:25 -08:00
minggo 96ecb05ca9 issue #1564: make tests run on mac osx 2012-11-23 14:22:50 +08:00
minggo f82e800695 Merge pull request #1640 from minggo/gles20 
modify lua project setting
 2012-11-22 18:42:45 -08:00
minggo 226b10a9e2 modify lua project setting 2012-11-23 10:41:41 +08:00
James Chen 00ad0689ec Merge pull request #1620 from fape/remove_physics_nodes 
remove physics_nodes from marmalade
 2012-11-22 03:43:24 -08:00
minggo 2ba1bcb5af Merge pull request #1633 from minggo/gles20 
issue #1564:enable depth test by default
 2012-11-22 00:02:28 -08:00
minggo 76197f1126 issue #1564:enable depth test by default 2012-11-22 16:01:30 +08:00
James Chen b79b3335bd Merge pull request #1630 from dumganhar/iss1564-update-tests 
issue #1564: Made ChipmunkTest of TestJavascript works
 2012-11-21 23:30:14 -08:00
James Chen b66bc98a46 issue #1564: Made ChipmunkTest of TestJavascript works 2012-11-22 15:19:16 +08:00
James Chen aa8e582b7e Merge pull request #1629 from dumganhar/iss1564-update-tests 
issue #1564: fix the wrong order of parameters in CCScheduler::scheduleSelector.
 2012-11-21 20:07:45 -08:00
James Chen 51d61ba214 issue #1564: fix the wrong order of parameters in CCScheduler::scheduleSelector. 
Made MoonWarriors works.
 2012-11-22 12:05:38 +08:00
minggo 14dbe091c8 fix a logical bug in CCRenderTExture 2012-11-22 11:06:07 +08:00
James Chen 73b409f116 issue #1564: Enable point size by default on windows. This can fix point size is always equal to 1 pixel in DrawPrimitivesTest. 2012-11-22 10:04:35 +08:00
James Chen 6c81e21935 issue #1564: Set depth buffer to 24bit, stencil buffer to 8bit. 2012-11-22 09:55:44 +08:00
James Chen e1f7c0bab6 issue #1564: Removing one unnecessary line in CCRenderTexture::visit. 2012-11-22 09:55:43 +08:00
fape db883f4efc remove physics_nodes from marmalade 2012-11-21 21:34:33 +01:00
James Chen 24c83cb461 Merge pull request #1617 from dumganhar/iss1564-update-tests 
issue #1564: Fix crash of ParticlesTest.
 2012-11-21 01:24:59 -08:00
James Chen 3fc2f9888b issue #1564: Fix crash of ParticlesTest. 2012-11-21 17:22:26 +08:00
minggo a69ff7957c issue #1564:fix a logical erroe in CCRotationTo 2012-11-21 16:53:23 +08:00
James Chen 170978d6a5 issue #1564: Added ClippingNodeTest. 2012-11-21 15:22:54 +08:00
James Chen b632c3cd7c issue #1564: Minor fix in CCLabelBMFont::createFontChars(). 2012-11-21 10:06:03 +08:00
minggo a246d11110 issue #1564: update some test cases 2012-11-20 17:30:05 +08:00
James Chen 8f6c8e202e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests 
Conflicts:
	samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
 2012-11-20 16:35:42 +08:00
James Chen ebd522e3fa issue #1564: Return a new object instead of 'const reference' for some get methods. 2012-11-20 16:34:55 +08:00
James Chen eed80761be issue #1564: Bugs fixes in CCDrawNode.cpp. 2012-11-20 16:31:33 +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 76c5ad8b32 issue #1564: Deleted physics_nodes in cocos2dx since it was moved to extension. 2012-11-20 16:24:40 +08:00
James Chen 8a21d4e824 issue #1564: Moved physics_node to extension. 2012-11-20 16:17:20 +08:00
folecr 03d9a04608 cc_utf8_strlen is used in Android native code; should not be static 2012-11-19 15:57:16 -08:00
James Chen c3e02f3e52 Merge pull request #1597 from dumganhar/iss1555-update 
issue #1555: Updated ActionsTest.cpp, enabled point size in DrawPrimitivesTest.cpp.
 2012-11-19 02:15:22 -08:00
James Chen 18d583153b setUniformLocationwithMatrix4fv ~> setUniformLocationWithMatrix4fv 2012-11-19 17:16:06 +08:00
minggo 2d191befe0 Merge pull request #1596 from minggo/iss1562-label-test 
fix a memory leak in CCLabelBMFont
 2012-11-19 00:10:36 -08:00
minggo 9dc5302b4b fixed #1562:fix a memory leak in CCLabelBMFont 2012-11-19 16:08:18 +08:00
James Chen f2e0df4de3 issue #1565: Removed VS2008 support. 2012-11-19 14:42:27 +08:00
minggo fb5b7ed7bb fixed #1560:fix a logical error in CCNode::schedule() 2012-11-19 11:24:03 +08:00
James Chen db2175e41c Merge pull request #1582 from guanqun/build-fixes 
two simple build fixes
 2012-11-17 02:13:22 -08:00
James Chen b892993a83 Merge pull request #1587 from mrmop/gles20 
fixed #1559: If file in resource directory doesn't exist, it will not search the root directory.
 2012-11-16 04:56:59 -08:00
Mat Hopwood fcb265088d Rssource path root change 
fullPathFromRelativePath will now search root if file is not found in
path
 2012-11-16 10:56:11 +00:00
James Chen 18273e06e3 issue #1555: Fixed coordinate conversion errors. 
It needs to be based on 'Design Resolution Size' rather than 'Frame Size'
Please refer to the implementations of CCDirector::convertToGL and CCDirector::convertToUI.
 2012-11-16 18:55:57 +08:00
James Chen df6a50a23a issue #1555: Fixed some compilation error for marmalade and blackberry ports. 2012-11-16 18:13:55 +08:00
James Chen c5b5b978fa issue #1555: Made win32 works ok. 2012-11-16 17:08:34 +08:00
James Chen 7601cc7e27 Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update 
Conflicts:
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
 2012-11-16 16:21:16 +08:00
James Chen 7557a78e05 issue #1530: Defined a macro 'snprintf' since it's named '_snprintf' on win32. 2012-11-16 15:58:19 +08:00
James Chen bb6df91749 issue #1530: Exported CCUserDefault to js. 2012-11-16 15:58:18 +08:00
James Chen da7f3f2969 issue #1530: Added empty implementation of 'CCAccelerometer::setAccelerometerInterval' for win32,blackberry,linux,mac and marmalade ports. 2012-11-16 15:56:51 +08:00
Rohan Kuruvilla 6d59009953 Adding executeAccelerometerEvent for to CCScriptSupport and ScriptingCore 2012-11-16 15:56:29 +08:00
Rohan Kuruvilla 50fbf86180 Uncommenting accelerometer callback in CCLayer 2012-11-16 15:56:28 +08:00
Rohan Kuruvilla af3bc76062 Fixing script callbacks for schedule updates with negative and positive priorities 2012-11-16 15:55:34 +08:00
minggo 605771697a Merge pull request #1566 from mingulov/unzip_crc 
Zip support: broken CRC check / unzCloseCurrentFile
 2012-11-15 23:31:14 -08:00
minggo 6a1feb70bc issue #1555:linux work ok 2012-11-16 15:16:55 +08:00
Lu Guanqun 8270ee3e48 fix -Wreorder warning 
In the class definition, the field m_nScriptHandler is declared before
m_pCallFunc, so we should follow the order in initialization as well.
 2012-11-16 15:10:25 +08:00