Commit Graph

4622 Commits

Author SHA1 Message Date
chuanweizhang2013 e32eadc364 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-04 13:36:51 +08:00
minggo 95fe74a34b Merge pull request #7299 from dabingnn/fast_tmx
Fast tmx
2014-07-04 09:49:30 +08:00
minggo eb97b9ad45 Merge pull request #7305 from andyque/fixLayoutReader
fix layout background image default color & opacity
2014-07-03 17:16:56 +08:00
andyque f82e96daf0 fix layout background image default color & opacity 2014-07-03 16:56:05 +08:00
minggo 0be6d27271 Merge pull request #7295 from minggo/support-regular-expression
Support regular expression
2014-07-03 15:20:06 +08:00
andyque 32724e559d fix container default color issue 2014-07-03 14:38:45 +08:00
minggo fffdfb3711 Merge pull request #7290 from chengstory/v3_OpBinaryParse
V3 op binary parse
2014-07-03 14:00:01 +08:00
minggo 2cfea323b0 Merge pull request #7300 from 2youyouo2/v3
fixed add relative data bug
2014-07-03 13:56:04 +08:00
minggo 6cc600ccce fix compiling warnings 2014-07-03 11:43:56 +08:00
chuanweizhang2013 b88b5e4c3d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-03 11:13:59 +08:00
Huabing.Xu 0214131bb2 optimise tile map rendering 2014-07-02 17:16:03 +08:00
minggo d8c9f6a0a6 add regular support in Node::enumerateChildren() 2014-07-02 17:07:36 +08:00
minggo 1a089f4a18 Merge pull request #7286 from Dhilan007/v3-gc0702
fixed can't get valid value from trigger button.
2014-07-02 16:24:24 +08:00
minggo 666b0e3a2e Merge pull request #7289 from boyu0/lua_xcode6_support
add lua Xcode6 iphone 5s simulator support.
2014-07-02 16:17:33 +08:00
zhangcheng d1db470cf2 Merge branch 'macLoader' into v3_OpBinaryParse 2014-07-02 16:11:02 +08:00
zhangcheng 2b1ef55ea9 1. fixes scene parse crash. 2014-07-02 15:58:42 +08:00
zhangcheng 9204ac28df 1. merge v3 2014-07-02 15:37:15 +08:00
Huabing.Xu efa452e0c4 support for fast tmx hex 2014-07-02 15:19:11 +08:00
Dhilan007 097f782c38 remove ControllerAutoAdapter project. 2014-07-02 15:17:29 +08:00
boyu0 35ff23fa6d support for Xcode6 iphone 5s simulator 2014-07-02 15:16:06 +08:00
Dhilan007 adfc010555 fixed can't get valid value from trigger button[Moga] 2014-07-02 15:09:24 +08:00
Dhilan007 c5dc7b9cd0 fixed can't get valid value from trigger button. 2014-07-02 14:19:10 +08:00
minggo f49e230e97 Merge pull request #7284 from chengstory/v3_fixesWarning
1. fixes same name warning.
2014-07-02 13:40:07 +08:00
andyque 6e64714331 fix scroll 2014-07-02 11:48:28 +08:00
zhangcheng cf9b049926 1. fixes same name warning. 2014-07-02 10:53:35 +08:00
CocosRobot 2821a23640 [AUTO]: updating luabinding automatically 2014-07-02 02:15:26 +00:00
minggo 5b282e338f Merge pull request #7279 from andyque/fixTextReader
fix Text reader font name
2014-07-02 10:04:00 +08:00
andyque fb3e499d9d fix Text reader font name 2014-07-02 10:08:04 +08:00
minggo d9a1f76755 fix effect of spine 2014-07-02 09:58:07 +08:00
minggo aff1e3e1d2 fix compiling error 2014-07-01 22:26:15 +08:00
andyque 7d2685ba02 fix content Size 2014-07-01 21:02:37 +08:00
geron-cn 17c320f1e2 fix 2014-07-01 19:06:51 +08:00
geron-cn c561f4e2f4 fix win can not compile 2014-07-01 18:55:09 +08:00
Dhilan007 0fbcbec9de Add missing file for game controller support.
Fix using incorrect library project.
2014-07-01 16:44:10 +08:00
zhangcheng 02c7c93e43 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse 2014-07-01 16:36:37 +08:00
zhangcheng 4b8f818a1d 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
minggo 05ca61d62b Merge pull request #7269 from minggo/fix-crash
Fix crash
2014-07-01 16:30:50 +08:00
geron-cn dfdc4f6b66 fix bug: did not addarmature to the relativedata 2014-07-01 16:24:59 +08:00
minggo 6654bf1129 Merge pull request #7265 from visiblelight/beta_test
Fix the crash when capturing screen on WP8
2014-07-01 16:19:45 +08:00
minggo cc3a9d0737 fix crash caused by std::regex() 2014-07-01 16:09:25 +08:00
minggo e15d563219 Merge pull request #7247 from andyque/fixFocus
fix focus functions
2014-07-01 16:02:23 +08:00
minggo d130bf84e5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix-crash 2014-07-01 15:59:43 +08:00
minggo daa5e257df Merge pull request #7259 from Dhilan007/v3-gc0627
issue #4895:split controller adapter[android]
2014-07-01 15:51:21 +08:00
Dhilan007 66673d88fa split controller adapter[android] 2014-07-01 15:08:51 +08:00
Dhilan007 abeeb9a0c7 fixing incorrect optimization 2014-07-01 14:57:10 +08:00
Dhilan007 584e90c097 Rotate the frame buffer for WP8 during the snapshot 2014-07-01 14:48:43 +08:00
andyque fefdc70af9 add default value to widget reader 2014-07-01 14:01:27 +08:00
minggo 80204e3048 Merge pull request #7201 from chengstory/cleanupBinaryLoader_AddSceneBinaryParse
Cleanup binary loader add scene binary parse
2014-07-01 13:47:35 +08:00
andyque b9a968680f add default value to widgets reader 2014-07-01 10:57:12 +08:00
andyque 4e63a3da7d modify nodeReader to support LabelAtlas and LabelBMFont 2014-07-01 10:11:36 +08:00