Commit Graph

10633 Commits

Author SHA1 Message Date
yangxiao 11f5e6cf96 setGLProgramState should not modify state block 2015-10-29 14:22:13 +08:00
yangxiao 16d9cf1af9 setStateBlock implement 2015-10-29 14:21:25 +08:00
yangxiao a4d67867d7 check light enable or not when switching shader 2015-10-20 15:11:39 +08:00
yangxiao 4c7edd457e set _hasPremultipliedAlpha to false 2015-10-13 15:45:24 +08:00
pandamicro b19bf82170 Merge pull request #14108 from loadrunner/label2
Changed label font size type to float
2015-10-13 11:55:14 +08:00
pandamicro 5e43cfa129 Merge pull request #14107 from loadrunner/label1
Removed scale factor for label shadow
2015-10-13 11:54:14 +08:00
pandamicro 5b35796093 Merge pull request #14091 from yangws/v3
Fix textfield input Chinese error with specific IME on Android.
2015-10-12 14:54:56 +08:00
mogemimi daa29752db Fix typo in UIEditBox 2015-10-12 13:57:50 +09:00
pandamicro 3dde02ba93 Merge pull request #14106 from loadrunner/tilemap
TMXLayer cast bug
2015-10-11 18:43:24 +08:00
Danut Chereches 019b549a20 changed font size type to float 2015-10-10 19:15:22 +03:00
Danut Chereches aeb268f3cd cast tile coordinates to int before calculating index 2015-10-10 19:05:51 +03:00
pandamicro f64105b3dc Merge pull request #14047 from liamcindy/v3.9
update for light3d reader
2015-10-10 11:43:05 +08:00
pandamicro 376180c1d6 Merge pull request #14093 from cpascal/fix_audioplayer
Fixed AudioPlayer crash in Win32
2015-10-10 11:32:46 +08:00
pandamicro c2571f950c Merge pull request #14003 from zilongshanren/fixWebViewCallback
fix ui::WebView callback operate OpenGL issue.
2015-10-10 11:32:02 +08:00
pandamicro 8b0a6a6c29 Merge pull request #14099 from pandamicro/v3
[ci skip]Sync with CCBoot for web
2015-10-10 10:16:16 +08:00
pandamicro 5ae2812bf8 Sync with CCBoot for web 2015-10-10 10:15:36 +08:00
pandamicro bf35655ce3 Merge pull request #14100 from CocosRobot/update_lua_bindings_1444440864
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-10 09:44:51 +08:00
pandamicro ee3399a4a4 Merge pull request #14097 from TheCodez/patch-1
Add missing getChildByTag<>() api
2015-10-10 09:43:46 +08:00
CocosRobot 216438fb9b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-10 01:40:55 +00:00
pandamicro db0d23ede4 Merge pull request #14087 from geron-cn/v3
fix code error, redundant interface
2015-10-10 09:39:35 +08:00
pandamicro 27fc6b24ee Merge pull request #14080 from 1scaR1/v3
Fixed enabling of scale9 background in ccui.Layout
2015-10-10 09:39:09 +08:00
pandamicro 7d4988f43f Merge pull request #14095 from mogemimi/fix-typo
Fix typos
2015-10-10 09:29:53 +08:00
Michael Kösel 493d95c3f6 Add missing getChildByTag<>() api 2015-10-10 00:08:38 +02:00
pandamicro bc9b59b7f7 Merge pull request #14096 from pandamicro/v3
[ci skip]Add opacity/color cascade test case for Scale9Sprite
2015-10-09 21:07:27 +08:00
pandamicro 0ea54868e2 Add opacity/color cascade test case for Scale9Sprite 2015-10-09 21:01:49 +08:00
mogemimi 5993304e06 Fix typos 2015-10-09 17:59:11 +09:00
cpascal 13c1258f9d Fixed AudioPlayer crash in Win32 2015-10-09 15:03:05 +09:00
Vincent Yang 90ef4be103 Fix textfield input chinese error with specific IME on Android. 2015-10-09 12:06:22 +08:00
子龙山人 cdf6fa8a54 Merge pull request #14052 from neokim/fix_listview_center_magnetic_issue
Fix an issue that list view's Magnetic::CENTER is not working well when non-bounceable.
2015-10-09 08:27:18 +08:00
pandamicro 4b66caaed8 Merge pull request #14084 from super626/v3
correct spot light init value
2015-10-08 17:15:03 +08:00
geron-cn 6b9890472b fix code error, redundant interface 2015-10-08 14:14:49 +08:00
pandamicro f730a38db6 Merge pull request #14086 from CocosRobot/update_lua_bindings_1444275958
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-08 11:51:04 +08:00
pandamicro 2d73bbd9d4 Merge pull request #14056 from Dimon4eg/fix-crash-if-csb-file-is-missing
fix crash if csb file is broken
2015-10-08 11:50:40 +08:00
CocosRobot 1919d1a679 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-08 03:50:33 +00:00
zilongshanren 7fd2ad7548 remove unneeded final temp string 2015-10-08 11:47:11 +08:00
pandamicro a68d07b968 Merge pull request #14075 from TheCodez/getname_byref
Node::getName() now returns string by reference
2015-10-08 11:43:03 +08:00
yangxiao d6eb1b938f correct spot light init value 2015-10-08 11:27:02 +08:00
pandamicro 5c816b5d9b Merge pull request #14063 from kammy/improve_spriteframecache
Inprove SpriteFrameCache::addSpriteFramesWithDictionary
2015-10-08 11:23:21 +08:00
pandamicro e32e8b95a4 Merge pull request #14055 from Dimon4eg/fix-crash-in-LoadingBar
fix crash in LoadingBar
2015-10-08 11:22:43 +08:00
pandamicro 2dbe0c1a90 Merge pull request #14016 from xiaofeng11/v3
Fix quickly click mouse in "41:Node:Physics -> 6:joints" in cpp-test may cause program crash
2015-10-08 11:12:36 +08:00
pandamicro c787e2c1b0 Merge pull request #14073 from mogemimi/fix-compiler-warning
Fix -Wformat-security warning on Xcode
2015-10-08 11:01:15 +08:00
pandamicro 255edd5b46 Merge pull request #14079 from ZeroHackeR/v3
Fixing SocketIO - Connect failed after Disconnected
2015-10-08 10:46:40 +08:00
pandamicro 6bafb2f6c2 Merge pull request #14082 from pandamicro/v3
Fix simulator android x86 release compilation issue
2015-10-08 10:43:35 +08:00
pandamicro 57ac40b9bc Fix simulator android x86 release compilation issue 2015-10-08 09:46:50 +08:00
Nikita 0042f9f5cd Fixed background size if scale9 enabled in Layout
Fixes for issue: cocos2d#14001
2015-10-06 16:14:47 +03:00
ZeroHackeR 4cfe139991 Fixing SocketIO - Connect failed after Disconnected
Fixes for issue: https://github.com/cocos2d/cocos2d-x/issues/14077
2015-10-06 13:21:22 +06:30
TheCodez eb747cf808 Node::getName() returns string by reference 2015-10-05 21:42:07 +02:00
mogemimi 8c04c01953 Fix -Wformat-security warning on Xcode 2015-10-05 19:53:03 +09:00
Dale Stammen 49e8abbc58 added #if _MSC_VER < 1900 2015-10-04 09:32:48 -07:00
pandamicro b38eec4d47 Merge pull request #13999 from igorzel/FixIntegerOverflowInIosDevice
Fix crash (integer overflow) in Device::getTextureDataForText (ios)
2015-10-04 11:00:07 +08:00