Commit Graph

4731 Commits

Author SHA1 Message Date
pandamicro 475ea35b0c fix sort bug in Scale9Sprite data pool 2017-08-24 17:15:23 +08:00
pandamicro e940eb948a Fix JSB_EditboxDelegate crash if js delegate has already been garbage collected 2017-08-18 16:25:50 +08:00
Jare Guo d6216bbcd6 Merge pull request #1906 from knoxHuang/Fix_TiledMap
open DepthTest to TMXLayer for fireball/issues/6270
2017-08-17 14:06:26 +08:00
knoxHuang c3c69a588d refine code 2017-08-17 13:42:10 +08:00
knoxHuang cdff857443 open DepthTest to TMXLayer for fireball/issues/6270 2017-08-16 17:47:54 +08:00
Jare Guo a567b0b512 Merge pull request #1905 from knoxHuang/Fix_WebView
add setJavascriptInterfaceScheme and setOnJSCallback to webview for f…
2017-08-16 17:38:19 +08:00
knoxHuang 7ce5abe2a7 add setJavascriptInterfaceScheme and setOnJSCallback to webview for fireball/issues/6251 2017-08-16 17:36:22 +08:00
Jare Guo da455ba9fc Merge pull request #1901 from knoxHuang/Fix_Label
Repair set ttf type font causes the outline to be lost for fireball/i…
2017-08-16 17:13:36 +08:00
Jare Guo a354a3fe59 Merge pull request #1892 from knoxHuang/v1.6
adjustment CCLayout code fix fireball/issues/6218
2017-08-16 17:12:52 +08:00
Jare Guo 356f69b193 Merge pull request #1902 from jareguo/v1.6
fix deserialization about TypeScript
2017-08-15 22:27:46 +08:00
Jare Guo eed3cc2d0f fix deserialization about TypeScript 2017-08-15 22:23:03 +08:00
knoxHuang dc703aa96b Repair outline bug for fireball/issues/6254 and fireball/issues/6258 2017-08-15 18:15:38 +08:00
knoxHuang 915dacb308 Merge remote-tracking branch 'origin/v1.6' into v1.6 2017-08-13 15:40:42 +08:00
Jare Guo c507fe8603 Merge pull request #1900 from jareguo/v1.6
update doc
2017-08-12 10:29:01 +08:00
Jare Guo 363aed3e2f update doc 2017-08-12 10:28:53 +08:00
knoxHuang 19984aa9cc Merge remote-tracking branch 'origin/v1.6' into v1.6 2017-08-11 15:42:08 +08:00
Jare Guo f5c08b0666 Merge pull request #1895 from 2youyou2/v1.6
add protection code to camera
2017-08-10 15:18:47 +08:00
2youyouo2 2e59812891 add protection code to camera 2017-08-10 15:09:47 +08:00
Jare Guo 95a0eb1501 Merge pull request #1894 from jareguo/v1.6
fix typo
2017-08-09 11:45:49 +08:00
Jare Guo 03b02f861b fix typo 2017-08-09 11:45:36 +08:00
knoxHuang 76b8ae027a adjustment CCLayout code fix fireball/issues/6218 2017-08-08 16:54:57 +08:00
pandamicro bfd92fa4b1 Merge pull request #1891 from pandamicro/v1.6
Small improvements
2017-08-08 14:27:05 +08:00
pandamicro 3150f46f1b [missed] Use Label pool instead of new 2017-08-08 11:57:54 +08:00
Jare Guo 781be850f5 Merge pull request #1890 from 2youyou2/v1.6
fixed PhysicsManager api doc
2017-08-08 11:22:58 +08:00
2youyouo2 fee21cbd15 fixed PhysicsManager api doc 2017-08-08 11:20:53 +08:00
pandamicro e06096a428 Merge pull request #1889 from knoxHuang/v1.6
Revoked open DEPTH_TEST
2017-08-07 18:33:48 +08:00
knoxHuang 842ea4a9d6 Revoked open DEPTH_TEST 2017-08-07 18:28:35 +08:00
pandamicro 98ad78974e [native] Improve setTimeout, setInterval implementation 2017-08-07 00:49:06 +08:00
Wang Nan 97ae1de437 Merge pull request #1883 from pandamicro/v1.6
Check gl errors only in dev mode
2017-08-04 18:44:46 +08:00
Jare Guo e98c26f7ad Merge pull request #1884 from VisualSJ/v1.6-6197
#6197 Fixed a bug about url is missing
2017-08-04 18:17:06 +08:00
VisualSJ 03ef8fe7ca #6197 review code 2017-08-04 18:11:12 +08:00
pandamicro 911bd93085 Merge pull request #1882 from knoxHuang/v1.6
fix Follow isDone error for fireball/issues/6191
2017-08-04 18:00:07 +08:00
VisualSJ a4e8348d17 #6197 Fixed a bug about url is missing 2017-08-04 17:45:02 +08:00
pandamicro 2541d90124 Check gl errors only in dev mode 2017-08-04 17:12:23 +08:00
yangweixian 4af65a5a98 Do not use checkGLErrorDebug 2017-08-04 17:06:55 +08:00
knoxHuang 15949c81f7 fix Follow isDone error for fireball/issues/6191 2017-08-04 16:09:15 +08:00
pandamicro 22ba46fe3d Merge pull request #1879 from knoxHuang/v1.6
open depthTest fix tiledmap Z invalid for fireball/issues/6198
2017-08-03 18:06:23 +08:00
knoxHuang 40cbc093dd open depthTest fix tiledmap Z invalid for fireball/issues/6198 2017-08-03 18:00:57 +08:00
pandamicro 43e986e9a7 Merge pull request #1878 from knoxHuang/v1.6
add cc.loader.releaseAll to CCGame restart fix issue fireball/issues/…
2017-08-03 17:02:08 +08:00
knoxHuang cde3e71e5b add cc.loader.releaseAll to CCGame restart fix issue fireball/issues/6192 2017-08-03 16:33:57 +08:00
Wang Nan 1b2b042d11 Merge pull request #1877 from 2youyou2/camera
dynamic check whether node's sgNode changed
2017-08-03 16:03:59 +08:00
2youyouo2 bf86a81347 dynamic check whether node's sgNode changed 2017-08-03 14:32:54 +08:00
Jare Guo 89cbbcca78 Merge pull request #1875 from pandamicro/master
Fix color.fromHex
2017-08-02 22:39:48 +08:00
pandamicro 0582dd39de Fix color.fromHex 2017-08-02 22:33:13 +08:00
Jare Guo 5aff3fb829 Merge pull request #1874 from jareguo/temp
refine api doc
2017-08-02 22:14:01 +08:00
Jare Guo 9f75fddb59 Merge pull request #1872 from pandamicro/master
Improve web restart process, avoid issues related to event callback etc
2017-08-02 20:52:46 +08:00
pandamicro 93fb81225d Improve web restart process, avoid issues related to event callback etc 2017-08-02 18:22:42 +08:00
Wang Nan 5f9cd9d531 Merge pull request #1870 from pandamicro/master
Less strict check for schedule, use warn instead of assert when paused state doesn't match
2017-08-02 16:41:56 +08:00
Wang Nan 571b15711a Merge pull request #1871 from 2youyou2/v1.6
fixed camera memory leak
2017-08-02 16:41:00 +08:00
2youyouo2 c79e323884 add comment 2017-08-02 16:40:39 +08:00