Commit Graph

243 Commits

Author SHA1 Message Date
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
CocosRobot 8bd4fce92e [AUTO][ci skip]: updating cocos2dx_files.json (#1000) 2017-11-20 16:43:43 +08:00
CocosRobot 2c162cb6b4 [AUTO][ci skip]: updating cocos2dx_files.json (#985) 2017-11-14 18:34:20 +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
CocosRobot 4467d995f4 [AUTO][ci skip]: updating cocos2dx_files.json 2017-11-07 06:24:13 +00:00
CocosRobot 8a221ff7ea [AUTO][ci skip]: updating cocos2dx_files.json 2017-11-03 09:01:35 +00: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
CocosRobot d55cecd4af [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-26 09:27:37 +00:00
James Chen e5bd546b00 Fixes binary template compilation error on iOS and Mac. 2017-10-26 17:20:44 +08:00
CocosRobot bbd9bc666b [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-24 06:59:08 +00: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
CocosRobot 2ff8667734 [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-19 10:45:11 +00:00
CocosRobot 7a42a8a3c0 [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-19 10:02:42 +00:00
CocosRobot 68c8e98753 [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-19 02:05:22 +00:00
James Chen f46cb75958 Merge pull request #907 from 2youyou2/native-modules
support native modules
2017-10-19 09:51:40 +08:00
2youyou2 790ae1fcf4 fixed windows project 2017-10-18 10:26:26 +08:00
CocosRobot 92abdad8ac [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-17 06:05:06 +00: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 dbe0db18a3 Merge pull request #887 from dumganhar/jsb2.0
jsb_enable_debugger() uses local IP "0, 0, 0, 0", then Android debugging doesn't need to change IP.
2017-10-11 12:33:18 +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
CocosRobot 0f74e77a53 [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-11 01:59:14 +00:00
CocosRobot 2d01d405dd [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-10 08:55:16 +00: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
CocosRobot 8261ad33ee [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-09 17:29:13 +08:00
James Chen ac6d74a915 Updates templates. 2017-10-09 16:14:26 +08:00
CocosRobot 488b4462d6 [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-09 01:48:55 +00: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 4261b900f2 Removes old png file in ios project 2017-09-27 11:51:19 +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
CocosRobot dc78ef2d90 [AUTO][ci skip]: updating cocos2dx_files.json 2017-09-26 07:15:32 +00:00
Jare Guo 1ea2fc1715 revert TextureCache, use ThreadPool instead 2017-09-26 10:18:01 +08:00
CocosRobot 09476fdfa6 [AUTO][ci skip]: updating cocos2dx_files.json 2017-09-22 10:11:21 +00: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
CocosRobot d334a076c1 [AUTO][ci skip]: updating cocos2dx_files.json (#827) 2017-09-19 05:14:09 -05: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
CocosRobot 54410fb4a3 [AUTO][ci skip]: updating cocos2dx_files.json 2017-09-19 08:45:53 +00:00
CocosRobot 7469fc4911 [AUTO][ci skip]: updating cocos2dx_files.json 2017-09-15 08:55:35 +00: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
CocosRobot f1150aedfc [AUTO][ci skip]: updating cocos2dx_files.json 2017-09-14 08:48:44 +00:00