Commit Graph

370 Commits

Author SHA1 Message Date
minggo 165b2e52aa Merge pull request #220 from minggo/sync-15085
fix wrong behavior of 'cc.isObject' function for undefined and null
2016-07-18 18:00:35 +08:00
minggo 5f7b1dfaa3 Merge pull request #221 from minggo/sync-15778
avoid accessing invalid memory
2016-07-18 18:00:23 +08:00
minggo c739457549 Merge pull request #222 from minggo/sync-15774
Texture2D::addImageAsync : Set pixel format correctly.
2016-07-18 18:00:11 +08:00
minggo 614814433f Merge pull request #223 from minggo/sync-15771
[desktop]fix the bug the depth test is disabled when application size…
2016-07-18 18:00:00 +08:00
minggo 2c940db0ba Merge pull request #224 from minggo/sync-15761
SetBlending fix
2016-07-18 17:59:46 +08:00
minggo 7659e145e6 Merge pull request #225 from minggo/sync-15723
blend mode does not work with animated sprite
2016-07-18 17:59:27 +08:00
minggo c4790f9545 Merge pull request #226 from minggo/sync-15743
fix bug that AudioEngine can not work if file path contains non ascii…
2016-07-18 17:59:03 +08:00
minggo 73e93fddc1 fix compiling error with Xcode7.3 caused by libpng 2016-07-18 17:55:21 +08:00
minggo 896ae381aa fix bug that AudioEngine can not work if file path contains non ascii codes 2016-07-18 17:33:17 +08:00
minggo 3195dcd724 blend mode does not work with animated sprite 2016-07-18 17:27:49 +08:00
minggo c08e852525 SetBlending fix 2016-07-18 17:18:49 +08:00
minggo 0952c454ba [desktop]fix the bug the depth test is disabled when application size changed 2016-07-18 17:14:20 +08:00
minggo 0c75e52e1b Texture2D::addImageAsync : Set pixel format correctly. 2016-07-18 17:10:01 +08:00
minggo f922c9a798 avoid accessing invalid memory 2016-07-18 17:02:32 +08:00
minggo a28fbe5222 fix wrong behavior of 'cc.isObject' function for undefined and null 2016-07-18 16:55:56 +08:00
Wang Nan 9c9cc23bcf Merge pull request #209 from cocos-creator/v1.1
merge V1.1
2016-07-18 10:21:42 +08:00
Wang Nan d5e4c523b9 Merge pull request #206 from 2youyou2/binary
Binary
2016-07-18 10:21:08 +08:00
Wang Nan 239bd6f038 Merge pull request #208 from natural-law/issue3582
Solve the error that can't render hex tile-map with stagger-axis is x.
2016-07-18 10:21:01 +08:00
Wang Nan e49aa9825f Merge pull request #207 from zilongshanren/improve-editbox-cross-platform
Improve editbox cross platform compatibility
2016-07-18 09:39:22 +08:00
zhangbin 42afcea455 Solve the error effect when using hex map with stagger-axis is x. 2016-07-18 09:33:43 +08:00
zilongshanren e4f6f6db26 fix android multiline editbox alignment 2016-07-15 18:35:11 +08:00
zilongshanren a20d7b97cb fix jsb editbox label alignment 2016-07-15 18:27:32 +08:00
zilongshanren fd7f421e9f fix Android EditBox textChange event 2016-07-15 14:16:51 +08:00
2youyou2 0bbc29391d Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into binary 2016-07-14 15:46:30 +08:00
2youyou2 3c525de2a9 update binary windows template 2016-07-14 15:45:37 +08:00
2youyouo2 d130fdfa23 remove unused files 2016-07-14 11:28:07 +08:00
2youyouo2 259fc314a1 remove runtime files from binary template 2016-07-13 15:11:09 +08:00
zhangbin fd04ca26c2 Solve the error effect when using hex map with stagger-axis is x. 2016-07-13 13:58:30 +08:00
Wang Nan 414592b8ea Merge pull request #205 from cocos-creator/v1.1
merge V1.1
2016-07-12 14:03:48 +08:00
zhangbin b397ac686e Solve the errors in simulator project. 2016-07-12 14:00:09 +08:00
Nan Wang 51494a9aaf Merge branch 'v1.1' of github.com:nantas/cocos2d-x-lite into v1.1 2016-07-12 13:55:45 +08:00
Nan Wang e33debc4fd separate dll copy task from pubic tasks 2016-07-12 13:55:18 +08:00
zhangbin e9d4652c31 Add TiledMap for the HEX orientation maps. 2016-07-11 17:53:52 +08:00
Wang Nan 8381c080f1 Update project.properties
revert android target setting
2016-07-08 18:43:22 +08:00
Nan Wang 57ae3d1eb4 fix archiving extra prebuilt_mk folder into the package 2016-07-08 18:06:25 +08:00
Wang Nan 9b33aa98be Merge pull request #200 from pandamicro/v1.1
Fix jsb.loadRemoteImg
2016-07-08 13:44:37 +08:00
pandamicro 2c5c37a610 Fix jsb.loadRemoteImg 2016-07-07 10:35:42 +08:00
Wang Nan 4efc6045a1 Merge pull request #198 from 2youyou2/errorHandler
fixed errorHandler
2016-07-06 16:26:51 +08:00
knoxHuang 4da24170b6 fix used spine.getCurrent cause the emulator to crash for #fireball/issues/3546 2016-07-06 16:17:49 +08:00
2youyouo2 0f966efbb0 fixed errorHandler 2016-07-06 14:36:03 +08:00
Wang Nan c51554f7d4 Merge pull request #196 from 2youyou2/develop
fixed windows graphics
2016-07-06 14:34:52 +08:00
2youyouo2 10111b0cd4 fixed errorHandler 2016-07-06 14:21:49 +08:00
2youyouo2 6ec312d892 Merge branch 'develop' of github.com:2youyouo2/cocos2d-x-lite into develop 2016-07-06 14:02:27 +08:00
2youyouo2 bc038a61a3 fixed graphics roundRect api 2016-07-06 14:02:10 +08:00
2youyou2 c0dee4ed6e fixed windows graphics 2016-07-06 09:36:55 +08:00
Nan Wang 69bd9f1227 merged 2016-07-05 11:46:31 +08:00
Nan Wang 2e75326e24 upload cpp engine packages to branch folder 2016-07-05 11:39:43 +08:00
knoxHuang 07f1344db5 fix JSB Label does not support Boolean value. for #fireball/issues/3519 2016-07-04 18:27:24 +08:00
knoxHuang ce4ea88297 add isScheduled for JSB #fireball/issues/3510 2016-07-04 18:16:48 +08:00
knoxHuang 8f1026d667 add isScheduled for JSB #fireball/issues/3510 2016-07-04 18:09:08 +08:00