Commit Graph

161 Commits

Author SHA1 Message Date
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
minggo 5b7cbcd9e7 Analytics issue (#1347)
* fix template compiling error on android

* fix compiling error on android
2018-06-29 15:26:40 +08:00
minggo 6c9b3f9b4a fix template compiling error on android (#1345) 2018-06-29 14:56:30 +08:00
minggo 3d561fa281 Merge branch 'next' of github.com:cocos-creator/cocos2d-x-lite into merge-develop 2018-06-28 16:38:39 +08:00
leda c9d7f54668 fix build error on win32/ios when using console (#1340) 2018-06-28 16:37:28 +08:00
minggo 9705967973 move analytics codes to game activity 2018-06-28 16:05:04 +08:00
leda 1d1c375516 correct copy jsb-adapter folder when build (#1338)
* update win32 build custom copy script

* update gradle build script

* update ios/macos project config
2018-06-28 13:50:24 +08:00
minggo 5b8919ccdf merge develop branch 2018-06-27 17:27:04 +08:00
PP 7e6ca8a445 change jsb.js load path (#1335) 2018-06-27 15:52:50 +08:00
leda 723f52a472 win32 link/default template compile and link pass, but not works when run (#1321)
* modify file changes on project config

* correct libcocos2d compile

* add win32 props back

* Revert "fix windows link template (#1138)"

This reverts commit 332d95e5b8.

* correct compile error

* many link errors need to be solved

* added part lack methods

* add empty impl for canvas rendering context 2d

* update main.cpp

* correct audio/network compile and link error

* sync win32 application logic with mac

* remove wrong change on application-win32

* correct win32 default-template compile and link error

* win32 simulator part compile error fixed

* editbox define changes
2018-06-22 10:19:31 +08:00
leda 602636c855 link template works on mac, ios, android studio (#1310)
* re-add cocos-analytics for iOS

* include jsb_cocos2dx_network_manual into xcode project

* add jsb_module_register into cocos2d_libs xcode proj

* ios, mac link template adapt

* link template adapt for android studio

* add external a line space for gitignore

* update the returen value of cocos2dVersion()

* change "Cocos Runtime" into "Cocos Game" for template project
2018-06-11 17:21:42 +08:00
leda 89901807a5 default template works on android studio (#1307)
* adapt android studio build config files, compile success

* remove hard coded sign info

* remove  -DHAVE_INSPECTOR, it have been defined in config.hpp

* remove anysdk related code

* revert wrong remove of anysdk and CocosAnalytics
2018-06-08 15:05:33 +08:00
leda f82a4782ff default template works on iOS (#1304)
* adapt ios controller, run success on ios device

* improve app controller by research runtime example
2018-06-07 17:07:17 +08:00
minggo 05bb9d46e4 [ci skip]default template works on mac (#1300) 2018-06-06 17:59:21 +08:00
minggo 160cbe8af3 template adpat (#1284) 2018-06-04 17:50:30 +08:00
James Chen 669f3cecb3 cocos_android_app_init returns Application*. 2018-04-19 11:17:18 +08:00
吴智明 173588b4ae remove proj.android folder and remove config from cocos-project-template.json (#1182) 2018-04-04 18:11:50 +08:00
Jare Guo 58f7ea35c4 Merge v1.8 into develop 2018-04-04 17:09:49 +08:00
James Chen 4da873ecb8 Merge branch 'v1.8' into develop
# Conflicts:
#	cocos/scripting/js-bindings/script/jsb_cocos2d.js
2018-02-23 10:26:48 +08:00
James Chen 3e5f8dd0f2 API Level is minSDKVersion now. 2018-02-05 11:18:13 +08:00
James Chen 52154d5f04 Best gradle configuration for Android. 2018-02-05 11:09:29 +08:00
Jare Guo d9bd3d763c update license (#1089)
* updating license

* update license
2018-02-01 15:20:01 +08:00
James Chen 69798998db Adds cc.sys.getBatteryLevel & cc.sys.getNetworkType APIs (#1071)
* Adds cc.Device.getBatteryLevel interface.

* Adds CCReachability.h/.cpp

* Adds CCReachability.h/.cpp

* Reachability supports macOS either.

* Adds cc.Device.getNetworkStatus interface.

* Removed debug log.

* cc.Device.NetworkStatus -> cc.Device.NetworkType

* API to sys namespace

* Update CCDevice-win32.cpp
2018-01-29 17:37:15 +08:00
Knox 1b0965803c fix CocosAnalytics issue for fireball/issues/6730 (#1058) 2018-01-16 18:30:13 +08:00