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
|
57f32c7bfc
|
issue #1770: Adding test_image.webp.
|
2013-02-05 11:36:32 +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
|
3953434678
|
Merge pull request #1956 from minggo/iss1689-add-CCLuaObjcBridge
Iss1689 add cc lua objc bridge
|
2013-02-04 00:20:18 -08:00 |
minggo
|
8c1a639c59
|
Merge branch 'iss1689-add-CCLuaObjcBridge' of https://github.com/minggo/cocos2d-x into iss1689-add-CCLuaObjcBridge
|
2013-02-04 16:19:21 +08:00 |
minggo
|
8511e75745
|
fixed #1689:fixed a compiling error
|
2013-02-04 16:17:59 +08:00 |
minggo
|
1ea0570620
|
Merge pull request #1955 from minggo/iss1689-add-CCLuaObjcBridge
modify lua samples to make them work correctly
|
2013-02-03 23:12:10 -08:00 |
minggo
|
5163ef0d07
|
Merge pull request #5 from dumganhar/iss1689-add-CCLuaObjcBridge
issue #1689: Adding some missing files for win32.
|
2013-02-03 23:04:52 -08:00 |
James Chen
|
4506214cef
|
issue #1689: Adding some missing files.
|
2013-02-04 15:01:44 +08:00 |
minggo
|
07cd6d2bb2
|
issue #1689:modify lua samples to make them work correctly
|
2013-02-04 14:50:45 +08:00 |
dualface
|
5904512ac6
|
add CCFileUtils Lua support
|
2013-02-04 12:41:24 +08:00 |
minggo
|
a771bc8183
|
issue #1689:modify lua Android.mk
|
2013-02-04 12:02:21 +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 |
dualface
|
74e497bb2b
|
restore CCLuaEngine missed methods
|
2013-02-04 11:28:09 +08:00 |
James Chen
|
b5bd48eaee
|
Merge pull request #1948 from dumganhar/master
Using new api of CCFileUtils for SimpleGame.
|
2013-02-02 23:40:29 -08:00 |
James Chen
|
a22986bc82
|
Using new api of CCFileUtils for SimpleGame.
|
2013-02-03 15:38:44 +08:00 |
James Chen
|
46902ee399
|
Merge pull request #1947 from CocosRobot/updategeneratedsubmodule_1359874540
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2013-02-02 23:00:06 -08:00 |
CocosRobot
|
d3086850c7
|
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2013-02-03 14:55:53 +08:00 |
James Chen
|
fe4d3adfdd
|
Merge pull request #1946 from dumganhar/master
issue #1687: Updating iOS template after refactoring CCFileUtils.
|
2013-02-02 21:59:09 -08:00 |
James Chen
|
23acb3eacd
|
issue #1687: Updating iOS template after refactoring CCFileUtils.
|
2013-02-03 13:56:44 +08:00 |
minggo
|
64a107d2f6
|
Update AUTHORS
|
2013-02-03 11:19:35 +08:00 |
minggo
|
7f594f00b8
|
Merge pull request #1930 from NatWeiss/tmxpolygons
Added TMX polygon parsing.
|
2013-02-02 19:17:44 -08:00 |
minggo
|
ae3c771865
|
Merge pull request #1941 from dumganhar/iss1687-refactor
issue #1687: Refactoring CCFileUtils, abstracting the same implementations for all platforms.
|
2013-02-02 19:11:31 -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
|
84e18cc06e
|
merge upstream
|
2013-02-02 12:24:19 +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
|
c362f7e439
|
issue #1687: Adding new test - Checking whether file exists.
|
2013-02-01 22:18:43 +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
|
15002030c2
|
Update AUTHORS
|
2013-02-01 16:11:58 +08:00 |
James Chen
|
e345a098ee
|
Merge pull request #1939 from xyhl515/master
fixed #1691: CCControlSwitch::setOn(isOn,false) doesn't work.
|
2013-02-01 00:08:02 -08:00 |
James Chen
|
a110778739
|
issue #1687: Updating comments for CCFileUtils.
|
2013-02-01 15:41:41 +08:00 |