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

694 Commits

Author SHA1 Message Date
Rohan Kuruvilla af86f534dc Adding readme file for CocosPlayer for Android 2013-01-29 01:45:16 -08:00
James Chen c1d0f29f6c Updating JS Test, Removing wav files in Published-Android. 2013-01-29 13:33:49 +08:00
James Chen 001d3382a9 [TestCpp/EffectsAdvancedTest] Adding getPosition method for Len3DTarget. 2013-01-29 12:59:43 +08:00
James Chen bf571ace53 Updating JS Tests. 2013-01-29 09:59:16 +08:00
James Chen 2694cb150b CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths. 2013-01-29 09:56:38 +08:00
minggo 3ea562b4ad fix some logical errors and compiling errors 2013-01-28 23:19:57 +08:00
minggo ba9308089c fix some errors in xcode template 2013-01-28 21:53:55 +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
minggo fae7d5beeb Merge pull request #1910 from minggo/master 
fix some warnings
 2013-01-28 05:42:46 -08:00
minggo 52a4b15659 remove unneeded codes 2013-01-28 20:57:49 +08:00
minggo 5eb8ca30fb fix some warings 2013-01-28 20:52:56 +08:00
minggo 8d889cd0be Merge pull request #1909 from minggo/master 
add correct resource into CocosDragon iOS project
 2013-01-28 04:47:31 -08:00
minggo aaf4b14ddf add fileLookup.plist for CocosDragon iOS project 2013-01-28 20:46:15 +08:00
minggo 9e5d0100fe remove unneeded resource for CocosDragon iOS project 2013-01-28 20:41:43 +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 031380d4e9 issue #1683: Updating CCFileUtils.cpp for Win32. 2013-01-28 19:49:34 +08:00
James Chen 733a334ec2 issue #1683: Fixed compilation errors for linux. 2013-01-28 18:32:34 +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
James Chen 16ef70c069 issue #1683: Updating FileUtilsTest.cpp. 2013-01-28 17:43:53 +08:00
James Chen f69ef6182c issue #1683: Adding FileUtilsTest. 2013-01-28 15:17:20 +08:00
James Chen c19b9885fe Adding COCOS2D_DEBUG=1 for sample projects. 2013-01-28 10:22:32 +08:00
James Chen d532670640 Removing some CCLOG. 2013-01-27 20:16:46 +08:00
James Chen eec0ba3c19 Getting full path in before playing sound. 2013-01-27 19:20:49 +08:00
James Chen af1eb5fa87 issue #1683: Updated Appdelegate.cpp for CocosPlayer. 2013-01-26 22:57:12 +08:00
James Chen e73e2f4387 issue #1683: Updated the name of CocosPlayer project. 2013-01-26 22:35:30 +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 eeb5e7a115 Updated JS Tests. 2013-01-26 14:45:26 +08:00
James Chen 688f9b2546 Updated JS Tests. 2013-01-26 14:29:06 +08:00
James Chen a28a5907c3 Updated JS Tests. 2013-01-26 12:11:16 +08:00
James Chen fde39c6dcb Adding cache support for CCFileUtils. 2013-01-25 21:52:35 +08:00
James Chen 6f3b22031f Using new API of getting full path for file name. 2013-01-25 20:51:52 +08:00
James Chen cf93281419 Updating JS Tests. 2013-01-25 17:29:35 +08:00
Rohan Kuruvilla f050fc9f08 Allowing resolution being sent to CocosBuilder to be set by AppDelegate 2013-01-25 00:30:12 -08:00
Rohan Kuruvilla 6fdbff537a Fixing run and reset buttons being enabled by default 2013-01-24 23:32:00 -08:00
Rohan Kuruvilla 6d0d9e7375 Refactoring a bit to allow JNI cleanCache call 2013-01-24 23:27:19 -08:00
Rohan Kuruvilla 9532e5e6c7 Chaning name sent to CCB 2013-01-24 22:19:49 -08:00
Rohan Kuruvilla dcde99d568 Adding Binary Plist parsing library 2013-01-24 22:19:45 -08:00
Rohan Kuruvilla 43229cb440 Adding CocosPlayerJS for Android 2013-01-24 18:37:24 -08:00
James Chen 5e65745795 Updated iOS project configuration. 2013-01-24 14:44:44 +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 9b3f9503ea Updated JS Tests. 2013-01-24 11:39:11 +08:00
James Chen 1180a98eb9 Updated submodule reference for cocos2d-js-tests. 2013-01-24 00:37:39 +08: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 294509c4c0 Merge branch 'master' of https://github.com/dumganhar/cocos2d-x into myccfileutils 2013-01-23 19:52:17 +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 b5efd699bf Fixed a memory leak in ActionsTest. 2013-01-23 14:40:11 +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 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
James Chen 0187bb6504 Merge pull request #1876 from dumganhar/iss1639-custom-property 
fixed #1639: Added custom property support for CCBReader.
 2013-01-21 23:03:53 -08:00
James Chen a3dbfaafd3 Merge pull request #1856 from funkaster/master 
fixed #1660: Some fixes to the js debugger.
 2013-01-21 17:54:39 -08:00
