Commit Graph

4804 Commits

Author SHA1 Message Date
CocosRobot c3098499ec [AUTO][ci skip]: updating cocos2dx_files.json (#1303) 2018-06-07 16:03:29 +08:00
minggo 6ed6d33bca update external version 2018-06-07 10:58:16 +08:00
CocosRobot a4ad62c3f5 [AUTO][ci skip]: updating cocos2dx_files.json (#1302) 2018-06-07 10:37:20 +08:00
James Chen b186f78f75 Update config.json 2018-06-07 10:15:16 +08:00
minggo 05bb9d46e4 [ci skip]default template works on mac (#1300) 2018-06-06 17:59:21 +08:00
CocosRobot aaf5bd712f [AUTO][ci skip]: updating cocos2dx_files.json (#1299) 2018-06-06 15:47:30 +08:00
minggo ec1fb11244 ignore some files (#1297) 2018-06-06 15:15:06 +08:00
CocosRobot d0f28d3959 [ci skip][AUTO]: updating jsbinding automatically (#1296) 2018-06-06 14:58:00 +08:00
minggo 888433c819 fix travis error (#1295) 2018-06-06 14:48:19 +08:00
minggo 616c566c33 print log message (#1294) 2018-06-06 14:24:56 +08:00
minggo 3f94844b1e modify to trigger travis (#1293) 2018-06-06 11:43:42 +08:00
minggo 2c9a52d667 fix secure issue (#1292)
* fix secure issue

* check variable in its file
2018-06-06 09:58:44 +08:00
minggo 83def20953 use ndk r16b in travis (#1290) 2018-06-05 12:07:19 +08:00
minggo a0c139a61d check binding logic when sending a pull request (#1289) 2018-06-05 11:25:34 +08:00
minggo 8c708f880a fix path issue (#1288) 2018-06-05 10:49:23 +08:00
minggo 9d807ec642 fix tar usage (#1287) 2018-06-05 10:33:08 +08:00
minggo b1074926ab fix travis issue (#1286)
* fix extract file path

* download clang
2018-06-05 09:54:16 +08:00
minggo 160cbe8af3 template adpat (#1284) 2018-06-04 17:50:30 +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 cad6cb9971 Uses the same CCCanvasRenderingContext2D for apple platforms (iOS/macOS). (#1281) 2018-06-02 17:52:54 +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 5a06e1da7a send complete message when touch outside editbox (#1279) 2018-06-01 17:44:19 +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 5245664704 Adds Device::getDeviceModel method. (#1276) 2018-05-31 14:13:28 +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
吴智明 1fac8ddf89 add stderr for logE , so that creator can separate logs and errors (#1274)
* add stderr for logE , so that creator can separate logs and errors

* use FILE* as params to print logs and errors for windows
2018-05-31 14:07:26 +08:00
吴智明 99dc50873c move unuse config.json from binary template (#1271) 2018-05-31 09:56:56 +08:00
minggo 4ded383b8a fix crash of editbox on Android (#1273) 2018-05-30 14:51:56 +08:00
Jare Guo 2663fe890b Merge commit 'da9b357166b8d2c2e5877d7ff74397bfdb5c9a51' into develop 2018-05-29 14:22:12 +08:00
James Chen d54f1943b8 Keyboard Event works. (#1267)
* Keyboard Event works.

* Adds todo.

* temp commit for keyboard event.

* Keyboard event handle all keys.
2018-05-28 18:53:57 +08:00
minggo 7235644283 Editbox support (#1270)
can work on Android
2018-05-28 17:09:57 +08:00
James Chen a95dc1b889 jsb.loadImage supports to parse http URL and CCDownloader-android.cpp fix. (#1269)
* jsb.loadImage supports to parse http URL.

* CCDownloader-android.cpp fix.
2018-05-28 14:56:42 +08:00
James Chen 61accc6d11 Fixed the issue that text is probably cut. (#1268) 2018-05-28 11:45:07 +08:00
James Chen 1556a16e27 ccVertexAttribPoiner fix. (#1266) 2018-05-24 17:20:32 +08:00
James Chen 287f085c0d Sync 1.9 changes, se::Object::clearPrivateData takes a parameter 'clearMapping' to indicate whether to clearMapping in this function. (#1265)
* Adds TODO in restartVM bindings.

* Sync 1.9 changes, se::Object::clearPrivateData takes a parameter 'clearMapping' to indicate whether to clearMapping in this function.

* Removes unused function recreate_seval_by_native_ptr.
2018-05-24 16:50:21 +08:00
James Chen da9b357166 Fix potential issues in the mode of cpp controls js object's lifecycle. (#1264)
* Fix potential issues in the mode of cpp controls js object's lifecycle.

* Updates comments when using clearPrivateData(false);
2018-05-24 16:32:27 +08:00
James Chen 73537df727 bufferWidth and bufferHeight check in CCCanvasRenderingContext2D. (#1262)
* Removes unused logic in EventDispatcher::dispatchTickEvent.

* Uses __jsbObj directly, dispatch enter background & foreground event

* bufferWidth and bufferHeight check in CCCanvasRenderingContext2D.
2018-05-24 14:38:55 +08:00
CocosRobot a0510b7a5b [ci skip][AUTO]: updating jsbinding automatically (#1258) 2018-05-24 09:37:32 +08:00
James Chen 1bb1806099 Supports Compressed Textures. (#1260)
* Updates CCConfiguration.h/.cpp.

* Supports Compressed Textures.

* Constructs Configuration singleton in Application constructor.

* Move Configuration::getInstance after createView.
2018-05-23 19:10:49 +08:00
minggo f8167e6053 fix crash when running example tests (#1259) 2018-05-23 10:33:20 +08:00
Knox 200ee480ad fix fireball/issues/7338 (#1257) 2018-05-22 17:50:34 +08:00
James Chen 5f4e814ade Supports mouse event for desktop platforms. (#1256) 2018-05-22 14:03:54 +08:00
minggo ef2b666f38 update binding gererator (#1255) 2018-05-22 09:49:21 +08:00
minggo ccc8691029 fix crash when parsing Effect property (#1254) 2018-05-22 09:32:06 +08:00
James Chen 442c149053 Implements Application::restart and some fixes. (#1253)
* Implements Application::restart.

* SAFE_DEC_REF should reset pointer to nullptr.

* Class::cleanup should be after of JSGlobalContextRelease.

* WebGLObject needs to be released if ScriptEngine is in cleanup process.

* Fixes memory leak in JSB_glGetActiveAttrib
2018-05-21 18:46:12 +08:00
PP 8ece604c17 fix dragonBones parseTextureAtlasData bug (#1247) 2018-05-21 14:14:10 +08:00
James Chen 04fa653ab0 Updates bindings-generator to official repo. (#1251) 2018-05-21 14:08:20 +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