minggo
279ae9819c
Merge pull request #17071 from VisualSJ/v3.14
...
Fixed a bug about LoaderTest
2016-12-27 11:36:04 +08:00
VisualSJ
bdf161a99e
Fixed a bug about LoaderTest
2016-12-27 10:53:07 +08:00
pandamicro
41abefd082
Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
...
# Conflicts:
# CHANGELOG
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
2016-12-26 18:53:42 +08:00
pandamicro
8c71531338
Fix test case issues and add change log
2016-12-26 18:36:19 +08:00
子龙山人
6fa331b065
fix js tests description ( #17065 )
2016-12-26 18:15:05 +08:00
minggo
46ef933716
fix a bug that inserted text will overlap with title ( #17058 )
2016-12-26 09:22:49 +08:00
pandamicro
0496857283
Fix chipmunk test issue
2016-12-26 00:07:17 +08:00
minggo
20d8ef9584
make it work with release mode on arm64 bit ( #17057 )
2016-12-23 16:44:29 +08:00
pandamicro
a3d6705b02
Improve cc.formatStr
2016-12-21 11:05:49 +08:00
minggo
bd0789e22c
sync codes from cpp to js ( #17042 )
2016-12-19 16:00:27 +08:00
pandamicro
24be2acde0
Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
...
# Conflicts:
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
# cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
# tests/js-tests/src/SpineTest/SpineTest.js
2016-12-19 12:39:55 +08:00
minggo
3adbc2a116
change button background picture ( #17040 )
2016-12-19 10:44:56 +08:00
minggo
691a0ce8a5
fix the bug that sprite is not hide after trees ( #17028 )
2016-12-16 15:45:34 +08:00
minggo
291307b698
should retain object to be used later ( #17027 )
2016-12-16 15:16:00 +08:00
James Chen
77cf6de2e5
[label] Fixes shadow is drawn incorrect while also enabling outline. ( #17024 )
2016-12-16 14:56:36 +08:00
minggo
7c2bd27d71
unschedule all before exit ( #17026 )
2016-12-16 14:53:15 +08:00
minggo
332ef17d51
use correct spine api ( #17023 )
2016-12-16 11:24:11 +08:00
James Chen
effb6f077a
[mac, ios] 'ExtAudioFileRead' may return 0 frame while it doesn’t reach the end of very short audio file. ( #17011 )
...
* [mac, ios] Adds AudioDecoder::readFixedFrames. And uses readFixedFrames to simply code.
* [mac, ios] ‘ExtAudioFileRead’ may return 0 frame while it doesn’t reach the end of very short audio file.
* [mac, ios] Adds test case for small file test.
* [mac, ios] Adds small audio file.
* [mac, ios] Macro ‘BREAK_IF’ logic fix.
* [mac, ios] Returns false of AudioDecoder::open if total frames is 0.
2016-12-15 09:58:47 +08:00
子龙山人
3302781dae
fix tizen compile issue ( #17002 )
...
* fix tizen compile issue
* fix linux compile issue
2016-12-14 11:55:38 +08:00
minggo
de670c1913
Lua tests ( #17005 )
...
* fix conflict effect
* set index to 1 before running a test case
2016-12-14 09:28:19 +08:00
pandamicro
5823f5792b
Synchronize creator engine bug fixes and upgrade web engine ( #17003 )
...
* Add EventDispatcher#hasEventListener (sync from creator)
* Fix function wrapper using js object during its gc
* Support more system languages
* Direct log/error for better understanding problems & add sys.now
* Synchronize Editbox APIs
* Synchronize Scheduler.PRIORITY_NON_SYSTEM const
* Upgrade web engine
* Upgrade test cases
* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue
* Manual bind EventListeners’ create to avoid memory issue
* Fix compilation issue when COCOS_DEBUG = 2
* Unify function name of Texture2D::releaseTexture
* Fix compilation issues and update web & bindings-generator
* Fix lua compilation issue
* Use %ld instead of %zd
2016-12-14 09:27:47 +08:00
minggo
6f58131653
fix bug that localnization can not work correctly ( #17001 )
...
* fix bug that localnization can not work correctly
* re-enable other test cases
2016-12-13 16:33:11 +08:00
minggo
ba7c977111
use no border policy ( #17004 )
2016-12-13 16:31:31 +08:00
pandamicro
e469f4f710
Upgrade test cases
2016-12-13 14:29:24 +08:00
minggo
80954d392d
fix label position ( #16998 )
2016-12-13 13:38:49 +08:00
James Chen
f26cc15373
Avoids function name conflict, and uses ` http://httpbin.org/gzip ` to test gzip functionality since only httpbin.org was added to exception list in Info.plist. ( #16933 )
2016-12-13 11:44:42 +08:00
James Chen
636a253981
[cpp-tests] Reverts code change by mistake. ( #16996 )
...
The mistake was merged in https://github.com/cocos2d/cocos2d-x/pull/7619 .
2016-12-13 11:42:12 +08:00
minggo
93a879bfab
remove unneeded files ( #16990 )
2016-12-12 16:25:58 +08:00
minggo
2c2ed5c5f5
don't let toggle accept focus ( #16982 )
2016-12-12 09:41:53 +08:00
James Chen
91daa7a12a
Fixes NewEventDispatcherTest. ( #16983 )
...
fixed http://punchbox.info:3000/issues/26036
2016-12-12 09:39:20 +08:00
James Chen
951b5174db
[lua-tests] Fixes PhysicsDemoBug5482 crashes. ( #16979 )
...
Fixed http://punchbox.info:3000/issues/26011
2016-12-09 14:12:57 +08:00
minggo
fb3055e98c
remove duplicated codes to fix crash in release mode ( #16978 )
2016-12-09 13:42:16 +08:00
James Chen
e6aa2ace3e
[lua] Fixes AssetsManagerEx test crashes. ( #16977 )
2016-12-09 12:04:38 +08:00
James Chen
a0b67fc99a
Fixes lua action test ‘Issue 1305’ crashes. ( #16974 )
...
* Fixes lua action test ‘Issue 1305’ crashes.
* Removes an unused log.
2016-12-09 10:39:34 +08:00
James Chen
cef013dcc6
Fixes broken of JS AssetsManagerTest. And updates https configuration of cpp-tests, js-tests for macOS. ( #16970 )
...
fixed http://punchbox.info:3000/issues/26031
2016-12-08 10:40:22 +08:00
James Chen
fb89672fff
Updates lua CCControlSliderTest. ( #16968 )
...
* Updates lua CCControlSliderTest.
fixed http://punchbox.info:3000/issues/26029
* [lua-tests] Fix the display position of CCControlSilderTest on win32.
2016-12-07 14:55:43 +08:00
James Chen
46fd7e3d59
Sync JS TerrainTest.js from cpp test. ( #16967 )
2016-12-07 14:17:45 +08:00
minggo
3db39a27ea
Vibrate test ( #16966 )
...
* only show vibrate test on iOS and Android device
* vibrate no matter it is silient or not
2016-12-07 11:12:38 +08:00
子龙山人
1b0a6c2c5c
Sync editbox improvement from cocos creator ( #16965 )
...
* sync the changes from creator
* fix editbox vertical alignment
* improve android editbox multiline text vertical alignment
2016-12-07 09:21:17 +08:00
子龙山人
f51234c549
fix jsb test inconsistance ( #16963 )
2016-12-06 17:50:26 +08:00
minggo
77fb210b3a
fix wrong codes and simplify codes ( #16964 )
2016-12-06 17:38:06 +08:00
minggo
84a6ab312c
use correct downloader implementation on mac ( #16955 )
2016-12-05 09:36:35 +08:00
Ricardo Quesada
2e0881e284
Scale9Sprite / Slider / LoadingBar fixes ( #16949 )
...
* WIP
* loadingbar issues fixed
* fixes clone in slider
* slider bug fixes
* slider: sets texturesize correclty before seting capsInsets
* sprite: scale9 avoid negativa values
* yeah! works!
* cloneIn -> copyTo
* restore xcode team: none
* fixes issue #16924
* correct issue number
* yeah! fixes issue #16928 and #16930
2016-12-03 07:35:22 -08:00
James Chen
babced8b7c
Fixes lua-tests/keypad test case. ( #16954 )
...
* Fixes lua-tests/keypad test case.
* Updates string
2016-12-02 15:50:53 +08:00
James Chen
b80e316150
fixed #16938 : Audio could not be played entirely on iOS/macOS. And refactored some code of decoding. ( #16946 )
...
* fixed #16938 : Audio could not be played entirely on iOS/macOS. And refactored some code of decoding.
* Adds license header, removes unused macros.
* issue #16938 : Corrects remaining frame count calculation.
* Updates include path.
* Adds comments for AudioDecoder class.
* Adds const for getter functions in AudioDecoder.
* issue #16938 : Adds test case.
* Updates license years.
* Deletes trailing white spaces.
2016-12-02 13:52:37 +08:00
Dale Stammen
8791794f39
updated for v3.14 ( #16942 )
2016-12-01 10:37:04 +08:00
minggo
8f9b096792
fix url and use https protocol ( #16940 )
2016-11-30 17:51:57 +08:00
minggo
7e100135b6
disable menu item according different angle of view ( #16937 )
2016-11-30 16:49:50 +08:00
minggo
28e48c0af8
remove unneeded test case ( #16936 )
2016-11-30 16:21:33 +08:00
James Chen
51efcb9365
Fixes setScale & setAnchorPoint could not work in js-tests -> webview test . ( #16935 )
2016-11-30 15:32:02 +08:00