knoxHuang
|
8ff7482dfb
|
add schedule jsb_binding for #fireball/issues/3669
1. pauseAllTargets
2. pauseAllTargetsWithMinPriority
3. resumeTargets
|
2016-07-20 20:39:07 +08:00 |
|
minggo
|
a3bcad54f4
|
Merge pull request #238 from minggo/sync-15539
fix crash
|
2016-07-20 10:41:20 +08:00 |
|
minggo
|
835acc20c8
|
fix crash
|
2016-07-20 10:40:09 +08:00 |
|
minggo
|
7c3f49490b
|
Merge pull request #237 from minggo/sync-15549
use std::atof() instead to fix error result
|
2016-07-20 10:36:46 +08:00 |
|
minggo
|
e41495f043
|
use std::atof() instead to fix error result
|
2016-07-20 10:34:46 +08:00 |
|
minggo
|
7dc5dd76aa
|
Merge pull request #236 from minggo/sync-15545
avoid removing event listener multiple times
|
2016-07-20 10:31:30 +08:00 |
|
minggo
|
6045b9abb2
|
avoid removing event listener multiple times
|
2016-07-20 10:31:04 +08:00 |
|
minggo
|
5f74ad1981
|
revert correct search path
|
2016-07-20 10:23:05 +08:00 |
|
minggo
|
5a79590353
|
Merge pull request #235 from minggo/sync-15581
revert correct search path
|
2016-07-20 10:22:46 +08:00 |
|
minggo
|
6b59d936c4
|
Merge pull request #232 from minggo/fix-compiling
fix compiling error
|
2016-07-19 07:48:53 +08:00 |
|
minggo
|
675436984e
|
fix compiling error
|
2016-07-19 07:46:09 +08:00 |
|
Wang Nan
|
e794a7ca6d
|
Merge pull request #231 from cocos-creator/v1.1
merge V1.1
|
2016-07-18 18:22:35 +08:00 |
|
minggo
|
85edc0536d
|
Merge pull request #230 from minggo/sync-15575
utils::captureScreen memory leak
|
2016-07-18 18:20:20 +08:00 |
|
minggo
|
79414d29e7
|
utils::captureScreen memory leak
|
2016-07-18 18:20:09 +08:00 |
|
minggo
|
46652bbb21
|
Merge pull request #229 from minggo/sync-15683
Enable WebView's local storage on Android
|
2016-07-18 18:12:18 +08:00 |
|
minggo
|
89406f4a3e
|
Enable WebView's local storage on Android
|
2016-07-18 18:11:59 +08:00 |
|
minggo
|
93d895a526
|
Merge pull request #228 from minggo/sync-15705
lock mutext to get element from g_queue
|
2016-07-18 18:05:01 +08:00 |
|
minggo
|
446e5f26b5
|
lock mutext to get element from g_queue
|
2016-07-18 18:04:35 +08:00 |
|
minggo
|
e1254fb3b2
|
Merge pull request #214 from minggo/android-performance
fix rendering performance issue on some Android devices
|
2016-07-18 18:02:10 +08:00 |
|
minggo
|
3710928786
|
Merge pull request #215 from minggo/valuemap_reject_none
Fixed to fail FileUtils::writeValueMapToFile on iOS.
|
2016-07-18 18:01:52 +08:00 |
|
minggo
|
722708380f
|
Merge pull request #216 from minggo/uiwidget-missing-properties-clone
fix missing properties for clone
|
2016-07-18 18:01:40 +08:00 |
|
minggo
|
b175d378c4
|
Merge pull request #217 from minggo/rendertexture-setopacity-notwork
fix the issue that set opacity can not modify RGB
|
2016-07-18 18:01:26 +08:00 |
|
子龙山人
|
e78fd51d83
|
Merge pull request #213 from zilongshanren/improve-mac-editbox
improve mac single line editbox
|
2016-07-18 18:01:12 +08:00 |
|
minggo
|
0a913f37bd
|
Merge pull request #219 from minggo/sync-15815
fix ClippingNode not cleaning up _stencil correctly
|
2016-07-18 18:00:46 +08:00 |
|
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
|
703ee78024
|
Merge pull request #227 from minggo/sync-15698
fix compiling error with Xcode7.3 caused by libpng
|
2016-07-18 17:55:14 +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 |
|
minggo
|
5f442985d3
|
fix ClippingNode not cleaning up _stencil correctly
|
2016-07-18 16:24:11 +08:00 |
|
minggo
|
64f5463c3c
|
fix the issue that set opacity can not modify RGB
|
2016-07-18 16:02:06 +08:00 |
|
minggo
|
1d4c64d163
|
fix missing properties for clone
|
2016-07-18 15:53:31 +08:00 |
|
minggo
|
ad414bedde
|
Fixed to fail FileUtils::writeValueMapToFile on iOS.
|
2016-07-18 15:47:39 +08:00 |
|
minggo
|
9a3bc1750c
|
fix rendering performance issue on some Android devices
|
2016-07-18 15:17:36 +08:00 |
|
zilongshanren
|
4cf595a653
|
improve mac single line editbox
|
2016-07-18 11:39:21 +08:00 |
|
Wang Nan
|
800e99866c
|
Merge pull request #211 from CocosRobot/update_js_bindings_1468808638
[ci skip][AUTO]: updating jsbinding automatically
|
2016-07-18 10:43:23 +08:00 |
|
Wang Nan
|
5be2b76c00
|
Merge pull request #210 from CocosRobot/update_cocosfiles_1468808511
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-07-18 10:43:15 +08:00 |
|
Wang Nan
|
d2431bd923
|
Merge pull request #212 from natural-law/issue3582
Solve the error effect when using hex map with stagger-axis is x.
|
2016-07-18 10:43:01 +08:00 |
|
zhangbin
|
7c00fd6a34
|
Solve the error effect when using hex map with stagger-axis is x.
|
2016-07-18 10:35:59 +08:00 |
|