Permalink
Commits on Jan 9, 2017
  1. Update BugsTest.cpp (#17125)

    comment out Bug #15776 because it currently crashes during autotest
    stevetranby committed with minggo Jan 9, 2017
  2. add some comments for key limitation (#17122)

    minggo committed on GitHub Jan 9, 2017
  3. Fix for issue #17114. Improves the ability to add placeholder color a…

    …nd font for single line text fields on iOS
    DavidDeSimone committed Jan 9, 2017
Commits on Jan 6, 2017
  1. English refinements (#17117)

    English refinements.
    dandan387 committed with minggo Jan 6, 2017
  2. Allow velocity to be applied to Chipmunk's kinematic bodies (#17094)

    * Allow velocity to be applied to Chipmunk's kinematic bodies
    
    * Added check for CP_BODY_TYPE_STATIC
    
    Thanks to @minggo for the code review
    Rubonnek committed with minggo Jan 6, 2017
Commits on Jan 5, 2017
  1. To use some HTTP client library those use `send(null)` like `superage…

    …nt`,`XMLHTTPRequest` should send a empty request instead of abort. (#16989)
    kosmosR2 committed with minggo Jan 5, 2017
  2. Merge pull request #17113 from CocosRobot/update_lua_bindings_1483580435

    [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
    zilongshanren committed on GitHub Jan 5, 2017
  3. English refinements (#17109)

    English refinements.
    slackmoehrle committed with minggo Jan 5, 2017
  4. Slice9 Sprite with triangles, not quads (#17105)

    * sprites: use triangles instead of quads
    
    uses less memory
    
    * oops, color should be white by default
    
    * works with flipped sprites
    
    * none for xcode
    ricardoquesada committed with minggo Jan 5, 2017
  5. Openssl adjust (#17106)

    * change openssl search path
    
    * copy libopenssl from openssl folder
    
    * update external version
    minggo committed on GitHub Jan 5, 2017
Commits on Jan 4, 2017
  1. fix type conversion warnings (#17061)

    * Fix conversion warning
    
    from unsigned int to float
    
    * Fix type conversion warning
    
    * Fix type conversion warning
    
    * change the return type of getOutlineSize to float
    
    * fix typo
    effolkronium committed with minggo Jan 4, 2017
  2. Merge pull request #17101 from minggo/merge-v314

    Merge v314
    minggo committed on GitHub Jan 4, 2017
  3. make ListView::setGlobalZOrder() work (#17098)

    * make ListView::setGlobalZOrder() work
    
    * revert modification of UIButton
    
    * reset background color
    
    * change global z order to test
    minggo committed on GitHub Jan 4, 2017
Commits on Jan 3, 2017
  1. update chinese release note

    minggo committed Dec 29, 2016
  2. implements issue #17069 (#17090)

    implemnts suggestion done by @three0s
    ricardoquesada committed with minggo Jan 3, 2017
  3. Fix web engine canvas mode issues (#17095)

    * Update web ref
    
    * Fix custom event being discard during event emission
    
    * Fix web engine canvas mode issues
    
    * Revert "Fix custom event being discard during event emission"
    
    This reverts commit 3f42273.
    
    * Update web ref
    pandamicro committed with minggo Jan 3, 2017
Commits on Dec 29, 2016
  1. fixed #16849: Preload many audios may cause crash on devices those us…

    …e Samsung Exynos CPU. (#17049)
    
    * fixed #16849: Preload many audios may cause crash on devices those use Samsung Exynos CPU.
    
    * Adds comment for __SLPlayerMutex variable.
    
    * Fixes wrong comments in AudioDecoder.cpp
    committed with minggo Dec 29, 2016
  2. vec4 operator < seems error (#17072)

    * bug fix
    
    * Vec4 operator <
    niu2x committed with minggo Dec 29, 2016
  3. Merge pull request #17038 from MrCapone/ui_touch_fixes

    CheckBox touch fix
    zilongshanren committed on GitHub Dec 29, 2016
  4. Fix label disableeffect (#17075)

    * add toggle rendering type test
    
    * fix label additional kerning
    
    * only substract additionalKerning when bold is enabled
    zilongshanren committed with minggo Dec 29, 2016
  5. Merge pull request #17082 from CocosRobot/update_lua_bindings_1482978657

    [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
    zilongshanren committed on GitHub Dec 29, 2016
  6. Reverts create thread pool code, android doesn't need to create a thr…

    …ead pool in AudioEngine.cpp (#17081)
    committed with minggo Dec 29, 2016
  7. Fixes crash that playing long audio and then uncacheAll (#17079)

    * Fixes crash of playing long audio then uncacheAll.
    
    * update
    
    * Updates comments in MciPlayer.h
    
    * tab -> 4spaces
    
    * include path fix.
    committed with minggo Dec 29, 2016
Commits on Dec 28, 2016
  1. use projection 2d (#17078)

    minggo committed on GitHub Dec 28, 2016
  2. Update web ref (#17073)

    pandamicro committed with minggo Dec 28, 2016
Commits on Dec 27, 2016
  1. Update the reference of submodule cocos2d-console. (#17074)

    Changes: Keep the ndk module paths without relative path.
    natural-law committed with minggo Dec 27, 2016
  2. Merge pull request #17071 from VisualSJ/v3.14

    Fixed a bug about LoaderTest
    minggo committed on GitHub Dec 27, 2016