02e943075b
update changelog and release note ( #16548 )
2016-09-08 18:36:25 +08:00
1c27c12327
updated libcocos2d dll version to 3.13.1 ( #16542 )
2016-09-08 10:38:16 +08:00
1d7d803882
update submodule ( #16540 )
2016-09-07 18:00:34 +08:00
e394c05c51
update console submodule ( #16539 )
2016-09-07 17:30:25 +08:00
569681f6bd
use api level 13 ( #16538 )
2016-09-07 14:50:03 +08:00
e122b902a9
update changelog and release note ( #16537 )
2016-09-07 13:58:48 +08:00
282959cc0f
fix: uses correct design resolution ( #16534 )
...
fixes github issue #16485
2016-09-07 12:01:40 +08:00
9449e687af
fixed compile error for android-studio build (with-controller) ( #16529 )
2016-09-07 12:01:11 +08:00
2d1048bd00
fix: uses default designResolution if not set previosly ( #16533 )
...
fixes github issue #16485
and re fixes github issue #16003
2016-09-07 11:11:52 +08:00
b014720f64
only build linux and android since it will met timeout issue on other platforms ( #16536 )
2016-09-07 11:10:12 +08:00
fa15ab8212
3.13.1 text color ( #16516 )
...
* fix: Label updateColor() and underline color work as expected (#16486 )
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
* fix conflict
* Issue 16471 (#16489 )
* fix: Label updateColor() and underline color work as expected
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
* docs: added more internal doc for issue_16471
2016-09-07 09:44:58 +08:00
c233a5bdf7
[ci skip]V3.13.1 doc ( #16528 )
...
* update release note and changelog
* update engine version
2016-09-06 17:01:23 +08:00
937525a4de
prevent restarting activity on some events ( #16525 )
2016-09-06 16:12:49 +08:00
c51605971f
fixed #16490 : [android, audio] AudioEngine::stop() triggers 'finished' callback ( #16491 ) ( #16524 )
2016-09-06 10:58:43 +08:00
7c298bdcd7
misspelling check on cocos directory ( #16522 )
...
Misspelling fix on some comments,
cocos/editor-support/cocostudio/CSParseBinary_generated.h
fix misspelling postion -> position
2016-09-06 10:14:14 +08:00
50a1e75373
fixed #16502 : SPINE color bug (temporary storage of color was wrong in SkeletonRenderer) ( #16503 )
2016-09-06 10:11:54 +08:00
8d2b645a96
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16519 )
...
* fixed #16473 : OpenSLES error while play background music in writable path or sdcard. (#16475 ) (#16517 )
* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-09-06 10:11:11 +08:00
9dc737901b
fixed #16473 : OpenSLES error while play background music in writable path or sdcard. ( #16475 ) ( #16521 )
2016-09-06 09:41:53 +08:00
a6c398ec95
Fixes jsval_to_std_string could not convert number to string. ( #16504 ) ( #16515 )
...
Don't use deprecated method in ActionsProgressTest.
2016-09-05 17:42:34 +08:00
8947ff722e
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16514 )
2016-09-05 13:48:58 +08:00
6f4551cdad
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16513 )
2016-09-05 10:19:41 +08:00
b48bcc9579
Ease Actions Code De-Duplication
...
* ease action class macros to reduce code duplication
- update bindings for ease actions
- reorder clone method
- add back in create/etc methods to allow for EaseRateAction instances
- fix wrong clone return type
* Add note and minor cleanup
* use create in clone instead of new/init as in latest EaseBezierAction
* fix reverse for EaseIn/Out to match original code
* add assert for null
* refactor to match original code flow
* fix missing CC_DLL for windows builds
* fix win build issues due to abstract methods
* remove unused overrides
2016-09-05 10:18:30 +08:00
857b2143a6
Remove deprecated attribute on Node::_setLocalZOrder() function ( #16470 )
2016-09-05 10:06:42 +08:00
93322eb728
Fixes lua template in release mode. ( #16501 )
2016-09-05 10:02:42 +08:00
5bfd110424
Fixes jsval_to_std_string could not convert number to string. ( #16504 )
...
Don't use deprecated method in ActionsProgressTest.
2016-09-05 10:02:05 +08:00
ba82ce2863
add language property ( #16500 )
2016-09-02 10:51:02 +08:00
b6536e8d9f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16499 )
2016-09-02 10:44:55 +08:00
d5b5ecd886
Fix memory leak when loading Cocos Studio file ( #16487 )
2016-09-02 10:33:00 +08:00
57bf4a923b
fix secure ( #16497 )
2016-09-02 10:32:36 +08:00
0cd365dd2e
Fix MenuItemSprite::unselected() on disabled items showing _normalImage instead of _disabledImage ( #16482 )
2016-09-02 09:51:47 +08:00
978f9f99de
generate binding codes and cocos_file.json ( #16496 )
2016-09-01 18:54:49 +08:00
c32000250c
Issue 16471 ( #16489 )
...
* fix: Label updateColor() and underline color work as expected
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
* docs: added more internal doc for issue_16471
2016-09-01 16:59:40 +08:00
db21e5f349
[ci skip]Travis enable pull request ( #16494 )
...
* refactor travis and build pull request
* delete unneeded file
2016-09-01 16:25:47 +08:00
1c40d5e16d
Fix MessageBox inverted params on Android ( #16484 )
2016-09-01 16:10:02 +08:00
64c62d37c2
fixed #16490 : [android, audio] AudioEngine::stop() triggers 'finished' callback ( #16491 )
2016-09-01 16:06:29 +08:00
6d27868918
fixed #16473 : OpenSLES error while play background music in writable path or sdcard. ( #16475 )
2016-09-01 11:47:33 +08:00
01e67f6203
fixed #16477 : [android, audio] Deadlock if preload the same file more than 3 times in preload callback. ( #16478 )
...
And added test case.
2016-09-01 11:46:27 +08:00
35f937cd40
AudioMixerController::initTrack should not setState for track. Otherwise, it may trigger Track state mess-up. ( #16476 )
...
* Warning fixes in AudioDecoder.cpp
* AudioPauseResumeAfterPlay test case should start in onEnter.
And add a loop to pause & resume many times.
* AudioMixerController::initTrack should not setState for track. Otherwise, it may trigger Track state mess-up.
2016-09-01 11:43:37 +08:00
e57c30c83b
fix: Label updateColor() and underline color work as expected ( #16486 )
...
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
2016-08-31 20:20:13 -07:00
e0900e09dd
Update CHANGELOG
2016-08-31 14:40:29 +08:00
5e6822d50b
[AUTO][ci skip]: updating cocos2dx_files.json ( #16468 )
2016-08-31 09:37:55 +08:00
e33aa63226
[AUTO][ci skip]: updating cocos2dx_files.json
2016-08-30 09:20:13 +00:00
b569f87d3f
Update .travis.yml
2016-08-30 17:18:18 +08:00
58ede40ed9
Add missing definition of PhysicsBody::getFirstShape (Revert part of #13923 ) ( #16458 )
2016-08-29 19:23:14 -07:00
91efab2ba7
Fix memory leak caused by packetOut in SocketIO.cpp ( #16451 )
2016-08-29 19:22:38 -07:00
feb48aea9c
Improving CCRef LEAK_DETECTION tools by making them thread safe. It is possible that ref's can be created and mutated off thread, and with leak detection on. This can cause ungaurded writes from two or more threads to a non-protected structure. Fixing a crash on iOS when using std::list instead of std::vector. ( #16415 )
2016-08-30 09:36:45 +08:00
9dea92b2e0
feat: add support for Game Controllers on Mac ( #16461 )
...
it shares 100% the same code with iOS.
it only adds a few #ifdefs.
github issue #16460
2016-08-29 16:58:44 -07:00
0b1f61b8ce
fix possible crash of label shrinked ( #16456 )
2016-08-29 15:23:01 +08:00
df3b33cd59
Merge pull request #16457 from minggo/merge-v3.13
...
Update rapid json to version 1.1.0.
2016-08-29 15:22:01 +08:00
7665d83db2
Merge pull request #16452 from mogemimi/add-missing-override
...
Add missing override keywords
2016-08-29 00:33:30 -05:00
minggo