Arnold
d88d4ffead
Use smart pointers to hold references of global Application::_scheduler ( #1732 )
...
* use std::weak_ptr
* revert build/libcocos2d.vcxproj
* fix mac & ios & android
* declare variable in if block
* revert build/libcocos2d.vcxproj
2019-04-25 18:43:01 +08:00
cary
57554f4ed9
Fix the fillRect method implementation of the win32 platform. ( #1728 )
...
* Fix the fillRect method implementation of the win32 platform.
* fix indent
2019-04-22 18:19:18 +08:00
Arnold
a9e182967f
Prevent XMLHttpRequest from being gc incorrectly, when timeout occurs. ( #1724 )
...
* gc on response
* fix state
* add comment
* prevent multiple send
* revert bindings-generator
* rename _isSend to _isSending
2019-04-22 13:08:00 +08:00
Jare Guo
3abfc68277
Merge branch 'v2.0.10' into v2.0-release
2019-04-20 15:51:35 +08:00
Jare Guo
1a72892bb5
gulp: unified push tag in fireball
2019-04-20 15:50:55 +08:00
Cocos Robot
f07b75a90e
Sync branch v2.0-release to v2.1-release
2019-04-19 18:53:15 +08:00
Cocos Robot
836fa5f770
Sync branch v2.0.10 to v2.0-release
2019-04-19 18:49:55 +08:00
CocosRobot
acfa5e4285
[ci skip][AUTO]: updating jsbinding automatically ( #1719 )
2019-04-19 13:36:18 +08:00
id-ilych
9303638190
WsThreadHelper::__defaultProtocols are not zeroed properly (#1723 )
2019-04-19 10:54:27 +08:00
Arnold
f3f5f4b7b6
Prevent connection objects from being GC, when they are not done yet. ( #1716 )
...
* prevent connections from being GC, when they are not yet.
* run genbindings
* triggle ci
2019-04-19 10:17:41 +08:00
kenshin
3b9ea184ae
fix XMLHttpRequest crash, avoid HttpClient response call a released object! ( #1721 )
2019-04-19 10:06:40 +08:00
Jare Guo
e67356f2c7
gulp: unified push tag in fireball
2019-04-16 14:50:28 +08:00
Cocos Robot
d8a6853a9d
Sync branch v2.0-release to v2.1-release
2019-04-15 18:30:36 +08:00
Cocos Robot
f26850052e
Sync branch v2.0.10 to v2.0-release
2019-04-15 18:30:23 +08:00
Jare Guo
3c260aa21f
enable ci on all branches ( #1718 )
2019-04-15 16:34:02 +08:00
Arnold
974605ea42
run tools/travis-scripts/generate-template-files.py ( #1717 )
2019-04-15 16:03:04 +08:00
Cocos Robot
c56d468ef2
Sync branch v2.0-release to v2.1-release
2019-04-14 17:43:18 +08:00
Jare Guo
4a424e1dfa
Merge branch 'v2.0.10' into v2.0-release
2019-04-14 17:42:42 +08:00
Jare Guo
c4e691434c
Merge branch 'v2.0.6-release' into v2.0.10
...
# Conflicts:
# templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradle.properties
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-link/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
2019-04-14 17:42:18 +08:00
Jare Guo
3207033dc8
Merge branch 'v1.10-release' into v2.0.6-release
...
# Conflicts:
# cocos/editor-support/creator/CCScale9Sprite.cpp
2019-04-14 17:35:14 +08:00
吴智明
830c3905b1
Merge pull request #1714 from knoxHuang/v2.0-release
...
alBufferData instead of alBufferDataStatic for small audio file on Apple
2019-04-11 10:45:44 +08:00
Arnold
fba583b058
ignore touch event if native init is not finished ( #1715 )
...
* cache touch event if renderer is not ready
* skip bad files
* ignore events if not ready
* mark mNativeInitCompleted as false before init
2019-04-10 17:30:30 +08:00
吴智明
4fd60231d3
Merge pull request #1712 from holycanvas/v2.0-release
...
fix loading subpackages's file failed(#1285 )
2019-04-10 16:14:15 +08:00
knox
49373f1b6a
alBufferData instead of alBufferDataStatic for small audio file on Apple
2019-04-09 18:05:27 +08:00
Arnold
af63971d68
[bugfix] cc.loader IPV6 local network address binding ( #1713 )
...
* add source code of cz.msebera.android.httpclient
* remove httpclient-4.4.1.1.jar & use PlainSocketFactory
* add dns callback
* add interface
* add comment
* revert unused change
* remove generated file
2019-04-09 17:33:13 +08:00
santy-wang
6b19429228
fix loading subpackages's file failed( #1285 )
2019-04-08 17:07:47 +08:00
owen
d124f167bf
Fix if spine has not loaded normaly, then will trigger crash ( #1711 )
...
* fix if spine has not loaded normaly,then will trigger destructor,so state may empty
* fix if spine has not loaded normaly,then will trigger destructor,so state may empty
2019-04-08 15:30:57 +08:00
owen
f92d9f196d
modify SkeletonDataMgr license ( #1710 )
2019-04-08 11:51:44 +08:00
Jare Guo
0edfbf4b92
Merge commit 'a4dc939aef28a4142723667df702d4003a6a8468' into v2.1-release
2019-04-03 20:06:14 +08:00
吴智明
a4dc939aef
Merge pull request #1691 from javierhoar/develop
...
Improved audio engine interface to get any audio duration from its filepath
2019-03-28 16:55:55 +08:00
Jare Guo
ce037c0af2
Merge pull request #1706 from cocos-creator/v2.0-release
...
sync branch
2019-03-22 13:09:23 +08:00
owen
fe2f5d246c
Fix dragonbones's alpha has not cascade bug ( #1704 )
...
* Fix dragonbones opacity not cascade bug
* Fix dragonbones opacity not cascade bug
* Fix dragonbones opacity not cascade bug
* Fix dragonbones opacity not cascade bug
* Fix dragonbones opacity not cascade bug
* Code style
2019-03-21 17:17:31 +08:00
Knox
e99ea056a9
update simulator screen size config ( #1705 )
2019-03-21 13:53:58 +08:00
Jare Guo
95b9dc3924
Merge pull request #1703 from cocos-creator/v2.0-release
...
sync branch
2019-03-18 15:40:59 +08:00
吴智明
3ec677d1b4
Merge pull request #1700 from wuzhiming/v2.0_fix_ios_font_error
...
change font search method to avoid font search error
2019-03-14 20:53:33 +08:00
owen
7db656bcfd
modify spine license ( #1702 )
...
update runtime
2019-03-14 18:09:45 +08:00
owen
5c828e9d15
fix spine read file length not assignment bug ( #1701 )
2019-03-14 17:29:20 +08:00
wuzhiming
2f98eff917
change font search method to avoid font search error
2019-03-13 13:55:39 +08:00
Jare Guo
c0f486b357
Merge pull request #1699 from cocos-creator/v2.0-release
...
sync branch
2019-03-13 13:47:01 +08:00
pandamicro
6d94ec107b
[ci skip][AUTO]: updating jsbinding automatically ( #1696 ) ( #1698 )
2019-03-13 10:14:13 +08:00
CocosRobot
3581cd0adb
[ci skip][AUTO]: updating jsbinding automatically ( #1696 )
2019-03-13 10:13:21 +08:00
pandamicro
247600396c
Merge pull request #1697 from sunnylanwanjun/merge20
...
Merge v20 to v21
2019-03-12 18:55:09 +08:00
mac
1f74ffd4d0
Merge commit '0acb69851baac011293da80b6ca95900407a6c65' into merge20
2019-03-12 15:58:56 +08:00
owen
0acb69851b
optimize spine memory ( #1694 )
...
* Optimize spine memory
* roll back genbindings.py
Remove unused function
* visual studio project config
* modify Android mk
* Modify default project config
* Fix restart vm crash
* Fix if listen spine dispose event, will triggle crash bug
* Move some function to private
* move release skeletondata behind depose skeleton
* optimize spine load file
* Add dragon bones and spine global time scale api
* clear tracks and listener
* change tab to 4 spaces
* optimized code logic
2019-03-12 11:51:51 +08:00
PP
68e188c4db
support input signed decimal in EditBox ( #1695 )
2019-03-08 15:45:37 +08:00
吴智明
f155d35f63
V2.0 ndk build error ( #1693 )
...
* change USE_NET_WORK to USE_SOCKET and add xmlhttprequest default for ios platform
* change USE_NET_WORK to USE_SOCKET and add xmlhttprequest default for android platform
* fix ndk r17 build error
2019-03-04 18:02:21 +08:00
owen
855ca01be2
Fix spine first frame vertices not right bug ( #1692 )
...
* Fix spine first frame vertices not right bug
* Fix spine first frame vertices not right bug
2019-03-01 15:01:11 +08:00
Javier O
4e79585fd0
Improved audio engine interface to get the audio duration directly from the filename
...
because with the current implementation the audio needs to be preload and at least be played one time to get
the audio id which is needed to get the audio duration with the current getDuration API.
I've describes the problem in detail here:
https://discuss.cocos2d-x.org/t/audioengine-interface-improvement/34034
2019-02-28 09:18:14 -03:00
owen
2d491030e3
Fix clear dragon bones asset cause exception ( #1690 )
2019-02-26 14:39:05 +08:00
CocosRobot
e07ab57dab
[ci skip][AUTO]: updating jsbinding automatically ( #1689 )
2019-02-26 10:46:59 +08:00