Commit Graph

119 Commits

Author SHA1 Message Date
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
James Chen 901f4fa50c Auto hide home indicator for iPhoneX. (#1013) 2017-11-28 13:36:14 +08:00
James Chen cdad6b5868 Some Android Simulators don't support SSE instruction, so disable it for x86 arch. (#1011) 2017-11-23 15:13:34 +08:00
yinkaile decf8f0b99 fixed windows binary template (#975) 2017-11-09 17:37:19 +08:00
James Chen 7739e2c47d Updates template AndroidManifest.xml. 2017-11-07 16:05:44 +08:00
James Chen 6a8106c5f3 Updates Cocos Analytics relevant code.
Adds missing onPause, onResume, onDestroy invocation.
Disabled local debug by default.
Uses AnySDK channel ID in APK or IPA file if channel ID isn't found.
2017-11-03 15:19:03 +08:00
James Chen 50d6a4947d Reverts jniLibs.srcDir 2017-11-02 11:50:09 +08:00
James Chen 2c793ac5ba Android Studio 3.0 Support.
Depends on https://github.com/cocos-creator/cocos2d-console/pull/49
2017-10-30 11:28:34 +08:00
James Chen e5bd546b00 Fixes binary template compilation error on iOS and Mac. 2017-10-26 17:20:44 +08:00
yinkaile df09438eab Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop 2017-10-23 11:47:01 +08:00
yinkaile c141be5a7c fixed android binary template 2017-10-23 11:46:28 +08:00
2youyou2 790ae1fcf4 fixed windows project 2017-10-18 10:26:26 +08:00
yinkaile 8ac7257a46 fixed merge errors 2017-10-12 18:15:21 +08:00
yinkaile d38e168441 support native modules 2017-10-12 17:35:08 +08:00
James Chen e1ac3249a2 jsb_enable_debugger() uses local IP "0, 0, 0, 0", then Android debugging doesn't need to change IP. 2017-10-11 12:30:08 +08:00
James Chen d0992f2b2c Updates win32 templates to link libuv. 2017-10-10 14:35:24 +08:00
James Chen 2e3e474c3e [android] Adds APP_CFLAGS for template projects. 2017-10-10 14:28:51 +08:00
James Chen 3c74a04612 Fix compilation error while enabling libuv. Updates win32 template to remove include path of spidermonkey. 2017-10-09 17:29:13 +08:00
James Chen ac6d74a915 Updates templates. 2017-10-09 16:14:26 +08:00
2youyouo2 859b9b1302 remove copy_resources from android-studio build-cfg.json 2017-09-29 16:10:56 +08:00
2youyouo2 bc8c5c1bee add xxtea support 2017-09-27 16:03:07 +08:00
James Chen 5f19e5d7c2 iPhone X fullscreen support. Uses Images.xcassets for AppIcon and storyboard for launchscreen. 2017-09-26 18:12:30 +08:00
James Chen a0a312814d Merge branch 'v1.6' of git://github.com/cocos-creator/cocos2d-x-lite into fix/jsb2.0-sync-v1.6 2017-09-22 17:32:36 +08:00
pandamicro c7e63f3769 Adjust png refs in xcode project 2017-09-20 17:49:33 +08:00
pandamicro a83f52142f Fix screen resolution issue on iOS 2017-09-20 17:25:26 +08:00
James Chen 7f4088eb4a Win32 template fix, LOGD could output log in vs in se module. (#826)
* Win32 template fix, LOGD could output log in vs in se module.

* Updates config.json
2017-09-19 05:09:07 -05:00
James Chen f19fb0b1f8 [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. 2017-09-15 10:41:32 +08:00
2youyouo2 d6b884f40e fixed anysdk folder structure 2017-09-14 14:45:49 +08:00
2youyouo2 81bb1ed5e0 Merge branch 'v1.6' of github.com:cocos-creator/cocos2d-x-lite into anysdk 2017-09-12 14:35:15 +08:00
2youyouo2 9c12fcb2d9 add jailbreak anysdk files 2017-09-12 14:31:50 +08:00
James Chen 53e07c1da7 Merge branch 'v1.6' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0 2017-09-07 18:32:24 +08:00
James Chen 5eba72627a [jsb2.0] SpiderMonkey debugger works. Adds ScriptEngine::enableDebugger, mainLoopUpdate interfaces. 2017-09-07 18:19:38 +08:00
Wang Nan 83cd6f465b Merge pull request #795 from 2youyou2/v1.6
fixed android-studio debug error
2017-09-01 15:11:09 +08:00
2youyouo2 672d00478f fixed android-studio debug error 2017-09-01 11:18:27 +08:00
James Chen 45f8d3ee63 updates templates. 2017-08-29 18:00:51 +08:00
James Chen 99c1b24256 Merge branch 'develop' into jsb2.0 2017-08-28 14:38:47 +08:00
James Chen 621ff28b4a Merge branch 'v1.6' into develop
# Conflicts:
#	cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp
#	cocos/scripting/js-bindings/manual/BaseJSAction.cpp
#	cocos/scripting/js-bindings/manual/BaseJSAction.h
#	cocos/scripting/js-bindings/manual/ScriptingCore.cpp
#	cocos/scripting/js-bindings/manual/ScriptingCore.h
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp
#	cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
#	cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp
#	cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp
#	cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp
#	cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm
#	cocos/scripting/js-bindings/manual/spidermonkey_specifics.h
#	cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp
#	cocos/scripting/js-bindings/proj.android/Android.mk
#	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
#	cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj
#	cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters
#	cocos/scripting/js-bindings/script/jsb_debugger.js
#	extensions/anysdk/js-bindings/SDKManager.cpp
#	extensions/anysdk/js-bindings/manualanysdkbindings.cpp
#	templates/cocos2dx_files.json
#	templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
#	templates/js-template-link/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
#	tools/tojs/cocos2dx.ini
#	tools/tojs/cocos2dx_experimental_webView.ini
2017-08-28 14:23:30 +08:00
Wang Nan e63561f9c1 Merge pull request #772 from 2youyou2/v1.6
update build tool version and gradle version
2017-08-23 14:14:33 +08:00
2youyouo2 19be5234c7 refine build.gradle 2017-08-23 10:45:28 +08:00
2youyouo2 49bfa517f2 update build tool version and gradle version 2017-08-23 10:45:07 +08:00
James Chen 2f38e872c1 Action binding bug fix. 2017-08-22 16:50:41 +08:00
James Chen e58401f0fa updates template 2017-08-18 14:44:44 +08:00
pandamicro 6ed7b716d8 Merge pull request #762 from pandamicro/v1.6
Fix iOS closing app crash
2017-08-18 14:22:37 +08:00
pandamicro e863e9b7d9 Fix iOS closing app crash 2017-08-18 11:55:12 +08:00
2youyouo2 93862c24fa fixed not copy .so files when first build android-studio project 2017-08-16 17:44:18 +08:00
James Chen f9911434e2 Updates template's AppDelegate.cpp 2017-08-16 11:18:05 +08:00
2youyouo2 a2d0955bed should use v140 for 15.0 VisualStudioVersion 2017-07-26 16:08:01 +08:00
pandamicro d67ef36f36 Merge pull request #714 from pandamicro/develop
Improve iOS project in templates
2017-07-19 18:07:59 +08:00
pandamicro 2c7e127539 Rearrange anysdk files in iOS project 2017-07-19 17:59:54 +08:00