Commit Graph

963 Commits

Author SHA1 Message Date
wdzhangchukong e41cb4dcc8 Fix crash when param type error (#1390) 2018-07-13 17:07:17 +08:00
minggo e299f74392 fix editbox issue (#1389)
app will crash if missing some properties
2018-07-13 16:22:12 +08:00
minggo 91719d5d94 convert data to RGBA888 when it is not (#1388) 2018-07-13 15:28:56 +08:00
wdzhangchukong 83d9a6fbff Provide loadImage api for runtime (#1374)
* Provide loadImage api for runtime

* Declare the jsb_global_load
2018-07-06 11:52:29 +08:00
W-MTZing 12d91c2f2d [feature] localStorage add api getKey and length (#1371) 2018-07-06 09:22:38 +08:00
Arnold c61d61682a Fix 7818 (#1370)
* fix: #7818

* fix: 7818

* add callback typecheck, should be function
2018-07-06 09:20:26 +08:00
leda 538f4b5df0 correct seLog declare error (#1356) 2018-07-02 20:54:24 +08:00
minggo 8e86f09df8 remove unneeded js script 2018-06-28 10:47:49 +08:00
minggo 5b8919ccdf merge develop branch 2018-06-27 17:27:04 +08:00
Jare Guo fe9ddce320 sync some files with develop (#1329) 2018-06-27 11:11:01 +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
minggo 467b0346ce editbox support mac (#1322) 2018-06-21 09:25:56 +08:00
wuzhiming bc31a3993a use gzip to decompress js content 2018-06-19 15:44:12 +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
James Chen c7801b75f8 Minor fixes while running on macOS with V8 script engine. (#1305) 2018-06-07 16:08:06 +08:00
minggo 05bb9d46e4 [ci skip]default template works on mac (#1300) 2018-06-06 17:59:21 +08:00
CocosRobot d0f28d3959 [ci skip][AUTO]: updating jsbinding automatically (#1296) 2018-06-06 14:58:00 +08:00
minggo 160cbe8af3 template adpat (#1284) 2018-06-04 17:50:30 +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
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 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
James Chen 5f4e814ade Supports mouse event for desktop platforms. (#1256) 2018-05-22 14:03:54 +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 ee5faac763 Move logic of flipY and premultiplyAlpha from jsb_opengl_manual.cpp to CCGLUtils.cpp. (#1249)
* Native Renderer supports GL_UNPACK_FLIP_Y_WEBGL & GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL.
And adds ccFlipYOrPremultiptyAlphaIfNeeded, ccIsUnpackFlipY, ccIsPremultiplyAlpha, ccPixelStorei GL utils.

* seval_to_TextureSubImageOption: uint16_t* -> uint32_t* since width * height * 4 may bigger than 65536 bytes.

* Move logic of flipY and premultiplyAlpha from jsb_opengl_manual.cpp to CCGLUtils.cpp.

* Reverts.
2018-05-18 15:53:28 +08:00
minggo 8a76997242 adapt mac resolution (#1248) 2018-05-18 11:57:12 +08:00
minggo 7a2a9374ec Technique support setting COLOR4 and COLOR3 (#1246) 2018-05-17 16:15:51 +08:00
minggo 4a13d0e15e Downsample (#1245)
* support render texture

* use texture unit 0

* add functions to set device pixel ratio

* add ccDeleteBuffers again

* fix according comments
2018-05-17 14:05: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 357d87d8bc WebGLObject inherits from cocos2d::Ref. autorelease it instead of deleting it to avoid to use invalid WebGL objects. (#1243) 2018-05-16 10:18:58 +08:00
James Chen 2e174ff1c2 Supports dispatching custom event for EventDispatcher. (#1240)
* Adds __jsbInvocationCount for SpiderMonkey.

* Supports dispatching custom event for EventDispatcher.
2018-05-14 17:19:03 +08:00
Jare Guo e628bd2d97 Merge branch 'v1.9' into develop 2018-05-14 11:12:39 +08:00
James Chen 6ff58a79df FlipPixelsY logic fix. (#1239) 2018-05-11 21:42:43 +08:00
James Chen 727a4911d4 [runtime] Adds jsb.openURL, __getOSVersion, __getCurrentLanguage interfaces. (#1238) 2018-05-11 16:03:17 +08:00
James Chen 2fec8318f8 Fix incorrect assertion if creating GLProgram in JS. (#1233) 2018-05-11 10:46:02 +08:00
James Chen 6df1923235 [jswrapper] Object::defineFunction fix for SpiderMonkey port, the function must be able to be enumrated and permanent. (#1232) 2018-05-08 18:14:35 +08:00
minggo 9ca6dac357 fix musk issue (#1231) 2018-05-08 11:21:41 +08:00
minggo 12676d6f2b put debug related files into debugger folder 2018-04-28 14:37:09 +08:00