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
Jare Guo
ccd3c113b0
Merge branch 'v2.0-release' into v2.1-release
...
# Conflicts:
# extensions/anysdk/platform/android/src/org/cocos2dx/javascript/SDKWrapper.java
2018-10-15 17:42:53 +08:00
Jare Guo
9002aa2941
Merge commit 'd7bd6fd369b09f6146e4e7ac93894864b87fb582' into v2.0-release
2018-10-15 17:34:45 +08:00
wen xing liao
a08759368b
complete check parameters ( #1542 )
...
* [bug] framebuffer-test.js complete check parameters
* [bug] complete check parameters
* [bug] framebuffer-object-attachment.js complete check parameters
* [bug] tex-input-validation.js complete check parameters
* [bug] read-pixels-test.js complete check parameters
* [bug] drawArrays complete check parameters
* Remove macro definition
* Remove macro definition
2018-10-12 14:13:18 +08:00
leda
ef4b74ee1e
support parse font size with float value ( #1543 )
2018-10-12 11:49:07 +08:00
leda
448b88cd49
update cocos2dx_files.json rules, reduce copy ( #1541 )
...
* update cocos2dx_files.json rules
* reduce files copy
2018-10-12 10:24:56 +08:00
leda
f539664522
fix editbox out of works after cc.game.restart ( #1540 )
...
* fix editbox out of works after cc.game.restart
* same things on android & win32
* replace tab with space
2018-10-11 17:44:00 +08:00
Arnold
9a1f054471
change field Application::_scheduler to static ( #1536 )
...
* make Applicatino::_scheduler static
* fix mac projfile
* keep scheduler permanent
* remove commented code
2018-10-11 11:22:08 +08:00
leda
cdd59a56fb
update travis work branch to v2.1-release ( #1539 )
2018-10-10 18:22:15 +08:00
leda
6d985793db
consider fillStyle alpha when draw text on win32 ( #1538 )
2018-10-10 18:12:26 +08:00
leda
89af43e38f
switch video player bind code from "manual" to "auto" ( #1537 )
...
* refine video bind, tested on iOS
* adapt Android.mk
2018-10-10 17:22:19 +08:00
leda
c8e145dadb
Re-added WebView on iOS & Android for Creator 2.1 ( #1535 )
...
* init add webview files form creator 1.10
* refine header & namespace to compile works
* add webview auto bindings, need check manually
* update webview auto bind
* add setFrame interface to support set View Rect
* uniform file name with other ui modules
* adapt to iOS
2018-10-10 16:03:23 +08:00
wuzhiming
dbbaa22a4a
revert code
2018-10-10 09:18:46 +08:00
wuzhiming
61db1068f8
add context getter for appActivity
2018-10-10 09:18:46 +08:00
wuzhiming
fb341236d7
add project.properties to instant template
2018-10-10 09:18:46 +08:00
wuzhiming
0083becb00
reset instant config to gradle.properties
2018-10-10 09:18:46 +08:00
wuzhiming
7cc0b4d34b
add instant template for google play instant
2018-10-10 09:18:46 +08:00
wuzhiming
7cbee1528b
add some support for instant games
2018-10-10 09:18:46 +08:00
yongminghuang
f30a886cd3
Fixed font size not recognized after setting Chinese font ( #1534 )
2018-10-09 15:50:44 +08:00
wen xing liao
011abf499e
[bug] complete check parameters ( #1533 )
...
* [bug] set getFramebufferAttachmentParameter return value according to webgl1.0
* fix Differences Between WebGL and OpenGL ES 2.0
* rename
* fix texImage2D when count is 0
* remove excess code
* [bug] complete check parameters
* [bug] complete check parameters
* [restructure] remove SE_PRECONDITION5
2018-10-09 11:10:15 +08:00
leda
c17130862c
Re-added VideoPlayer on iOS & Android for Creator 2.1 ( #1531 )
...
* add video player source for ios and android.
* revert un-clearly changes
* add iOS files into project config files
* remove useless declare property on 2d-x-lite
2018-10-08 15:28:19 +08:00
wen xing liao
f27e8f6761
fix null pointer exception ( #1530 )
2018-09-30 22:25:37 +08:00
leda
d7bd6fd369
update-2.0-console-to-1.10 ( #1525 )
2018-09-28 22:54:53 -07:00
wen xing liao
4c1dffb77a
Adaptation webgl 1.0 ( #1526 )
...
* Adaptation webgl 1.0
* redefine the variable name
2018-09-29 11:00:08 +08:00
yongminghuang
32cf40a710
improve EditBox on show style and keyboard hide logic for android platform ( #1522 )
...
* [bug] when too much text is input, the button blocks the text
* [adjust] button is displayed on a single line
* [adjust] judge the keyboard to pop up a quarter of the screen
2018-09-27 19:06:00 -07:00
leda
8d98e7fb15
fix wrong namespace on ( #1523 )
...
Device.getDeviceMotionValue
2018-09-27 19:42:17 +08:00
Jare Guo
41e6cb4ea6
Merge pull request #1519 from cocos-creator/develop
...
sync branch request: from develop to 2.1 release
2018-09-27 11:47:57 +08:00
leda
beb45454ad
support parse waitForConnect and debugPort from simulator/config.json ( #1521 )
...
* revert v8 debugger ip to 0.0.0.0 for simulator
* parse isWaitForConnect and debug port from config.json
* remove macro useless, since we parse the options from config.json
2018-09-26 18:57:56 -07:00
wdzhangchukong
687a798b20
fix: can not use italic font in canvas ( #1520 )
2018-09-26 02:37:27 -07:00
leda
a5391aaabd
add macro to support custom v8 debug option for creator ( #1518 )
...
* add macro to support custom v8 debug option for creator
* update console with version compare fixed
* revert debugger ip to 0.0.0.0 for template
2018-09-25 21:49:55 -07:00