PickleMan c4d5bf8c85 Added test for rotation is dir in particle system 2013-01-21 12:35:59 -05:00
ivzave 737fc4ce9e do not overwrite existing resources in TestLua 2013-01-21 18:01:57 +04:00
James Chen c0d568da9b fixed #1639: Added custom property support for CCBReader. 2013-01-21 18:37:17 +08:00
moadib e39829269d Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml 2013-01-21 13:03:55 +04:00
James Chen 4a68e4ab89 fixed #1670: Fixed memory leak in CCBReader. 2013-01-21 14:40:29 +08:00
James Chen c60fe0cce5 Updated cocos2d-js-tests. 2013-01-18 21:59:46 +08:00
James Chen bc76cf09c4 Added filename lookup support for win32. 2013-01-18 21:54:48 +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
James Chen ce4f508025 Added Scale9Sprite js tests. 2013-01-18 12:00:43 +08:00
James Chen 47823b2497 Updated the submodule reference of cocos2d-js-tests. 2013-01-18 11:58:38 +08: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 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 9bbc130ea5 issue #1661: Adding CrystallCraze for iOS and Android. 2013-01-17 12:54:10 +08:00
Rolando Abarca 49432ef742 removes old header file reference 2013-01-16 13:42:41 -08:00
Rolando Abarca e94d8d1693 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	scripting/javascript/bindings/ScriptingCore.h
	scripting/javascript/bindings/js_bindings_config.h
 2013-01-15 16:52:47 -08:00
James Chen 26a91c8f75 Updated the submodule reference of cocos2d-js-tests. 2013-01-15 10:17:29 +08:00
James Chen 121519b7cd Merge pull request #1831 from dumganhar/iss1653-jsb-int 
fixed #1653: Handling correctly when parsing int value in JSB.
 2013-01-14 17:49:57 -08:00
Rolando Abarca 320068930e more debug stuff 2013-01-11 14:29:40 -08:00
Rolando Abarca 47c003ae54 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2013-01-11 14:01:42 -08:00
Rolando Abarca 5df4b4d997 adding debug support for js 2013-01-11 14:01:36 -08:00
johnangel a1155f52e6 Merge remote branch 'upstream/gles20' into gles20 2013-01-11 21:48:47 +01:00
James Chen 777a327945 Updated cocos2d-js-tests. 2013-01-11 21:27:04 +08:00
James Chen df05a1d7e9 Updated the submodule of cocos2d-js-tests. 2013-01-11 17:18:48 +08:00
Jozef Prídavok 9889b4f9fd Added the very first implementation of CCEditBox for Win32. 2013-01-10 23:59:21 +01:00
johnangel 16269d952d Detect VS2012 Update 1 2013-01-10 11:55:30 +01:00
Jozef Prídavok 229ad55dfa Fixed and refactored Mac Implementation. 2013-01-09 15:34:53 +01:00
James Chen b3be1e9e90 fixed #1646: GCC_OPTIMIZATION=1 for every jsb project setting of debug mode. This can avoid 'vm_protect' error when debugging jsb project on device. 2013-01-09 18:23:33 +08:00
James Chen 6d7f380f23 issue #1646: GCC_OPTIMIZATION_LEVEL=1. 2013-01-09 17:49:08 +08:00
James Chen 8a4f87277e issue #1646: Updated WatermelonWithme project setting for win32. 2013-01-09 15:35:19 +08: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 3fa771f0c4 fixed #1620: Using sqlite3 to implement sys.LocalStorage for iOS and android. 2013-01-07 17:22:06 +08:00
James Chen 1882ca30f5 issue #1620: Binding sqlite3 to sys.localStorage. And updated win32 project configuration. 2013-01-06 14:42:24 +08:00
James Chen 8fa2eb080b issue #1640: Updated Box2dTest and ChipmunkTest. 2013-01-06 10:22:07 +08:00
James Chen 0c28510513 issue #1640: Updated ChipmunkTest.cpp. 2013-01-06 10:13:59 +08:00
James Chen 4d919465a5 issue #1640: Updated the submodule reference of cocos2d-js-tests. 2013-01-05 18:54:49 +08:00
James Chen 8a21f4fa3c issue #1640: Added some files to iOS Project. 2013-01-05 17:41:19 +08:00
James Chen 421cf31b34 issue #1640: Updated jsbinding for CCPhysicsSprite . 2013-01-05 15:09:19 +08:00
James Chen 4d9d6c6c4c Updated the submodule reference of cocos2d-js-tests. 2013-01-05 14:05:13 +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
James Chen 7bcbcfa187 fixed #1636: Refactored CCEditBox for iOS, moved the implementation of EditBoxImplIOS.h/.cpp to CCEditBoxImplIOS.h/.cpp. 2013-01-05 10:56:57 +08:00
James Chen 3263d06830 Merge pull request #1814 from fape/marmalade_simplegame 
fixed #1631: Making SimpleGame force landscape for Marmalade.
 2013-01-03 19:07:41 -08:00
James Chen ec72701414 Merge pull request #1815 from fape/marmalade_testlua 
Marmalade TestLua postbuild script
 2013-01-03 18:53:47 -08:00