Commit Graph

6806 Commits

Author SHA1 Message Date
walzer 42f6839b15 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2013-01-09 17:50:09 +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
James Chen c9c8ee66b9 issue #1646: Using GNU libstdc++ to build spiderMonkey on Android. 2013-01-09 14:45:36 +08:00
James Chen ad9138685e issue #1646: Updated spiderMonkey to FF18.0. 2013-01-09 13:42:21 +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
Jozef Prídavok 025c50e6cf Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2013-01-08 13:28:40 +01:00
johnangel 0d476604e0 Detect VS2012 Update 1 2013-01-08 10:58:38 +01:00
James Chen ff035e9050 Merge pull request #1825 from dumganhar/iss-1645-jstemplate-ios
fixed #1645: JS Project created by xcode template doesn't work correctly.
2013-01-07 23:19:11 -08:00
James Chen a4ea453ade fixed #1645: Excluded proj.win32. 2013-01-08 15:15:44 +08:00
James Chen 831c414c63 fixed #1645: JS Project created by xcode template doesn't work correctly. 2013-01-08 15:04:59 +08:00
James Chen f0f78d72e4 issue #1645: Updated js template for iOS project. 2013-01-08 10:40:49 +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 774e9dcc23 Merge pull request #1823 from dumganhar/iss1620-sys-localstorage
fixed #1620: Using sqlite3 to implement sys.LocalStorage.
2013-01-07 02:30:26 -08: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 43b95f2a9a fixed #1620: Check return value. 2013-01-07 17:38:52 +08:00
James Chen 1d59a36ee9 fixed #1620: Invoking localStorageFree in the destructor of ScriptingCore. Added header file to cocos-ext.h 2013-01-07 17:34:22 +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 a44cc70db3 Merge pull request #1822 from dumganhar/gles20
fixed #1642: Adding tools for generating jsbinding codes on windows.
2013-01-06 02:32:24 -08:00
James Chen bf0cc23336 Update tools/tojs/README.mdown 2013-01-06 18:31:35 +08:00
James Chen b712a9349a fixed #1642: Updated tools/tojs/README.mdown. 2013-01-06 18:24:02 +08:00
James Chen b5b1df6a07 Added tools/tojs/README.mdown. 2013-01-06 18:10:43 +08:00
James Chen be1be2771b fixed #1642: Adding tools for generating jsbinding codes on windows. 2013-01-06 18:01:44 +08:00
minggo ba896f7588 Merge pull request #1821 from minggo/iss1639_CCBReader
issue #1639:set visible to correct value
2013-01-05 23:05:02 -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 3822ceee8c issue #1620: Renamed LocalStorage.c to LocalStorage.cpp 2013-01-06 14:40:54 +08:00
James Chen dc1490c8ae issue #1620: Added LocalStorage support to extensions. 2013-01-06 11:57:10 +08:00
James Chen 697818b628 issue #1620: Added sqlite3 library for win32. 2013-01-06 11:56:39 +08:00
James Chen bfb8c1f048 Merge pull request #1820 from dumganhar/iss1640-jsb-update
fixed #1640: Added sys.capabilities support and fixed a bug in CCAnimationCache.
2013-01-05 18:47:00 -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 266e6e8acc fixed #1641: The coins in Watermelon Me fail to animate in cocos2d-x JS binding. 2013-01-05 18:54:08 +08:00
minggo 7a1f445bff issue #1639:set visible to correct value 2013-01-05 18:35:11 +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 4bd15af2a2 issue #1640: Updated js files for jsbindings 2013-01-05 13:58:56 +08:00
walzer f291ffedad Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2013-01-05 11:18:55 +08:00
James Chen 77eac0eb5f Merge pull request #1819 from dumganhar/gles20
fixed #1636: Refactored CCEditBox for iOS, moved the implementation of EditBoxImplIOS.h/.cpp to CCEditBoxImplIOS.h/.cpp.
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.
2013-01-04 19:13:28 -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
Jozef Prídavok 2635843c11 Added EditBox implementation for Mac OSX. 2013-01-04 13:16:03 +01:00
minggo ffd0ca6c0e Merge pull request #1804 from dualface/fix_ccassert_lua_compatibility
[luabinding] fix CCAssert Lua compatibility
2013-01-03 23:51:47 -08:00
minggo 4bcc352379 Update AUTHORS 2013-01-04 11:33:38 +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 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
James Chen 00bab65350 Merge pull request #1816 from dumganhar/iss-bb-rm-skia
Merged PR #1810
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-03 18:18:25 -08:00