Commit Graph

184 Commits

Author SHA1 Message Date
PP 0ab1197c27 refine pause playing audio when enter background (#1875)
* Revert "Pause music when app enter background (#1849)"

This reverts commit 7a24ee3377.

* refine pause playing audio when enter background
2019-10-12 17:02:50 +08:00
吴智明 7d72c89f09 upgrade vs studio default version to vs2017(v141) (#1873) 2019-10-12 11:09:05 +08:00
Arnold 7a24ee3377 Pause music when app enter background (#1849)
invoke AudioEngine::pauseAll when app enter background
2019-09-18 13:52:28 +08:00
Cocos Robot 28df061165 Sync branch v2.1.3-release to v2.2.0-release 2019-09-16 16:26:41 +08:00
minggo 198effdbda fix compiling error on iOS for new project (#1841) 2019-09-11 09:15:53 +08:00
Jare Guo c4beb67263 Merge v2.1.3-release into v2.2.0-release
# Conflicts:
#	cocos/ui/webview/WebViewImpl-ios.mm
2019-09-10 12:55:59 +08:00
minggo 2820e6384b use WKWebView instead as UIWebView is deleted in iOS 13 (#1837) 2019-09-06 11:28:21 +08:00
minggo 95315c1a73 V2.1.3 update v8 android (#1817)
* use ndk's stl

* update external version: update v8
2019-08-30 17:37:58 +08:00
minggo 39f4b68302 V8 fix (#1816)
* use ndk's stl

* update external version: update v8
2019-08-30 17:24:54 +08:00
yinkaile 88d02075a7 fixed build android release (#1802) 2019-08-23 15:14:30 +08:00
minggo 1e37ff1ec4 synchronize v2.1.3 to 2.2 2019-08-02 18:07:50 +08:00
minggo 57fd102dd5 fix compling error on android x86 2019-07-26 11:34:57 +08:00
minggo f884dcf19e use jsc for non arm64 devices and some other fix 2019-07-12 14:14:21 +08:00
owen ed12e82812 Fix android compile 2019-07-02 16:28:18 +08:00
santy-wang 6b19429228 fix loading subpackages's file failed(#1285) 2019-04-08 17:07:47 +08:00
吴智明 0a748c28c3 V2.0 upgrade gradle to gradle-4.10.3, plugin 3.2 (#1671)
* upgrade gradle and gradle tools version to support app bundle

*  upgrade gradle
2019-01-28 17:05:56 +08:00
吴智明 1aa63adca6 allow cleartext HTTP traffic (#1664) 2019-01-17 15:36:53 +08:00
吴智明 2f6b44a2fc Change network module (#1655)
* 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
2019-01-14 16:26:32 +08:00
吴智明 aca87582d3 change macro setting to xcconfig on ios and mac platform (#1653)
* change macro setting to xcconfig on ios an mac platform

* remove unuse files
2019-01-08 11:48:21 +08:00
dreamtravel 094ce6b41d SDKWrapper新增public Context getContext() 接口 (#1635)
* SDKWrapper新增public Context getContext() 接口

* Update SDKWrapper.java

* Update SDKWrapper.java

* Update SDKWrapper.java

* Update SDKWrapper.java

* Update SDKWrapper.java
2018-12-19 11:03:05 +08:00
dreamtravel 79cb270254 remove AnySDK and Cocos Analytics, move both into Creator Service Panel (#1619)
* 移除cocos-2dx-lite的依赖external中的AnySDK和Cocos Analytics,转移这两者的集成到Service in Creator项目 修改Runtime默认工程,清理模版工程对AnySDK和Cocos Analytics的依赖

* 修改iOS link 模版

* 修改cocos2s-x-lite的deps目标
2018-12-07 17:32:44 +08:00
owen c9c6634e7e v2.0 skeleton optimize (#1603)
* v2.0 skeleton optimize

* v2.0 skeleton offical source file

* Rename jsbDragonBones to dragonbones
Rename jsbSpine to spine
Rename editor to middleware
Rename EditorManager to MiddlewareManager

* Rename Macro.h to MiddlewareMacro to avoid duplication of name

* Middleware update by js

* recover other ini generate

* Update cocos2dx-file.json

* createArrayBuffer support null point

* Rename MiddlewareMacro

* skeleton windows 工程

* add checkspace before write buffer

* add math include

* modify dragonBones to dragonbones

* modify dragonBones to dragonbones

* modify dragonBones to dragonbones

* remove useless code

* Change copyright time
2018-12-03 19:58:00 +08:00
leda 742b0462ac update gradle to 4.4, plugin 3.1.4 (#1589)
* update gradle to 4.4, plugin 3.1.4

* change Build.VERSION_CODES.LOLLIPOP to 21
2018-11-08 16:02:22 +08:00
Arnold 2dab6b175e [android] add compile switch for libtiff (#1565)
* add switch for libtiff

* add macro

* revert cocos2dx-files.json

* add more macro

* update default value

* update external/config.json
2018-10-29 10:15:38 +08:00
leda 71d8cf11ad refine native module separate (#1547)
* refine module separate -> gfx renderer

* refine module separate

* modify Application.mk, add macro

* “#if USE_GFX_RENDERER” means “#if USE_GFX_RENDERER > 0”

* improve macro define in binding code
2018-10-18 09:10:05 +08:00
leda 73f62c9da6 enable Proguard for release build on Android (#1545)
* enable Proguard for release build to reduce apk size

* add Proguard to default template

* consider anysdk at proguard

* remove un-used permissions

* disbale gfx & renderer binding register
2018-10-16 18:35:18 +08:00
leda beb45454ad support parse waitForConnect and debugPort from simulator/config.json (#1521)
* revert v8 debugger ip to 0.0.0.0 for simulator

* parse isWaitForConnect and debug port from config.json

* remove macro useless, since we parse the options from config.json
2018-09-26 18:57:56 -07:00
leda a5391aaabd add macro to support custom v8 debug option for creator (#1518)
* add macro to support custom v8 debug option for creator

* update console with version compare fixed

* revert debugger ip to 0.0.0.0 for template
2018-09-25 21:49:55 -07:00
leda 674614720e add v8 optional on macOS (#1515)
* add v8 libs into mac project

* update xcode simulator project config

* add v8 header into template

* add SCRIPT_ENGINE_V8 optional on macOS
2018-09-26 09:21:18 +08:00
Jare Guo bf7a01bdd5 Merge pull request #1508 from cocos-creator/v2.0-release
sync branch
2018-09-12 14:50:13 +08:00
leda 4ca166e109 dispatch show/hide event to js, included "cocos simulator" (#1500)
* add dispatchEnterBackgroundEvent for simulator

* more stable when set canvas size on win32

* add isNan check for float & double

* simplify event dispatch on AppDelegate
2018-09-06 16:39:45 +08:00
Jare Guo 63d7ba61e8 bump to 2.1 and merge commit v2.0-release into develop 2018-09-06 15:33:43 +08:00
leda 92b21a2264 add "launchmode" and "taskAffinity" on android (#1493) 2018-09-04 09:53:50 +08:00
Jare Guo caee68b1ff Merge pull request #1490 from cocos-creator/v2.0-release
sync branch
2018-08-30 15:09:48 +08:00
leda d92f07a5be beauty the "done" confirm button of EditBox on iOS & Android (#1464)
* chose a better color match for editbox button

* show editbox confirm button name depend on system language

* correct wrong order

* not magic number for this special color

* another empty line for strings.xml

* adapt color for iOS EditBox

* add editbox i18 strings for iOS mac

* use i18n strings

* simplfy string key, move i18n string location

* simplify get i18 string logic

* add i18n strings to link template

* same changes on default-template

* short i18 key on android
2018-08-21 14:18:05 +08:00
吴智明 5656a04593 remove facebook_id from gradle.properties (#1459) 2018-08-16 15:45:56 +08:00
Jare Guo 548ae4380d Merge branch 'v2.0-release' into next 2018-08-16 14:05:09 +08:00
leda a7f266b9e8 resume View Menu for simulator on mac & win32 (#1456)
* start add menu back

* simulator resume works

* readded scale feature, fix exit bug

* free SetupUI, and fix compile only

* adapt to CustomEvent from struct to class

* resume show/hide FPS feature

* Revert "free SetupUI, and fix compile only"

This reverts commit fd8cf5ca0a17ba62ae5dec46fefea3b58c267c9d.

* Revert "Revert "free SetupUI, and fix compile only""

This reverts commit 6e5934a583db286508d00a61a22e11a3325090f1.

* correct EXIT logic

* scale works

* show/hide fps works

* remove unneed menu, replace tab with space

* remove debug output info

* no need _isShowFPS member

* fix NSError init error
2018-08-16 09:34:47 +08:00
Jare Guo 625aafbf34 Merge branch 'v2.0-release' into next 2018-07-31 17:27:40 +08:00
minggo fdebbc77b7 dispatch show/hide event to js (#1424) 2018-07-26 09:32:37 +08:00
leda a816ffd743 modify android config, use clang (c++_static) to build (#1385)
* correct head file include error

* modify build tool to clang

* remove one useless file include

* remove armeabi files in 2d-x_files
2018-07-25 09:24:29 +08:00
吴智明 42c1904831 add facebook sdk support (#1378)
* add facebook sdk support

* add facebook support for default template

* add facebook support for link template

* add another space line
2018-07-24 16:49:54 +08:00
吴智明 bf72d76f14 add some support for facebook (#1402) 2018-07-24 13:38:35 +08:00
leda b3b37cf457 Add AssetsManager to iOS & Mac & Android & win32 (#1405)
* Add incomplete AssetsManager to iOS & Mac

* remove Android.mk refer on Xcode project config

* re-add assetmanager for android

* re-add assetmanager for win32 project config

* remove unused macro define for win32

* remove unused marco define COCOS2D_JAVASCRIPT

* added header include for assetsManager

* Add CCAsyncTaskPool

* Fix AssetsManager event trigger issue

* update win32 project config, added CCAsyncTaskPool

* add CCAsyncTaskPool to extensions Android.mk
2018-07-23 17:50:04 +08:00
leda 84326c92b9 addRegisterCallback should done before script engine start (#1400) 2018-07-19 10:48:26 +08:00
leda 64643b4922 fix build crash on android when enable AnySDK (#1397)
* disable anysdk comments in link template

* extra init callback when JNI_OnLoad

* add some comment to explain both init function

* sync changes from link template to default for android
2018-07-19 09:55:51 +08:00
leda b78d64a95a add return 0 in main funtion (#1391) 2018-07-13 17:59:24 +08:00
leda a142b03938 fix default template android lib path error (#1362) 2018-07-04 16:00:53 +08:00
leda 968678775c remove proj.android files for creator2.0 (#1352)
* remove proj.android files

* sync cocos-console changes
2018-07-03 10:46:40 +08:00
minggo 25bf7c5162 Remove jar (#1351)
* readd jar files

* remove unneeded file
2018-06-29 15:51:21 +08:00