Commit Graph

21906 Commits

Author SHA1 Message Date
minggo aff1e3e1d2 fix compiling error 2014-07-01 22:26:15 +08:00
minggo 9e978d576a update release note 2014-07-01 22:16:43 +08:00
minggo ca7e95b342 Merge pull request #7274 from Dhilan007/v3-320beta
fixed crash cause by addChild on win 7.
2014-07-01 22:15:26 +08:00
minggo a5452a29aa Merge pull request #7275 from andyque/fixBinaryLoaderSize
fix content Size
2014-07-01 22:03:14 +08:00
andyque 7d2685ba02 fix content Size 2014-07-01 21:02:37 +08:00
Dhilan007 6294a3024f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gcsplitadapter 2014-07-01 19:10:15 +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
minggo bf60cc5f83 Merge pull request #7273 from CocosRobot/update_cocosfiles_1404209039
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-01 18:36:40 +08:00
Dhilan007 6ba111cbff fixed crash cause by addChild on win 7. 2014-07-01 18:23:20 +08:00
CocosRobot 32c88f6189 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-01 10:04:00 +00:00
minggo 206eea60f5 Merge pull request #7272 from Dhilan007/v3-gc0627
Add missing file for game controller support
2014-07-01 18:02:24 +08:00
Dhilan007 318962c40a update test case. 2014-07-01 16:46:11 +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
samuele3hu d6778225e1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-01 16:33:55 +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 d6c516b62d [ci skip] 2014-07-01 16:20:55 +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 0ea293b1f4 Merge pull request #7268 from CocosRobot/update_cocosfiles_1404201154
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-01 15:53:07 +08:00
minggo 39650e12c4 Merge pull request #7266 from dabingnn/v3_fix
V3 fix
2014-07-01 15:52:50 +08:00
CocosRobot 5ab6d5557b [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-01 07:52:35 +00: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
pandamicro 81df54b82e Fixed #5635: Correction of mouse event's cursor position 2014-07-01 15:14:41 +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
Huabing.Xu e1d97ecb59 Merge branch 'v3' into v3_fix 2014-07-01 14:54:28 +08:00
Huabing.Xu 75c7777999 fix Effect3dSprite memory leak 2014-07-01 14:48:46 +08:00
Dhilan007 584e90c097 Rotate the frame buffer for WP8 during the snapshot 2014-07-01 14:48:43 +08:00
田矢 慎太朗 39040540fc Remove redundant comment in ccConfig.h 2014-07-01 15:12:29 +09:00
andyque fefdc70af9 add default value to widget reader 2014-07-01 14:01:27 +08:00
samuele3hu 50ebede377 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-01 13:50:16 +08:00
samuele3hu 68aa0831eb Update the bindings-generaotr submodule 2014-07-01 13:49:14 +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
XiaoYang 5666033faf Merge pull request #47 from lvlonggame/v3
modify bundle3d version and bundleReader
2014-07-01 13:16:14 +08:00
pandamicro abfbc4bffb Fixed #5632: Indicate the correct button in mouse move event 2014-07-01 13:01:04 +08:00
lvlong ff908d771a add a space to test pushing 2014-07-01 11:26:29 +08:00
lvlong e44dee6607 merge 2014-07-01 11:08:37 +08:00
lvlong e3cc234cfb Revert "modify BundleReader and the version read"
This reverts commit 660c80fac7.
2014-07-01 11:05:48 +08:00
andyque b9a968680f add default value to widgets reader 2014-07-01 10:57:12 +08:00
lvlong 660c80fac7 modify BundleReader and the version read 2014-07-01 10:45:01 +08:00
andyque 4e63a3da7d modify nodeReader to support LabelAtlas and LabelBMFont 2014-07-01 10:11:36 +08:00
minggo eb6ddea26e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix-crash 2014-07-01 10:01:24 +08:00
samuele3hu 1bc0397644 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 2014-07-01 09:47:41 +08:00
lvlong c1afd7133a modify BundleReader and the version read 2014-07-01 09:30:14 +08:00