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
dualface
37a0f19c46
remove RGB565 support
2013-01-04 23:34:24 +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
James Chen
f6b57a9b92
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-04 10:16:18 +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
437ed36bd6
Updated the project configuration for HelloCpp and HelloLua.
2013-01-04 09:51:08 +08:00
fape
94471a06b6
rename and add commandline argument to cccopy.py
2013-01-03 20:52:22 +01:00
fape
e34f190f36
add SimpleGame Marmalade config files
2013-01-03 15:20:58 +01:00
fape
f3f67f62e1
.gitignores moved
2013-01-03 15:16:11 +01:00
fape
3c89bf1d83
marmalade TestLua: add postbuild script to copy resources
2013-01-03 14:47:57 +01:00
James Chen
90960cce57
Merge pull request #1813 from dumganhar/gles20
...
Fixed a compilation error for android.
2013-01-03 04:00:54 -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
James Chen
94e779ae63
Merge pull request #1806 from fape/marmalade_third_party_cleanup
...
fixed #1629 : Marmalade third party cleanup.
2013-01-02 21:24:44 -08:00
Dale Ducharme
611db78b39
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-02 18:53:31 -05:00
James Chen
57906b368e
Merge pull request #1808 from wanbin/gles20
...
fixed #1603 : The script of creating android project has a wrong file path.
2012-12-31 21:36:09 -08:00
wanbin
986f332b29
create android project has a error file path
2013-01-01 13:18:10 +08: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