leda
fd29a5c395
fix android text render crash issue ( #1379 )
...
* prevent invalid canvas width and height set
* make restoreContext more stable
* improve canvas init for android
2018-07-10 18:14:06 +08:00
W-MTZing
daab4eab46
fix locadlstorage api getlength ( #1377 )
2018-07-06 17:03:56 +08:00
W-MTZing
12d91c2f2d
[feature] localStorage add api getKey and length ( #1371 )
2018-07-06 09:22:38 +08:00
minggo
3d51994bc8
readd jar files ( #1350 )
2018-06-29 15:47:06 +08:00
minggo
6c9b3f9b4a
fix template compiling error on android ( #1345 )
2018-06-29 14:56:30 +08:00
minggo
ea8a45b14f
Merge branch 'next' of github.com:cocos-creator/cocos2d-x-lite into merge-develop
2018-06-28 17:49:31 +08:00
W-MTZing
715ac5ae73
[bug] vibrate api Compatible with the higher version SDK ( #1341 )
2018-06-28 17:48:41 +08:00
minggo
9705967973
move analytics codes to game activity
2018-06-28 16:05:04 +08:00
minggo
5b8919ccdf
merge develop branch
2018-06-27 17:27:04 +08:00
W-MTZing
888e1fb4d6
[adjust]change cocos2dxHelper.java function api vibrate SDK Version judgment ( #1316 )
2018-06-19 10:42:30 +08:00
Vincent Yang
8f6e9adbe1
[feature] CCDownloader add header and abort support. ( #1291 )
...
* [feature] android implement recieve http header param, handle it in android http request (#2 )
* [feature] Recieve http header param, handle it in android http request
* [feature] implement abort and header api
* /2.0 -> /2
* remove task when abort
* [feature] Implement ios and mac downloader abort api (#3 )
* [feature] Implement ios and mac downloader abort api
* use DLLOG to show log
* judge NSURLSessionTask state with NSURLErrorCancelled
* [adjust] Modify downloader from auto bind to manually (#4 )
* [adjust] Modify Downloader createDownloadFileTask api from auto bind to manually
* Modify ini file
* [bug] fix Cocos2dxDownloader.java syntax error
* [bug] CCDownloader-android creatCoTask don't deleteLocalRef header str
2018-06-07 22:19:03 +08:00
minggo
e356ce9225
fix bug that: ( #1283 )
...
touch outside of editbox will not close editbox
glsurface view may not has focus when finish editbox input
2018-06-04 11:06:07 +08:00
James Chen
0b85e67caf
Supports text with bold. ( #1282 )
2018-06-02 18:46:12 +08:00
James Chen
cf7f3770b7
Supports drawing path API and refactor CCCanvasRenderingContext2D for macOS. ( #1280 )
...
* Uses CGBitmapContextCreate instead of NSImage for macOS, the CCCanvasRenderingContext2D is similiar as which on iOS now.
* Supports drawing line API.
* Supports drawing line API for Android too.
2018-06-01 22:59:07 +08:00
minggo
fbeb6dd200
Editbox ios support ( #1278 )
2018-06-01 14:12:03 +08:00
James Chen
da45e32ada
Removes unused files and code. ( #1277 )
2018-05-31 17:58:35 +08:00
James Chen
712173a8de
Supports DeviceMotionEvent and removes more unused code. ( #1275 )
...
* Binds Device class
* Removes ccFPSImage.c/h
* Updates Android.mk
* Supports DeviceMotionEvent and removes more unused code.
* Uses fprintf to implement SE_LOGD & SE_LOGE .
2018-05-31 14:08:20 +08:00
minggo
4ded383b8a
fix crash of editbox on Android ( #1273 )
2018-05-30 14:51:56 +08:00
minggo
7235644283
Editbox support ( #1270 )
...
can work on Android
2018-05-28 17:09:57 +08:00
James Chen
61accc6d11
Fixed the issue that text is probably cut. ( #1268 )
2018-05-28 11:45:07 +08:00
James Chen
391e6e536e
Supports text stroke for macOS, iOS and Android. ( #1250 )
...
* Supports stroke for mac.
* Supports text stroke for ios.
* Supports text stroke for android.
* typo fix in CanvasRenderingContext2DImpl.java.
2018-05-21 11:38:05 +08:00
James Chen
07cc734c8c
setAnimationInterval -> setPreferredFramesPerSecond and binds setPreferredFramesPerSeconds. ( #1244 )
...
* setAnimationInterval -> setPreferredFramesPerSecond.
* Binds setPreferredFramesPerSeconds.
* typo fix in CCApplication-win32.cpp
2018-05-16 18:06:26 +08:00
James Chen
58361e1b2d
Avoid to create canvas buffer twice. ( #1242 )
...
* Avoid to create canvas buffer twice.
* Remove unused condition code in Cocos2dxActivity.java
2018-05-15 11:00:52 +08:00
James Chen
727a4911d4
[runtime] Adds jsb.openURL, __getOSVersion, __getCurrentLanguage interfaces. ( #1238 )
2018-05-11 16:03:17 +08:00
James Chen
2e71076053
Display whether GL opt mode is enabled. ( #1217 )
2018-04-26 16:49:02 +08:00
James Chen
ae5c569345
Adds jsb.openDebugView interface, supports to display JSB invocation count. ( #1214 )
...
* Adds jsb.openDebugView interface, supports to display JSB invocation count.
* Removes unused log in JniImp.cpp.
* Removes unused log in Cocos2dxRenderer.java
2018-04-26 15:59:20 +08:00
James Chen
ad94db2c71
Binds getFramebufferAttachmentParameter and fix memory issues in uniform[1234]v. ( #1204 )
...
* Binds getFramebufferAttachmentParameter and fix memory issues in uniform[1234]v.
* FPS uses integer.
* revert.
* Removes unused import package.
2018-04-20 17:25:10 +08:00
James Chen
f944be8574
Adds DebugView support. ( #1203 )
2018-04-20 14:53:16 +08:00
James Chen
a1321302b4
Rename __gl to __ccgl to avoid conflict. Memory issue fixes in JSB_glGetProgramInfoLog and JSB_glGetShaderInfoLog ( #1201 )
...
* Revert "Removes FPS display code in Cocos2dxRenderer.java."
This reverts commit 71984ef41c .
* Rename __gl to __ccgl to avoid conflict.
* memory issue fixes in JSB_glGetProgramInfoLog and JSB_glGetShaderInfoLog
* Adds FIXME for FPS display in Cocos2dxRenderer.java.
2018-04-20 10:35:33 +08:00
James Chen
71984ef41c
Removes FPS display code in Cocos2dxRenderer.java.
2018-04-19 13:55:37 +08:00
James Chen
22c9dd2b5a
FPS output., file:// scheme check. glTexSubImage2D binding fix.
2018-04-12 14:57:34 +08:00
Joseph Pan
86607a472e
avoid a NullPointerException when domain is null ( #1186 )
...
* avoid a NullPointerException when domain is null
* catch NullPointerException for new URI operation
2018-04-08 09:44:29 +08:00
James Chen
73eb73c690
[android] textAlign supports 'middle'. recreate buffer in the constructor of CanvasRenderingContext2D. ( #1172 )
...
* [android] textAlign supports 'middle'. recreate buffer in the constructor of CanvasRenderingContext2D.
* bug fix in CanvasRenderingContext2DImpl.java
* java version 1.8
2018-03-29 15:50:38 +08:00
James Chen
febfbe67df
Custom TTF font is supported for Android too. ( #1155 )
2018-03-20 15:49:25 +08:00
James Chen
d1abdf6065
Adds Cocos2dxRenderer.setOnGameEngineInitialziedListener. ( #1152 )
2018-03-17 11:49:27 +08:00
James Chen
5122d14e24
[runtime] CocosRenderer.nativeInit supports to pass a default resource path. ( #1149 )
...
* FileUtils::setDefaultResourcePath fix.
* CocosRenderer.nativeInit supports to pass a default resource path.
2018-03-16 11:00:19 +08:00
James Chen
2c3a86f7b1
[new-renderer] Label on android works. ( #1146 )
...
* Android HelloWorld without label works.
* Label on android works.
2018-03-14 21:19:51 +08:00
minggo
cd0e15cd7f
refactor android with new renderer ( #1133 )
2018-02-28 14:55:33 +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
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
Jare Guo
db13242bde
Merge v1.6 into v1.8
...
# Conflicts:
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
2018-01-18 17:48:35 +08:00
Knox
1b0965803c
fix CocosAnalytics issue for fireball/issues/6730 ( #1058 )
2018-01-16 18:30:13 +08:00
Knox
7c81e99b67
add Volume and Mute to CCVideoPlayer for fireball/issues/6811 ( #1056 )
...
* add Volume and Mute to CCVideoPlayer for fireball/issues/6811
* refine code
2018-01-16 10:49:00 +08:00
James Chen
0cfbfd08f7
Kill process if Cocos2dxActivity.onDestroy is invoked to resolve crash if app goes to background for a long time and Activity is recycled by system. ( #1027 )
2017-12-12 11:10:51 +08:00
James Chen
2b463b2b84
Updates libcocosanalytics.jar
2017-11-07 16:05:22 +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
873cb81a27
Adds missing file CAAgentWrapper.java ( #933 )
2017-10-26 10:05:08 +08:00
James Chen
4c8e57762b
Adds jsb bindings of Cocos analytics for iOS and adds missing libcocosanalytics.jar.
2017-10-19 17:39:24 +08:00
knoxHuang
2027d2f752
fix fireball/issues/6475
2017-10-18 17:13:54 +08:00