James Chen
|
ed4b9b2bb3
|
Marmalade projects fix.
|
2013-06-06 14:26:35 +08:00 |
James Chen
|
f22d320797
|
Removing CODE_SIGN_IDETITY section in prom.pbxproj.
|
2013-06-06 14:24:58 +08:00 |
James Chen
|
8c3b1899bb
|
Removing unreadable print in CCBReaderLoad.lua.
|
2013-06-06 14:23:30 +08:00 |
James Chen
|
93597a5858
|
[Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x.
|
2013-06-06 14:22:51 +08:00 |
James Chen
|
b462c9de82
|
Fixing a bug that display is wrong when setting setTexture(NULL) for CCSprite.
|
2013-06-06 14:22:09 +08:00 |
James Chen
|
0248c23b20
|
[Mamarlade] Fixing a compilation error in cocos2dx/platform/marmalade/CCImage.cpp.
|
2013-06-06 14:19:59 +08:00 |
James Chen
|
359225806b
|
Log error instead of triggering an assert for shadow and stroke.
|
2013-06-06 14:19:16 +08:00 |
James Chen
|
f056757a9f
|
Adding libwebsockets license in WebSocket.h/.cpp.
|
2013-06-06 14:16:57 +08:00 |
minggo
|
41f63169eb
|
Merge pull request #2783 from minggo/master
make CCDictionary::createWithContentsOfFile() return NULL when the file is missing
|
2013-06-05 21:52:42 -07:00 |
minggo
|
a8fe210c7e
|
fixed #2260: make CCDictionary::createWithContentsOfFile() return NULL when the file is missing
|
2013-06-06 12:50:42 +08:00 |
yinkaile
|
3cfba7bc9a
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
extensions/Android.mk
extensions/proj.win32/libExtensions.vcxproj.filters
samples/Cpp/TestCpp/Android.mk
samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
|
2013-06-06 12:35:18 +08:00 |
yinkaile
|
245b0395b1
|
1.upload CCArmature
|
2013-06-06 12:02:54 +08:00 |
zhangbin
|
26f971b202
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2013-06-06 11:22:30 +08:00 |
zhangbin
|
5b43951e8c
|
Update the flurry SDK version.
|
2013-06-06 11:21:45 +08:00 |
James Chen
|
a63f67afac
|
Merge pull request #2780 from dumganhar/master
[Android] Ignoring a warning of 'invalid-offsetof' in the library of spidermonkey. [master]
|
2013-06-05 19:22:02 -07:00 |
James Chen
|
ba295d416f
|
[Android] Ignoring a warning of 'invalid-offsetof' in the library of spidermonkey. [master]
|
2013-06-06 10:19:46 +08:00 |
minggo
|
271d1fa55a
|
Merge pull request #2772 from minggo/lua-win32
issue #2103:make HelloLua & TestLua work on vs2010
|
2013-06-05 03:15:09 -07:00 |
minggo
|
cdf09c04ea
|
issue #2103:make HelloLua & TestLua work on vs2010
|
2013-06-05 17:43:49 +08:00 |
James Chen
|
95db0c2352
|
Merge pull request #2771 from CocosRobot/updategeneratedsubmodule_1370421780
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-05 02:04:08 -07:00 |
CocosRobot
|
7e866d8060
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-05 08:43:03 +00:00 |
minggo
|
3713ff5b71
|
Merge pull request #2770 from samuele3hu/test_bind_cocosbuilder
add cocosbuilder lua test sample
|
2013-06-05 01:38:57 -07:00 |
samuele3hu
|
8e97c69b2f
|
issue #2103 add cocosbuilder lua test sample
|
2013-06-05 16:25:23 +08:00 |
minggo
|
a9788a7f9d
|
Merge pull request #2767 from chengstory/master_Components#2
1. change “bool isEnabled()” to "bool isEnabled() const".
|
2013-06-05 00:52:32 -07:00 |
samuele3hu
|
c2e2be1b1b
|
issue #2103 add cocosbuilder lua test sample
|
2013-06-05 15:51:29 +08:00 |
samuele3hu
|
75b26d9cdf
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder
|
2013-06-05 15:19:01 +08:00 |
samuele3hu
|
6dd077b8bd
|
issue #2103 add cocosbuilder lua test sample
|
2013-06-05 15:17:00 +08:00 |
chengstory
|
ca3dc682ea
|
1. change “bool isEnabled()” to "bool isEnabled() const".
2. dolete license.
|
2013-06-05 15:05:49 +08:00 |
James Chen
|
418354df76
|
Update cocos2dx_extension.ini
|
2013-06-05 14:53:53 +08:00 |
James Chen
|
daa37a9837
|
Merge pull request #2763 from dumganhar/jsb-delegate-crash-master
fixed #2143: cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash.
|
2013-06-04 23:47:00 -07:00 |
James Chen
|
d0c0d303f5
|
fixed #2143: cc.ScrollView(TableView, EditBox).setDelegate(tmp object) causes crash.
|
2013-06-05 14:31:07 +08:00 |
James Chen
|
57fee8dc98
|
issue #2143: Adding CCEditBox::getDelegate.
|
2013-06-05 14:30:14 +08:00 |
minggo
|
cc9823d1d9
|
Merge pull request #2762 from minggo/modify-ios-template
Modify ios template
|
2013-06-04 22:53:11 -07:00 |
minggo
|
d71e07db4e
|
fixed conflict
|
2013-06-05 13:48:31 +08:00 |
minggo
|
b0937a5a2d
|
issue #2257:change copyright of template
|
2013-06-05 11:25:39 +08:00 |
James Chen
|
b2c85ef360
|
Merge pull request #2761 from natural-law/master
Update the license in the sample code.
|
2013-06-04 20:21:55 -07:00 |
minggo
|
6491ff75cf
|
issue #2257: make ios template work
|
2013-06-05 11:21:04 +08:00 |
zhangbin
|
f26530748a
|
Update the license in the sample code.
|
2013-06-05 11:19:17 +08:00 |
James Chen
|
ecffa01475
|
Merge pull request #2759 from natural-law/master
Add plugin weibo for iOS [master]
|
2013-06-04 20:00:34 -07:00 |
zhangbin
|
4939ac1f14
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2013-06-05 10:25:56 +08:00 |
zhangbin
|
aa94056b5a
|
Update the JS binding code of plugin.
|
2013-06-05 10:25:19 +08:00 |
James Chen
|
555e8e324d
|
Merge pull request #2757 from dumganhar/ricardoquesada-configuration_set_value-master
Merge PR #2728 and minor fix.[master]
|
2013-06-04 19:17:51 -07:00 |
zhangbin
|
ae7ff06e95
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2013-06-05 09:52:35 +08:00 |
James Chen
|
26219d4a14
|
Minor fix in CCConfiguration.
|
2013-06-05 09:41:03 +08:00 |
James Chen
|
2a16a6b17f
|
Merge branch 'configuration_set_value' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-configuration_set_value
|
2013-06-05 09:36:53 +08:00 |
James Chen
|
8a858f83d2
|
Merge pull request #2753 from dumganhar/master
[iOS] Fixing compilation errors for HelloLua.
|
2013-06-04 06:15:56 -07:00 |
david feng
|
9d9bc1f593
|
fix a library search path error
|
2013-06-04 21:13:08 +08:00 |
James Chen
|
ddbdb3e983
|
[iOS] Fixing compilation errors for HelloLua.
|
2013-06-04 21:11:44 +08:00 |
James Chen
|
ce20c48b78
|
Merge pull request #2751 from dumganhar/template-fix-master
Updating multi-platform-xxx template for iOS and Mac.
|
2013-06-04 05:12:54 -07:00 |
James Chen
|
3b673547cc
|
Updating multi-platform-xxx template for iOS and Mac.
|
2013-06-04 19:49:03 +08:00 |
James Chen
|
ce2421779d
|
Merge pull request #2750 from CocosRobot/updategeneratedsubmodule_1370342158
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-04 04:23:32 -07:00 |