Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,203 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

10291 Commits

Author SHA1 Message Date
Dale Stammen 8493365be7 updates to pass Windows App Certification tests 2015-08-18 11:06:47 -07:00
子龙山人 593eb0737f Merge pull request #13440 from WenhaiLin/v3.8-rc0 
Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.
 2015-08-18 17:06:37 +08:00
WenhaiLin 6bf15885b8 Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters. 2015-08-18 15:42:05 +08:00
fusijie 223d5a7a5c fix copy construct & assignment operator memory leakage. 2015-08-18 14:48:16 +08:00
fusijie a799c99b1a fix setVertexAttribPointer luabinding 2015-08-18 11:46:45 +08:00
pandamicro d2bc03f80f Merge pull request #13424 from WenhaiLin/v3.8-rc0 
Label:Fixed display not as expected(Redmine issue:22133).
 2015-08-18 10:00:36 +08:00
Dale Stammen ee7b9377de removed old wp8 code that breaks Win10 WACK tests 2015-08-17 18:40:07 -07:00
Vladimir Perminov 24d06bb1c9 More use StringUtf8ToWideChar and PlatformStringFromString 2015-08-17 23:04:05 +03:00
CocosRobot 24a63e12ec [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-17 15:08:00 +00:00
pandamicro 81d5a8377f Merge pull request #13418 from jianglong0156/fixTMXTileFlagsError 
Remove duplicate function definition, Add function adaptation
 2015-08-17 22:56:59 +08:00
WenhaiLin 990a25f759 Label:Fixed display not as expected(Redmine issue:22133). 2015-08-17 22:46:19 +08:00
肖峰 0473b08dbb Fix gamenode3d parse failed error 
- Fix the parser issue
- Add GameNode3DReader to win8 universal project
- Add GameNode3d reader to Android & Linux project

Squashed from https://github.com/cocos2d/cocos2d-x/pull/13369
 2015-08-17 22:42:21 +08:00
pandamicro be165ef900 Permit webp image loading 2015-08-17 18:55:53 +08:00
jianglong0156 b19e02bdf6 Remove duplicate function definition, Add function adaptation 2015-08-17 18:18:38 +08:00
pandamicro f2edb1c8f9 Merge pull request #13410 from ZhangMenghe/v3-retinaEffect 
[ci skip] Fix invisiable testcase of effects
 2015-08-17 17:51:04 +08:00
pandamicro e380b0cffa Merge pull request #13415 from VisualSJ/v3-13359 
[ci skip] Update JS parser
 2015-08-17 17:29:12 +08:00
ZhangMenghe eaa5643c7c Fix invisiable testcase of effects 2015-08-17 17:26:25 +08:00
VisualSj c52a81a2c2 Update JS parser 2015-08-17 17:25:17 +08:00
pandamicro f1cbd00b30 Merge pull request #13414 from liamcindy/V3.8_reader 
fix code informal
 2015-08-17 17:21:01 +08:00
Liam b40ef51337 fix code informal 2015-08-17 17:16:26 +08:00
pandamicro d0580f09e8 Merge pull request #13383 from geron-cn/3.7.1 
add blendfunc cascade to its skin in BoneNode
 2015-08-17 17:12:04 +08:00
pandamicro 096410a31a Merge pull request #13406 from xiaofeng11/v3_reader_update 
Add BlendFrame supporting to Skeleton Animation
 2015-08-17 17:09:25 +08:00
pandamicro 66d99d392c Merge pull request #13409 from liamcindy/V3.8_reader 
fix userCamera flag error with old version files
 2015-08-17 17:01:59 +08:00
pandamicro 9db78b2bb7 Merge pull request #13407 from liamcindy/v3.8 
fix the skybox display error from editor files
 2015-08-17 16:57:32 +08:00
XiaoFeng 442669d6f1 Remove unused easing data processing in blend frame parsing 2015-08-17 16:19:29 +08:00
Liam e3ac9414f4 fix userCamera flag error with olg version files 2015-08-17 14:37:28 +08:00
geron-cn 008b06c01c set blendfunc cascade to its skin in BoneNode 2015-08-17 13:44:00 +08:00
XiaoFeng 72d21ff810 Update reader, add BlendFrame supporting to Skeleton Animation 
Update json parser to prepare compatible for both current version output json description file and future optimized version json description file.
 2015-08-17 13:05:29 +08:00
Liam 7aa36d14be fix the skybox display error from editor files 2015-08-17 13:04:25 +08:00
子龙山人 8e01326cfa Merge pull request #13387 from WenhaiLin/v3-replace-tab-withSpaces 
Replace tab with spaces
 2015-08-17 11:29:03 +08:00
Vladimir Perminov a16d04fb53 CCUtf8ToUnicode and CCUnicodeToUtf8 deprecated 2015-08-16 13:08:00 +03:00
Vladimir Perminov d70a21aa25 Correct use and convert unicode from utf8 
Move StringUtf8ToWideChar and StringWideCharToUtf8 to CCWinRTUtils(
Replace CCUtf8ToUnicode)
Use StringUtf8ToWideChar for convert utf8 to unicode
Use StringWideCharToUtf8 for convert unicode to utf8
 2015-08-16 12:51:41 +03:00
pandamicro 487c99e632 Merge pull request #13378 from jianglong0156/fixNodeGrid 
[ci skip]add NodeGrid bind
 2015-08-15 21:43:00 +08:00
子龙山人 6d630152c8 Merge pull request #13381 from zilongshanren/fix-radiobutton-disallowselection 
fix RadioButton disallow selection issue.
 2015-08-15 19:20:18 +08:00
江龙 06ab98b0ac improve the comment 2015-08-15 17:04:32 +08:00
WenhaiLin a0c270234b Replace tab with spaces 2015-08-14 21:17:51 +08:00
andyque d45897ec53 fix RadioButton disallow selection issue. 2015-08-14 18:07:13 +08:00
jianglong0156 ae8332eb85 add NodeGrid bind 2015-08-14 17:46:34 +08:00
子龙山人 83de0e798e Merge pull request #13365 from WenhaiLin/v3-label-ignore-r 
Label:ignore '\r' character.
 2015-08-14 17:22:33 +08:00
minggo 1e415a0b5b Merge pull request #13364 from WenhaiLin/v3-Scheduler-eloopfix 
Fixed `Scheduler::update(float dt)` can lead to an infinite loop when the value of `dt` is zero.
 2015-08-14 15:11:09 +08:00
WenhaiLin d855722c20 Fixed `Scheduler::update` can lead to an infinite loop when the value of `dt` is zero. 2015-08-14 15:05:25 +08:00
子龙山人 ac5f8d0f4c Merge pull request #13367 from CocosRobot/update_lua_bindings_1439522923 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-14 11:54:38 +08:00
子龙山人 f36d6a5c8c Merge pull request #13363 from GammaEspeon/v3 
[bugfix] SimpleAudioEngine misreporting whether music is playing when paused/resumed
 2015-08-14 11:54:12 +08:00
CocosRobot 9b003c9cfc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-14 03:34:30 +00:00
WenhaiLin d25decb414 Label:ignore '\r' character. 2015-08-14 11:07:34 +08:00
Ricardo Quesada 5baa90c79e libcurl.h not included in the header to avoid... 
too many dependencies
 2015-08-13 19:28:38 -07:00
James Windiate fa02751e45 fixed whitespace 2015-08-13 19:24:41 -04:00
James Windiate 61a2e0d2ad Added _playing flag switching on pause and resume 
Issue # 13254
 2015-08-13 18:52:32 -04:00
Ricardo Quesada 7047e0fbdb Merge branch 'v3' into downloader_decouple_squash 2015-08-13 11:07:49 -07:00
子龙山人 c4af7b8c45 Merge pull request #13360 from CocosRobot/update_lua_bindings_1439456784 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-13 17:25:26 +08:00
CocosRobot 2de6b4ed4c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-13 09:11:00 +00:00
子龙山人 aa7b96bb40 Merge pull request #13352 from zilongshanren/fixIssue12519 
fix iOS EditBox Chinese input maxLength issue.
 2015-08-13 17:04:19 +08:00
子龙山人 20729e16ae Merge pull request #13349 from yangws/v3 
Fix bug: timer dt time error when interval = 0.
 2015-08-13 17:02:55 +08:00
Ricardo Quesada d2cf4bfc79 Squashed commit of the following: 
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Aug 13 00:13:38 2015 -0700

    Merge branch 'v3' into downloader_decouple

commit 61788a0b34188fed5367cab121817db97198bcd8
Merge: 8c1e211 5e21580
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Aug 12 20:45:12 2015 -0700

    Merge branch 'v3' into downloader_decouple

commit 8c1e2119a5c671c00da5ce1fb244029f2bfab09f
Merge: 2ea66af 8d73883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Aug 12 20:42:04 2015 -0700

    Merge pull request #6 from minggo/downloader_decouple

    fix js binding error

commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date:   Thu Aug 13 11:09:58 2015 +0800

    fix js binding error

commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Aug 12 09:14:22 2015 -0700

    Merge branch 'v3' into downloader_decouple

commit 8cdb0b6e4b83210b1f68b4568c74ccb36f504806
Merge: 9272765 08eeca9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Aug 11 20:11:46 2015 -0700

    Merge pull request #5 from minggo/downloader_decouple

    fix lua-binding error

commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date:   Wed Aug 12 10:34:05 2015 +0800

    fix lua-binding error

commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Aug 11 10:39:22 2015 -0700

    Merge branch 'v3' into downloader_decouple

commit 8252464020dbe86da4e5e5aa6e4e45f6997f6b9b
Merge: 5dddbb6 138df42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Aug 11 06:53:48 2015 -0700

    Merge pull request #4 from minggo/downloader_decouple

    fix linking error in lua-tests on Android

commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date:   Tue Aug 11 16:23:53 2015 +0800

    fix link error in lua-tests

commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Aug 7 23:22:50 2015 -0700

    works for real on win32

commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Aug 7 22:26:59 2015 -0700

    compiles on win32

commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Aug 7 21:57:49 2015 -0700

    compiles on iOS!!

commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Aug 7 21:27:03 2015 -0700

    compiles and runs Ok on windows.

    Tested all downloadertests + assetmanagertest

commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Aug 7 20:24:28 2015 -0700

    updates windows projects

commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Aug 7 19:56:10 2015 -0700

    compiles on Android

commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Aug 7 18:34:33 2015 -0700

    trying to fix a compile issue on iOS

    WIP

commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Aug 7 18:25:11 2015 -0700

    make bug fixes

    adds public `getHeader`

commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Aug 7 17:42:19 2015 -0700

    some linux fixes

commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Aug 7 16:58:53 2015 -0700

    Squashed commit of the following:

    commit 86227e9138c1fb523bd28186d355de65cc64c588
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 16:55:17 2015 -0700

        works %100

        and uses less memory than before

    commit a9cafa6f2fe7847e279934d2c162287680760dda
    Merge: 0bbc62e 0cbd71f
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 15:49:33 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 0bbc62ee1fbfd107a935131d5d93994e87865afa
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 15:46:55 2015 -0700

        more tests... and works

        but there is huge bug.
        ProgData <vector> needs the position of DownloadUnits <unordered_map>
        but <unordered_map> does not guaranty the order.
        So in my next commit I"ll merge DownloadUnit with ProgressData

    commit 389ed8639a1942f628773616a8e340bc66a0c1d7
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 13:47:07 2015 -0700

        debugging info

    commit af0dc45bb9c4705934ced2c1d67e5afc06b6f317
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 11:47:31 2015 -0700

        sync and async tests working ok

    commit 999fa7a7bfb28565492f47b39caef7f1a079c183
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 11:38:38 2015 -0700

        adding tests

    commit 91ee294942510718400edc0d00d3c744d00339ee
    Merge: 76ab703 7f215e9
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 10:03:50 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 76ab7032d3a21156f05395a021391a16649f755a
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Aug 7 00:22:20 2015 -0700

        Downloader tests

    commit b65c4dad7089660bfe697c0dab3e9290d1a6d013
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Aug 6 21:34:54 2015 -0700

        compiles on Xcode 7

    commit ec0d66340b8daf0b042d36333dff759cd424f465
    Merge: 878e4b5 0d77838
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Aug 6 11:02:24 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 878e4b5d0f87bc6d5d6e507102ab15e2c24a1c8f
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 18:07:02 2015 -0700

        working, yeah!

    commit ad1e7637a5ac2e6bff44d35429f5556ea1cb8a4c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 17:49:59 2015 -0700

        code is more thread-safe friendly

    commit 8c6baaee6b898d4b90e5d8988a174d8a33702f60
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 16:39:02 2015 -0700

        fixes callbacks

    commit ddab4d753106c6ff11304c1c69739c5611e3f20a
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 15:43:51 2015 -0700

        cleaner code

        runs callbacks in cocos2d thread only if needed

    commit ef75844aaa010633e6e27ae6e69460174460d5c7
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 11:58:04 2015 -0700

        removed weak_ptr<> from ProgressData

        that logic of the code is added in the callbacks

    commit d9c7436cbadc611592b3c80ca2a3a9edeaa00853
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 11:54:07 2015 -0700

        checks whether or not the callbacks are in the cocos2d thread

    commit ae6594a6f866f6b5015ba293db23343887063d2f
    Merge: 4c61069 6831e24
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Aug 5 10:48:34 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 4c61069a7e0e33fa0332df700cc8df4807178caf
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Aug 4 21:36:50 2015 -0700

        almost there...

        Downloader has std::vector<FILE*> instead of FileDescriptors
        code cleaner...

    commit c34d04a8218d2be5c316e0487e5ac46792bbed76
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Aug 4 20:38:44 2015 -0700

        passes progressData to batch

        no need to alloc memory for each ProgressData

    commit f7e8bbd8b85f214b919bce6118d4158dd6d26368
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Aug 4 17:47:23 2015 -0700

        tidier code and more optimizations

    commit a486dc78aedcf9c6178e490292edd572f8a7b374
    Merge: 4178327 a06421b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Aug 4 14:03:22 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 417832705910a6ebd16a876cd98064ea16f0f45c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Aug 3 18:13:13 2015 -0700

        not finished yet...

        ...but trying to have a common inteface with batched and non-batched
        downloads

    commit 1d0e4652763c2e1511ac102a62defae6c6a89220
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Aug 3 16:29:39 2015 -0700

        ErrorCallback compiles

        starting the batching code

    commit 6645a287c47dc01cbf1f2d80e9c0fdd2b16e3e18
    Merge: c180425 8d836da
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Aug 3 10:28:51 2015 -0700

        Merge branch 'v3' into cocos_net

    commit c180425d8181b8e6f53be766d8d2b94f908ae168
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Jul 31 15:35:53 2015 -0700

        More progress on migrating multiple-file downloader

        to the implementation file

    commit 5fa273e265963af3c0cb6338bf49dc5e1b54173b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Jul 31 14:00:02 2015 -0700

        Dowloader moved to `cocos2d::network`

    commit 14b1d0825106701b5435a266b255f09291b6486b
    Merge: 13cfc8d f744383
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Jul 31 11:13:55 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 13cfc8de4eb4835ffb8f8d671d3d070c411b0a2e
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Jul 31 11:11:45 2015 -0700

        DownloadUnits belong to network

    commit e6e17564ead1fb7f6f7df343b0627a104cd756f8
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Jul 30 12:23:36 2015 -0700

        adds `check for option`

    commit 5cb76dfaaed42011a0c536d01b82a0a94487d6aa
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Jul 30 10:37:51 2015 -0700

        Downloader: using URLDownload in one case.

        3 more to go. Not tested yet

    commit 9b26e9cfac425635027189ccab835054b68bc83d
    Merge: 20fe063 253d9c4
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Jul 30 08:35:53 2015 -0700

        Merge branch 'v3' into cocos_net

    commit 20fe0636e36ae7f1da048545b3345f526d5b64de
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Jul 29 17:36:07 2015 -0700

        URLDownload: initial commit

        HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d
        guidelines

        Adds `CCIRULDownload` interface.
        Adds `CCURLDownload` implementation based on libcurl. Not working yet.
        `Downloader` uses `URLDownload` for some of its functions.

        WIP

    commit 3a5d3b83838bee53e3bbea182f3ad09d7bec32d0
    Merge: e408fe0 642ccac
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Jul 29 14:00:43 2015 -0700

        Merge remote-tracking branch 'cocos2d/v3' into cocos_net

    commit e408fe0b9303813d20bab2f7bf548f3b7af416a6
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Jul 29 13:59:46 2015 -0700

        Adds more files to Xcode project

        ...even if they are not being compiled. Much easier to add missing
        functionality to the rest of the platforms

    commit 11d86acebeb61348e4ccf7e6af9a2eaf1b6bb534
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Jul 29 11:36:57 2015 -0700

        removes unneeded headers
 2015-08-13 00:14:10 -07:00
子龙山人 082caaf3e0 Merge pull request #13342 from WenhaiLin/v3-label-miss-letter 
Label:Fixed display incorrect if label content is changed after invoking `getLetter(letterIndex)`
 2015-08-13 15:09:54 +08:00
andyque f9385d1604 fix iOS EditBox Chinese input maxLength issue. 
https://github.com/cocos2d/cocos2d-x/issues/12519
 2015-08-13 15:01:14 +08:00
Vincent Yang d333d24177 Fix bug: timer dt time error when interval = 0. 2015-08-13 12:55:07 +08:00
CocosRobot 9fd18f987e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-13 02:53:50 +00:00
WenhaiLin c06994de34 Label:Fixed display incorrect if label content is changed after invoking `getLetter(letterIndex)` 2015-08-13 10:29:58 +08:00
minggo bc964e8314 Merge pull request #13335 from pandamicro/v3 
Upgrade Spine runtime
 2015-08-12 18:46:59 +08:00
子龙山人 da9b894494 Merge pull request #13336 from zilongshanren/v3 
[ci skip]merge v3.7.1 back to v3.
 2015-08-12 18:12:25 +08:00
andyque 68a90743c7 Sync PR: https://github.com/cocos2d/cocos2d-x/pull/13303 2015-08-12 18:09:32 +08:00
pandamicro cb143963ce Upgrade Spine runtime 2015-08-12 18:07:28 +08:00
子龙山人 a84553ae17 Merge pull request #13311 from WenhaiLin/v3-audio-crashfix 
AudioEngine:Fixed possible crash on iOS/Mac.
 2015-08-12 18:02:00 +08:00
andyque 82f597ce98 Merge branch 'v3.7.1' into v3 
# Conflicts:
#	cocos/scripting/lua-bindings/auto/api/CheckBox.lua
#	cocos/ui/UICheckBox.cpp
#	cocos/ui/UICheckBox.h
 2015-08-12 17:59:50 +08:00
子龙山人 86d674030e Merge pull request #13307 from fusijie/fix_cocostudio_skin_flip 
fix cocostudio skin setfliped.
 2015-08-12 14:34:46 +08:00
子龙山人 be1d3ccc67 Merge pull request #13324 from zilongshanren/fix-editbox-soft-keyboard-backissue 
fix ui::TextField status error.
 2015-08-12 13:57:10 +08:00
andyque 763976d50c fix ui::TextField status error. 
1. Refactoring Cocos2dxEditText to reuse Cocos2dxEditBox.

2. Reorder the event handling in ui::TextField.
 2015-08-12 11:05:07 +08:00
pandamicro dbd0b6dd86 Merge pull request #13272 from yangws/bug_21800 
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app…
 2015-08-12 10:25:30 +08:00
Wenhai Lin b46000287e AudioEngine:Fixed crash cause by multiple threads access into a shared unsynchronized data.[iOS/Mac] 2015-08-11 18:11:59 +08:00
CocosRobot ef41cb27ca [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-11 08:02:58 +00:00
子龙山人 f3f67a10f9 Merge pull request #13232 from perminovVS/v3-dev-get-file-extension 
Add getFileExtension to FileUtils
 2015-08-11 15:54:55 +08:00
子龙山人 65c4261cc6 Merge pull request #13301 from yangws/bug_21906 
fix bug: #21906 Pause/Resume 's result not correct.
 2015-08-11 15:54:02 +08:00
Vincent Yang bb0a7a8533 fix bug: #21906 Pause/Resume 's result not correct. 2015-08-11 14:28:52 +08:00
Vincent Yang 47ecb246b8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into bug_21906 2015-08-11 14:24:02 +08:00
andyque b2bf8469f0 Fix EditBox turning black when soft keyboard hide. 
I disable a optimization when users start to type, the resize layout's
doLayout event should be stoped.

But it has bugs. If we could find reliable soft keyboard show/hide
event detection method, we could enable this optimization again.
 2015-08-11 11:42:37 +08:00
子龙山人 271ab08b59 Merge pull request #13306 from WenhaiLin/v3.8-label-letter-flipped 
Label:Fixed letter can be flipped.
 2015-08-11 11:05:12 +08:00
子龙山人 f1c252a1a8 Merge pull request #13302 from WenhaiLin/v3.8-CocosBuilderTest-crash 
CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x.
 2015-08-11 11:04:54 +08:00
fusijie aa1b1831e9 fix cocostudio skin setfliped. 2015-08-11 10:34:22 +08:00
WenhaiLin eeb4a38715 Label:Fixed letter can be flipped. 2015-08-11 10:06:14 +08:00
CocosRobot aa6ac72405 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-11 01:58:29 +00:00
WenhaiLin 2deeee70d2 CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x. 2015-08-10 22:41:18 +08:00
pandamicro 6bcea5baee Fix issue described in #13284 by reorder state setting and event dispatching 
The real reason of #13284 is that the `_selected` state is set after touch events dispatching.
So I decided to override `onTouchEnded` function to set the `_selected` state.
 2015-08-10 22:27:59 +08:00
Vincent Yang d0a5c02399 fix bug: #21906 Pause/Resume 's result not correct. 2015-08-10 17:58:49 +08:00
Wenhai Lin 2983aed0a9 Label:Fixed crash cause by access an invalid address 2015-08-10 16:50:59 +08:00
pandamicro 1471936c2f Merge pull request #13249 from pandamicro/v3 
Made SocketIO events correctly fired when compile in release mode
 2015-08-10 13:32:09 +08:00
pandamicro 3cc06d3f9b Merge pull request #13267 from yangws/bug_21796 
Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.
 2015-08-10 12:40:32 +08:00
pandamicro f4440f5613 Merge pull request #13229 from fusijie/fix_13228 
Fixed SpriteBatchNode setFlipped bug.
 2015-08-10 11:53:30 +08:00
pandamicro c54a204bad Synchronize enable state and bright state for Widget 
Fix issue: https://github.com/cocos2d/cocos2d-x/issues/8137
 2015-08-10 07:42:35 +08:00
pandamicro 1f52f0971a Fix CheckBox cross renderer state not updated correctly 
Issue description: When checkbox checked, its renderer adaptation may not be updated.

Reported http://punchbox.info:3000/issues/21630
 2015-08-09 20:57:37 +08:00
CocosRobot 8c76a194fa [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-09 02:32:59 +00:00
子龙山人 f6569f24f4 Merge pull request #13273 from zilongshanren/android-editbox-reimplement-fix 
Re-implement Editbox on Android platform.
 2015-08-09 10:25:19 +08:00
pandamicro 99e1e00a5b Merge pull request #13268 from dabingnn/v3_fixCrashOnAndroid 
fix engine crash because of wrong initialisation on some android device
 2015-08-08 19:43:10 +08:00
CocosRobot eb9d1ea205 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-07 22:55:48 +00:00
Ricardo Quesada 789da4edd8 compiles on xcode7 2015-08-07 14:00:18 -07:00
geron-cn 744fd74b3b make skeleton's debugdraw contorls all subbone's debug draw 2015-08-08 00:39:01 +08:00
pandamicro a8c729fb42 Merge pull request #13270 from jianglong0156/fixlabelColordisplay 
[ci skip]fix the node color property can not use
 2015-08-07 17:50:27 +08:00
Vincent Yang 354f64ec51 fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app will no response. 2015-08-07 17:36:35 +08:00
andyque a35e89225e Re-implement Editbox on Android platform. 
This PR also fixed issue:

https://github.com/cocos2d/cocos2d-x/issues/9572

For the new EditBox:

1. Added a ResizeLayout for updating layout when soft keyboard is shown.
This is because some Android devices won't refresh the view and when
the view is panned, the native EditText will turn black. This is really
a hack, but it works for many Android devices from 2.3 to 5.0.

When keyboard is beginning to show, the ResizeLayout's doLayout
method will be called 24 frames per second. Once the keyboard is closed,
or the user begins to input, the doLayout method will be disabled.

2. EditText is working in a different UI thread, so all the data
are passed to GL thread via callbacks in UI thead.

3. It also overrides onKeyDown method in Cocos2dxEditBox.
When the EditText got the focus, users could press back key to exit
the game. This behavior is not allowed. We give developer the choice to
handle back key event manually.
 2015-08-07 17:27:15 +08:00
jianglong0156 2c3b9009cb fix the node color property can not use 
code example:
````
node.color = xxxx // fix it
````
 2015-08-07 17:26:35 +08:00
Huabing.Xu ba02d9df1d fix engine crash because of wrong initialisation on some android device 2015-08-07 16:37:41 +08:00
Vincent Yang 56204dbef9 Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable. 2015-08-07 16:30:22 +08:00
geron-cn e1108c594c Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp
 2015-08-07 15:48:33 +08:00
geron-cn c7bc84e19b fix crash when BoneNode destruct after skeleton destructed. 2015-08-07 15:41:31 +08:00
geron-cn c6bc81d420 add destruct 2015-08-07 13:13:48 +08:00
geron-cn c569e70aea fix BoneNode::visit for visit other node that is not a BoneNode or SkinNode 2015-08-07 11:44:06 +08:00
geron-cn 7b572bed9d Fix crash when call removeChild from a bone which is already removed. 2015-08-07 09:37:18 +08:00
andyque 211dde38e9 Fix improper touch intercept event propagation. 
When the container widget is disabled, it shouldn't intercept touch.

https://github.com/cocos2d/cocos2d-x/issues/8316
 2015-08-06 22:50:53 +08:00
pandamicro 934764af83 Merge pull request #13250 from xiaofeng11/v3.7.1 
Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247
 2015-08-06 22:23:40 +08:00
geron-cn 3ae3020d61 fix crash when fore call remove child bone from a bone which already removed from a skeleton. 2015-08-06 19:43:11 +08:00
XiaoFeng 91c88ec535 Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247 2015-08-06 18:12:08 +08:00
pandamicro 0d778386f4 Merge pull request #13208 from dabingnn/v3_fixViewportCompile 
Make viewport constructor more compile friendly
 2015-08-06 17:45:23 +08:00
pandamicro a170b1caf1 Made SocketIO events correctly fired when compile in release mode 
Fixed https://github.com/cocos2d/cocos2d-x/issues/13248

Reason: `ScriptingCore::executeJSFunctionWithThisObj` is somehow broken in release mode.

Solution: Use `JSFunctionWrapper` to manage callbacks instead of managing JS values manually.

I also did the following in this commit:

- Correct the coding style in jsb_socketio.cpp
- Remove android.mk in the Xcode project
 2015-08-06 17:20:04 +08:00
Liam 34000f4bde fix particle3d crash with error file 2015-08-06 15:13:54 +08:00
子龙山人 41afa9695c Merge pull request #13230 from WenhaiLin/v3.8-label-space-lost 
Spaces should not be lost if label created with Fingerpop.ttf
 2015-08-06 11:01:35 +08:00
fusijie 9b148b08cd Fixed SpriteBatchNode setFlipped bug. 2015-08-06 10:53:22 +08:00
Vladimir Perminov 7cacdaeaf1 Add getFileExtension to FileUtils 
Gets filename extension is a suffix (separated from the base filename by
a dot) in lower case.

More code need get filename extension, everyone does it differently.
use check UPPER and lower case, use . and no(example ".csb", ".CSB",
"csb" )

And bag in AudioEngineImpl: find point from left( ext =
strchr(filePath.c_str(), '.'); )
If file path contains point. always unsupported media type
 2015-08-05 22:21:16 +03:00
WenhaiLin e81d5af12d Spaces should not be lost if label created with Fingerpop.ttf 2015-08-05 23:46:41 +08:00
geron-cn ee6253319a delete useless code 2015-08-05 23:07:42 +08:00
pandamicro 881adf6f36 Merge pull request #13217 from jianglong0156/fixTextFieldBug 
fix textfield and editbox can not input emoticon
 2015-08-05 17:41:19 +08:00
子龙山人 47fe470647 Merge pull request #13213 from jianglong0156/improUtfFunction 
add api getStringUTFCharsJNI newStringUTFJNI
 2015-08-05 17:26:52 +08:00
jianglong0156 42ed314463 fix textfield and editbox can not input emoticon 
fix textfield and editbox can not input emoticon and improve the api comments
 2015-08-05 17:03:06 +08:00
pandamicro dae4385b61 Merge pull request #13214 from pandamicro/skeleton-fix 
Make BoneNodes ordered in Skeleton
 2015-08-05 16:36:18 +08:00
geron-cn 9980397081 Make BoneNodes ordered in Skeleton 
1. Order skins differently than bones and draw them with unified local z order
2. Check children has been remove when its ansester remove
3. Checkout cocos2d::map exists iter before remove

Squashed from https://github.com/cocos2d/cocos2d-x/pull/13191
 2015-08-05 16:33:32 +08:00
jianglong0156 9a257d8136 fix lua pai error 2015-08-05 16:15:22 +08:00
jianglong0156 fac7a78fc8 improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI 
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
 2015-08-05 16:10:14 +08:00
WenhaiLin 2c220092e6 Fixed FontAtlasCache::purgeCachedData might cause crash. 2015-08-05 14:12:02 +08:00
Huabing.Xu 5f9a3b97fb fix viewport constructor error in old compiler to make it more compatible. 2015-08-05 10:57:27 +08:00
pandamicro 8cdcade07a Merge pull request #13186 from jianglong0156/addEmotionTest 
fix getStringUTFChars bug
 2015-08-05 10:19:19 +08:00
WenhaiLin b9edd6fc29 Fixed transform 2015-08-05 00:21:06 +08:00
WenhaiLin 2363622a67 Label:support auto batch with bitmap font or char map. 2015-08-04 21:49:14 +08:00
jianglong0156 3230ca154d improve the code. fix network error 2015-08-04 16:42:16 +08:00
jianglong0156 00b7e98c89 improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak. 2015-08-04 16:24:08 +08:00
VisualSj b9b565e64a Update JSON parser 2015-08-04 16:04:35 +08:00
pandamicro 744fa0b565 Merge pull request #13194 from VisualSJ/v3-boneTest 
[ci skip] Update JSON parser
 2015-08-04 15:35:27 +08:00
VisualSj 04465ac4f4 Update JSON parser 2015-08-04 15:15:46 +08:00
pandamicro b9602127a4 Merge pull request #13187 from xiaofeng11/v3.7.1 
Remove file error notice label from TextBMFontReader
 2015-08-04 13:38:17 +08:00
XiaoFeng 0f90999419 Remove file error notice label from TextBMFontReader to keep consistency with other components 2015-08-04 11:45:29 +08:00
jianglong0156 979700e343 there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program 2015-08-04 11:30:30 +08:00
pandamicro d20052cc22 Fix line wrapper in CCDevice 2015-08-04 11:07:04 +08:00
pandamicro f9249f0e49 Merge pull request #13180 from sridher/mac_dpi_fix 
getDPI for Mac Implemented
 2015-08-04 10:49:14 +08:00
fusijie 8d2da20e5f fix spelling mistake. 2015-08-04 09:36:33 +08:00
pandamicro 25cb0d2896 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	web
 2015-08-03 19:47:56 +08:00
pandamicro 6d3a00ad67 Merge pull request #13173 from geron-cn/3.7.1 
fix bug: crash when use bone after erase it form Vector.
 2015-08-03 19:45:54 +08:00
Sridher Jakku f48a9fb9f0 getDPI for Mac Implemented 2015-08-03 17:12:52 +05:30
CocosRobot 3e71ce33c8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-03 10:09:10 +00:00
pandamicro 4b7b85f113 Merge pull request #12889 from fusijie/fix_clippingRectangle_bug 
remove CCClippingRectangleNode transform error support.
 2015-08-03 18:01:01 +08:00
geron-cn e4c47c811f remove EMSCRIPTEN draw 2015-08-03 16:53:08 +08:00
geron-cn cfc8da579f fix bug: crash when use bone after erase it form Vector. move the operation after erase, make sure bone ref* is not realeaed 2015-08-03 16:47:54 +08:00
pandamicro f10994c20b Merge pull request #12467 from MagicTavern/v3_fix_websocket 
fix a problem where WebSocket messages may pile up
 2015-08-03 16:25:56 +08:00