James Chen
4f13ac2ea6
Update AUTHORS [ci skip]
2013-06-07 10:55:56 +08:00
folecr
4a9504717b
Fix flags for debugger server socket
...
* Works on iOS and Android
2013-06-07 10:55:44 +08:00
yinkaile
65974f2243
standardize code
2013-06-07 10:52:32 +08:00
samuele3hu
5986d3904d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
2013-06-07 10:14:12 +08:00
samuele3hu
66d4acc31a
issue #2103 add webSocket lua test sample
2013-06-07 10:12:01 +08:00
James Chen
6784533212
Merge pull request #2798 from CocosRobot/updategeneratedsubmodule_1370569307
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-06 19:00:26 -07:00
CocosRobot
919d24d5b2
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-07 01:41:52 +00:00
minggo
16b4400c7b
Merge pull request #2794 from ricardoquesada/missing_config_files
...
Missing config files
2013-06-06 18:36:42 -07:00
Ricardo Quesada
428711482e
Adds missing config files for CCConfiguration
...
...and add functionality on the Director to override the default values
from the config file.
Supported values:
- cocos2d.x.fps
- cocos2d.x.display_fps
- cocos2d.x.gl.projection
- cocos2d.x.texture.pixel_format_for_png
- cocos2d.x.texture.pvrv2_has_alpha_premultiplied
If the "config.plist" file is not present, or some keys are not present,
the default values are going to be used
IMPORTANT:
The folder "samples/Cpp/TestCpp/Resources/configs" needs to be added
in the Android, Linux, Win32 projects.
Already added in OS X and iOS Xcode projects.
2013-06-06 12:23:44 -07:00
minggo
1e9397d490
Merge pull request #2793 from minggo/master
...
copy CCBReaderLoad.lua to TestLua Resources
2013-06-06 08:07:41 -07:00
minggo
4fa069df58
issue #2103:copy CCBReaderLoad.lua to TestLua Resources
2013-06-06 23:04:26 +08:00
samuele3hu
e4ec801363
issue #2103 add webSocket lua test sample
2013-06-06 22:29:02 +08:00
James Chen
665375862a
Merge pull request #2790 from dumganhar/master
...
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
2013-06-06 03:08:45 -07:00
James Chen
6f52d72b82
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
2013-06-06 18:07:11 +08:00
yinkaile
10ed7ebdf4
merge newest version
2013-06-06 16:22:58 +08:00
James Chen
3f6e64a69e
Merge pull request #2786 from dumganhar/master
...
Updating JS-Test.
2013-06-06 00:48:18 -07:00
James Chen
03549e6a59
Updating JS-Test.
2013-06-06 15:47:07 +08:00
James Chen
fa1e6e35b9
Merge pull request #2781 from natural-law/master
...
Update the flurry SDK version.
2013-06-06 00:09:54 -07:00
James Chen
ab3f42bb5f
Merge pull request #2784 from dumganhar/some-fixes-marmalade-master
...
[master] Some fixes:
Adding libwebsockets license in WebSocket.h/.cpp.
Log error instead of triggering an assert for shadow and stroke.
[Mamarlade] Fixing a compilation error in cocos2dx/platform/marmalade
Fixing a bug that display is wrong when setting setTexture(NULL) for CCSprite
[Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x.
Removing unreadable print in CCBReaderLoad.lua.
Removing CODE_SIGN_IDETITY section in prom.pbxproj.
Marmalade projects fix.
2013-06-05 23:47:01 -07:00
James Chen
3b9f669b51
Minor fix for CCSprite::draw(), checking whether texture is valid, if it's invalid, don't set the attribute for it.
2013-06-06 14:41:22 +08:00
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