Commit Graph

4804 Commits

Author SHA1 Message Date
CocosRobot 5c4e691465 [AUTO][ci skip]: updating cocos2dx_files.json (#1598) 2018-11-16 16:52:55 +08:00
Arnold 9073cfe964 ignore server cert verification (#1597) 2018-11-15 21:17:35 +08:00
W-MTZing b33e14c0d1 Add GL_STENCIL_BITS at glGetParameter (#1595) 2018-11-15 10:28:42 +08:00
wdzhangchukong 1b99f965eb Add USE_V8_DEBUGGER to control chrome debugger (#1594)
* Add USE_V8_DEBUGGER to control chrome debugger

* Add USE_V8_DEBUGGER in ccConfig.h

* Fix error

* Define macro in config.hpp
2018-11-14 18:17:05 +08:00
leda 2a3d5832cf use reflect to call setFontFeatureSettings (#1593) 2018-11-13 16:24:55 +08:00
wen xing liao f30af4d3ce webgl function complete check parameters (#1591) 2018-11-12 13:59:48 +08:00
Jare Guo 4da7c8b39c Merge commit '19b1757cfaf25cdc441fe4c8639bb1bef039a325' into v2.1-release 2018-11-09 16:27:38 +08:00
wen xing liao 287b4e75e8 add macro OPENGL_PARAMETER_CHECK (#1590) 2018-11-09 14:12:22 +08:00
Arnold 8789c8ea89 [Android] jsb_global_load_image use network::Downloader to fetch content (#1584)
* fix issue #739, use Downloader instead of HttpClient

* remove unused variable

* revert downloader, default Downloader is not required

* revert

* add empty check

* add download cache
2018-11-08 16:53:10 +08:00
leda 742b0462ac update gradle to 4.4, plugin 3.1.4 (#1589)
* update gradle to 4.4, plugin 3.1.4

* change Build.VERSION_CODES.LOLLIPOP to 21
2018-11-08 16:02:22 +08:00
Arnold e612da914f upgrade Tremolo to v0.08 (#1586)
* update tremolo files

* update deps to next-8
2018-11-07 23:55:51 +08:00
leda 52adcf9a34 adapt google instant template to creator 2.1 (#1585)
* add native module divide into instant app Application.mk

* minify java code Enabled

* gcc -> clang

* add macro to game target
2018-11-07 17:46:05 +08:00
bofeng-song ae7ae2f24f [bug] fix logic error (#1582)
* [bug] fix logic error

* [refines] add remarks
2018-11-05 14:59:27 +08:00
吴智明 19b1757cfa changer version of cocos2d-console (#1583) 2018-11-05 14:46:33 +08:00
W-MTZing 7887ec90e6 fix rendertexture can not work correctly sometimes (#1581) 2018-11-02 21:45:32 +08:00
leda 003bed310c improve CCData memory control (#1580) 2018-11-01 17:43:21 +08:00
leda 10f764b51f fix win32 compile error in CanvasContex (#1579) 2018-11-01 15:40:54 +08:00
minggo a82655e716 use swtich/case instead of if/else to improve performace (#1578) 2018-11-01 14:37:02 +08:00
minggo 02b3458c56 rebound texture (#1573) 2018-11-01 11:41:41 +08:00
bofeng-song 1d642605e1 [features] support oblique(font-style) and smallCaps(font-variant) (#1577)
* [features] support oblique(font-style) and smallCaps(font-variant)

* [refine] add Remarks, change constant value to system default
2018-10-31 20:06:03 +08:00
leda 40731fbcbb free global g_textInputCallback before ScriptEngine clean up (#1576) 2018-10-31 15:12:12 +08:00
leda 6f18333fb3 free global g_textInputCallback before ScriptEngine clean up (#1575)
* Revert " fix editbox out of works after cc.game.restart (#1540)"

This reverts commit f539664522.

* free global g_textInputCallback before ScriptEngine clean up

* format beauty: tab -> space in editbox-android
2018-10-31 14:49:50 +08:00
leda 1a024ce8a4 add empty Impl lineCap/setLineJoin on win32/apple (#1572) 2018-10-30 17:50:30 +08:00
leda 2b4f711fea update-console, include apk install logic improve (#1571) 2018-10-30 14:59:35 +08:00
wen xing liao 5bef70b34d fix java IllegalArgumentException (#1570)
* fix java IllegalArgumentException

* Remove multiple parameter checks
2018-10-30 11:59:31 +08:00
bofeng-song 77e5eb3e56 [feature] support lineCap and lineJoin (#1569)
* [feature] support lineCap and lineJoin

* [refine] move precondition to c++ layer
2018-10-29 20:50:54 +08:00
Arnold 01acfa4327 XMLHttpRequest fix readyState during onabort callback (#1567)
* fix http request readyState after abort()

* ignoreonreadystatechange when abort
2018-10-29 18:17:44 +08:00
Arnold 31946b642d XMLHttpRequest.abort readyStatue should be 0 (#1564) 2018-10-29 10:19:07 +08:00
Arnold 2dab6b175e [android] add compile switch for libtiff (#1565)
* add switch for libtiff

* add macro

* revert cocos2dx-files.json

* add more macro

* update default value

* update external/config.json
2018-10-29 10:15:38 +08:00
leda 2a4e5aa498 fix wrong @Override mark when build with API-Level = 16 (#1563) 2018-10-26 14:22:48 +08:00
leda 7c93a11905 runtime require: add context2d fill/rect method for android (#1561)
* add context2d fill & rect method for android

* workaround: draw a hairline to cover the border

* fix clear&fillrect parameter error

* add empty impl on Apple

* add empty Imple in win32

* enable "SUBPIXEL_TEXT_FLAG" flag to make the text more clear on Android

* move putImageData impl to native

* add empty _fillImageData impl on win32 & apple
2018-10-26 13:44:03 +08:00
wen xing liao 61bfcce6fa webgl function complete check parameters (#1553)
* Remove duplicate parameter check

contains drawArrays, drawElements, getBufferParameter, getRenderbufferParameter

* Remove duplicate parameter check

* complete check parameters

contains getUniformLocation, getShaderParameter, getProgramParameter, getProgramInfoLog, getShaderInfoLog, getShaderSource, getAttachedShaders, getFramebufferAttachmentParameter, getUniform

* complete check parameters

contains getUniformLocation, getShaderParameter, getProgramParameter, getProgramInfoLog, getShaderInfoLog, getShaderSource, getAttachedShaders, getFramebufferAttachmentParameter, getUniform

* getRenderbufferParameter complete check parameters

* getBufferParameter complete check parameters

* getFramebufferAttachmentParameter complete check parameters

* getVertexAttrib complete check parameters

* getUniform complete check parameters

* createShader complete check parameters

* Remove invalid code

* optimization getUniform
2018-10-25 11:13:56 +08:00
leda 9c4f07f09a remove libchipmunk Ref on VS project config (#1560) 2018-10-24 15:52:34 +08:00
minggo 0fe162ad88 fix typo (#1559) 2018-10-23 18:04:14 +08:00
Arnold 951869f9b9 [jsb] XMLHttpRequest & WebSocket API standardize (#1557)
* xmlhttprequest statusText exclude numeric code

* websocket bufferedBytes

* websocket extensions attribute

* add websocket close arguments

* responseXML

* fix ios compile

* responseType document

* getExtensions

* rollback change for responseXML

* fix arg 1005

* use const_cast instead of create tmp value
2018-10-23 11:57:23 +08:00
minggo a8770252e4 fix bug that rendertexture can not work correctly sometimes (#1556) 2018-10-23 09:48:38 +08:00
Jare Guo fbea90a258 Merge branch 'v2.0-release' into v2.1-release 2018-10-22 15:40:45 +08:00
Jare Guo fe121b0494 Merge gpi into v2.0-release
# Conflicts:
#	templates/js-template-android-instant/frameworks/runtime-src/proj.android-studio/game/AndroidManifest.xml
2018-10-22 15:40:15 +08:00
leda 738da04065 fix js_saveImageData memory leak (#1555) 2018-10-19 19:25:28 +08:00
leda d1c1457d2a keep alpha channel when save PNG image (#1554) 2018-10-19 17:28:12 +08:00
leda 4ddd2aee0d close audio device properly (#1552) 2018-10-19 17:03:06 +08:00
leda c6fbabc6f4 separate v8 debugger from android release build (#1551)
* seprate v8 debugger from release build

* update xcode project config

* update win32 project config

* update external config
2018-10-19 12:45:11 +08:00
吴智明 09b3f033a1 Gpi change manifest (#1550)
* add autoVerify property for intent-filter

* add add http and https support
2018-10-19 12:29:51 +08:00
leda dada2eb244 move "cocos2d::experimental::" to "cocos2d::" on Audio (#1549)
* remove “experimental” in audio dir

* update audio bindings

* fix "{" match error

* no need "experimental" for thread pool

* remove both out-of-date js api files
2018-10-18 13:34:12 +08:00
wen xing liao d432a9643e 调整WebGL函数功能 (#1544)
* [feature] add getRenderbufferParameter and getBufferParameter function

* [adjust] adjust getParameter  function

* [refine] refine getParameter function

* [adjust] adjust getParameter function

* [bug] drawElements complete check parameters

* Remove duplicate parameter check

contains drawArrays, drawElements, getBufferParameter, getRenderbufferParameter

* Remove duplicate parameter check
2018-10-18 10:30:57 +08:00
leda 71d8cf11ad refine native module separate (#1547)
* refine module separate -> gfx renderer

* refine module separate

* modify Application.mk, add macro

* “#if USE_GFX_RENDERER” means “#if USE_GFX_RENDERER > 0”

* improve macro define in binding code
2018-10-18 09:10:05 +08:00
Arnold a64bfd39ac fix 2018-10-17 19:49:21 +08:00
Jare Guo 35d0a0b19f Merge 2.0.2 into gpi 2018-10-17 18:47:09 +08:00
吴智明 a047891c9e add package name for instant activity (#1546) 2018-10-17 09:41:33 +08:00
leda 73f62c9da6 enable Proguard for release build on Android (#1545)
* enable Proguard for release build to reduce apk size

* add Proguard to default template

* consider anysdk at proguard

* remove un-used permissions

* disbale gfx & renderer binding register
2018-10-16 18:35:18 +08:00