Commit Graph

6001 Commits

Author SHA1 Message Date
yangxiao 8c77130ae0 refactor light compile 2014-09-17 18:58:35 +08:00
yangxiao 41caef878b refactor light 2014-09-17 17:59:10 +08:00
yangxiao 584284c847 merge cocos and rename lighttest 2014-09-17 14:26:57 +08:00
minggo 6a7cfc812a Merge pull request #8083 from CocosRobot/update_lua_bindings_1410924831
[AUTO]: updating luabinding automatically
2014-09-17 11:42:44 +08:00
CocosRobot 9b5d47c61e [AUTO]: updating luabinding automatically 2014-09-17 03:35:46 +00:00
minggo 38810eeb2e Merge pull request #8082 from dabingnn/v3_fixFastTMXIntIndices
change indices to short for fast tmx
2014-09-17 11:31:58 +08:00
minggo 32ed437e6d Merge pull request #8081 from andyque/addInterfaceToUI
add getTitleRenderer interface to UIButton
2014-09-17 11:31:16 +08:00
Huabing.Xu 725d107ae5 change indices to short for fast tmx 2014-09-17 11:06:15 +08:00
minggo 38259bd311 Merge pull request #8075 from dabingnn/v3_FixVertsAndDrawCallsForPrimitiveCommand
add draw calls and draw verts for PrimitiveCommand
2014-09-17 11:04:43 +08:00
andyque 6badfb30e1 add getTitleRenderer interface to UIButton 2014-09-17 10:57:40 +08:00
Huabing.Xu 34e3e23af5 Fix compile error 2014-09-17 10:35:42 +08:00
minggo 77371a025d Merge pull request #8062 from zhongfq/v3
optimize decompress jpg data
2014-09-17 10:22:57 +08:00
Eric Zhong ae5f6e63e5 optimize decompress jpg data and fix warnings 2014-09-16 21:55:05 +08:00
CocosRobot b37659a448 [AUTO]: updating luabinding automatically 2014-09-16 09:16:17 +00:00
minggo da29b92ff4 Merge pull request #8072 from Dhilan007/v3-audio903
move AudioEngine to cocos2d:experimental namespace
2014-09-16 17:12:03 +08:00
Dhilan007 369c14ed49 fix compile error 2014-09-16 14:57:58 +08:00
huangshiwu 3907e5c1a2 fix ClippingNode's memory leak bug 2014-09-16 14:50:00 +08:00
Huabing.Xu f702b4e9b3 add draw calls and draw verts for PrimitiveCommand 2014-09-16 12:04:35 +08:00
Dhilan007 9942206c53 move AudioEngine in cocos2d:experimental namespace 2014-09-16 10:22:25 +08:00
minggo afd1271078 Merge pull request #8071 from huangshiwu/v3_wp8test
fix wp8 and winrt compile error --add chipmunk static lib
2014-09-16 10:07:50 +08:00
huangshiwu d0d3e185ce fix wp8 and winrt compile error --add chipmunk static lib 2014-09-16 10:03:00 +08:00
CocosRobot 526c28bea9 [AUTO]: updating luabinding automatically 2014-09-15 15:21:18 +00:00
Eric Zhong 8de3657f3c optimize decompress jpg data
it may be unnecessary copy jpg bytes one by one when decompress jpg data
2014-09-15 23:15:01 +08:00
minggo 9a29ab2113 Merge pull request #8058 from andyque/fixWebView
improve webview coding style
2014-09-15 22:49:53 +08:00
andyque af3dd215cb improve android web view 2014-09-15 18:14:04 +08:00
andyque 5f95ad221e improve iOS WebView 2014-09-15 18:02:11 +08:00
andyque 126ec18a89 add video player debug draw config 2014-09-15 17:59:51 +08:00
Dhilan007 39a8b8d5ea Fix a potential crash in AudioEngine on Android. 2014-09-15 17:36:00 +08:00
andyque 71b6be678e fix header guard 2014-09-15 16:56:51 +08:00
minggo 68ab3082b4 fix warnings 2014-09-15 16:23:57 +08:00
mailgyc 9e8b32b3c4 fix: ParticleSystem "set not pop-up message box when load image failed" doesn't work
isPopupNotify() doesn't work
2014-09-15 14:06:04 +08:00
minggo 7bb391ce55 Merge pull request #8033 from Dhilan007/v3-audio903
Lua bindings of AudioEngine.
2014-09-15 13:43:27 +08:00
andyque 030fe34afa fix UI related warnings 2014-09-15 11:13:56 +08:00
minggo cc221e5e16 Merge pull request #8036 from CocosRobot/update_lua_bindings_1410745737
[AUTO]: updating luabinding automatically
2014-09-15 09:56:20 +08:00
CocosRobot 8c7eb81271 [AUTO]: updating luabinding automatically 2014-09-15 01:50:32 +00:00
minggo df78ec90f1 Merge pull request #8032 from joewan/v3-fix-leak
fix memory leak when use menu_selector.
2014-09-15 09:50:05 +08:00
minggo 70f922d07a Merge pull request #8030 from andyque/fixButtonScaleIssue
fix button scale issue
2014-09-15 09:49:06 +08:00
minggo 6bcab3b05d Merge pull request #7920 from rny/audio_win32
win32 can not stop looping sound effect
2014-09-15 09:37:11 +08:00
minggo 788f3c5c38 Merge pull request #8025 from andyque/fixEditBoxLuaBinding
fix Editbox lua binding
2014-09-15 09:36:36 +08:00
minggo 8b1e928741 Merge pull request #8026 from super626/v3
Transparent Mesh support
2014-09-15 09:36:17 +08:00
andyque 7b0f41ed7b remove auto scale text 2014-09-15 09:28:56 +08:00
Dhilan007 51c19d4b06 update project for lua bindings of AudioEngine 2014-09-14 23:17:39 +08:00
Dhilan007 cf2a60898f Lua bindings of AudioEngine. 2014-09-14 22:54:04 +08:00
Dhilan007 f6992b94de fix crash in AudioEngine 2014-09-14 22:48:41 +08:00
joewan 93fdcf1f04 fix memory leak when use menu_selector. 2014-09-14 21:41:19 +08:00
Keisuke Kobayashi c4d2c5eaed Rename setSSLVerification 2014-09-14 00:28:11 +09:00
andyque 880929f102 fix button scale issue 2014-09-13 22:08:02 +08:00
Keisuke Kobayashi 6b0879fe93 HttpClient SSL verification 2014-09-13 20:37:36 +09:00
yangxiao 2e0e4e58c8 support transparent object 2014-09-12 17:57:54 +08:00
minggo 0f42d9bbd8 Merge pull request #8022 from Dhilan007/v3-labelfix
Label:It may display incorrectly with outline feature enabled.
2014-09-12 17:54:02 +08:00