zilongshanren
3e941be0ce
fix actionNode studio 1.6 parser error
2016-05-26 17:20:51 +08:00
minggo
031e329d64
fix the bug that will lost message if only received one message
2016-05-26 16:32:10 +08:00
James Chen
d42b99b10b
fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread.
2016-05-26 15:49:57 +08:00
James Chen
cf883b5c0f
UI thread check.
2016-05-26 12:02:23 +08:00
James Chen
a472ab2931
Make sure closeKeyboard run on UI thread
2016-05-26 11:57:57 +08:00
minggo
967f0078c2
update console
2016-05-26 11:30:48 +08:00
minggo
33e34f6e1c
Merge pull request #15725 from natural-law/v3
...
Update the reference of submodule cocos2d-console.
2016-05-26 11:27:37 +08:00
minggo
1f2dea7974
Merge pull request #15724 from dumganhar/catch-exception
...
Try catch IllegalStateException in Cocos2dxMusic.java.
2016-05-26 11:20:14 +08:00
James Chen
5321a2fc7a
Removes unused package import for Cocos2dxSound.java.
2016-05-26 11:15:44 +08:00
minggo
1116176362
Merge pull request #15720 from billyquith/v3
...
Grammar corrections
2016-05-26 11:00:53 +08:00
minggo
5e8eee2c76
Merge pull request #15721 from mogemimi/fix-minor-typo
...
Fix minor typo: Texure -> Texture
2016-05-26 10:58:55 +08:00
pandamicro
aab8ea5094
Fix android compilation issue with thumb mode
2016-05-26 10:50:19 +08:00
minggo
7073a1c90c
Merge pull request #15718 from pandamicro/v3
...
Fix some small issues
2016-05-26 10:46:54 +08:00
zhangbin
08706012e8
Update the reference of submodule cocos2d-console.
...
1. Change the Tracker ID of GA in console.
2. Disable the BI Data Statistic.
3. Add special prefix '2dx-' for the Data uploaded by console in -x engine.
2016-05-26 10:42:56 +08:00
minggo
14aa5f5ded
update binding generator
2016-05-26 10:42:26 +08:00
minggo
43680e7d78
update web engine
2016-05-26 10:40:15 +08:00
minggo
e17c4c752f
update deps
2016-05-26 10:36:27 +08:00
minggo
b69127127a
update release note
2016-05-26 10:34:52 +08:00
minggo
8564dbd921
update changelog
2016-05-26 10:34:35 +08:00
James Chen
1285954cd9
Try catch IllegalStateException in Cocos2dxMusic.java.
2016-05-26 10:25:45 +08:00
minggo
072592d6e3
update version
2016-05-26 10:18:45 +08:00
urokuta
785d02a818
#9367 blend mode does not work with animated sprite
2016-05-26 09:39:48 +09:00
Ricardo Quesada
b2c7358370
Merge pull request #15722 from ricardoquesada/issue_15154
...
Fix crash on windows when using PolygonInfo
2016-05-25 21:25:31 -03:00
Ricardo Quesada
906967c53a
fix: make it compile on iOS and Mac
2016-05-25 20:00:48 -03:00
Ricardo Quesada
3725df5e07
Merge pull request #9 from stammen/issue_15154-fix
...
fixed array overrun in triangulate()
2016-05-25 14:54:36 -03:00
mogemimi
f6bee1abc2
Fix minor typo: Texure -> Texture
2016-05-26 02:36:15 +09:00
Dale Stammen
26781ee592
fixed array overrun in triangulate()
2016-05-25 10:14:09 -07:00
pandamicro
ea6a6a8586
Reverse include path in network module and update web engine
2016-05-25 23:58:11 +08:00
BQ
93ed59bfb3
English grammar corrections.
2016-05-25 15:25:38 +01:00
BQ
ded2a89eda
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
* 'v3' of https://github.com/cocos2d/cocos2d-x :
correct assign to equal in cert trust expression
dlfree fix for HttpClient, the instances of Ref or its sub classes should be released by CC_SAFE_RELEASE rather than CC_SAFE_DELETE.
Use nullptr instead of 0 or NULL
lock mutext to get element from g_queue
2016-05-25 15:19:56 +01:00
BQ
6097c3abd1
English grammar corrections.
...
Make brackets consistent.
2016-05-25 15:18:57 +01:00
Ricardo Quesada
b830b7de4c
fix: add code/resources to reproduce issue_15594
...
github issue #15594
2016-05-25 09:00:32 -03:00
pandamicro
8692ee176c
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/network/HttpAsynConnection-apple.m
cocos/network/HttpClient-android.cpp
cocos/network/HttpClient.cpp
cocos/network/HttpCookie.h
cocos/network/HttpRequest.h
cocos/network/HttpResponse.h
cocos/network/SocketIO.cpp
cocos/network/WebSocket.h
2016-05-25 19:19:27 +08:00
minggo
4e92b82571
Merge pull request #15716 from cezheng/bug/ios_httpclient_ssl
...
correct assign to equal in cert trust expression
2016-05-25 18:44:01 +08:00
pandamicro
8d5c102d75
Update bindings generator
2016-05-25 18:36:16 +08:00
pandamicro
2c05ecc3cd
Fix Component event issue
2016-05-25 18:36:02 +08:00
pandamicro
896aeb2d0c
Fix android compilation issue with thumb mode
2016-05-25 18:35:38 +08:00
minggo
c4a40618f5
Merge pull request #15715 from dumganhar/dlfree-fix
...
dlfree fix for HttpClient, the instances of Ref or its sub classes should be released by CC_SAFE_RELEASE rather than CC_SAFE_DELETE.
2016-05-25 18:34:29 +08:00
Ce Zheng
e4bf6584db
correct assign to equal in cert trust expression
2016-05-25 18:34:05 +09:00
minggo
47891b81af
Merge pull request #15712 from mogemimi/use-nullptr-instead
...
Use nullptr instead of 0 or NULL
2016-05-25 13:56:52 +08:00
minggo
c8c57696be
Merge pull request #15705 from minggo/jsb-debug-issue
...
lock mutext to get element from g_queue
2016-05-25 13:55:34 +08:00
James Chen
1db3c1644d
dlfree fix for HttpClient, the instances of Ref or its sub classes should be released by CC_SAFE_RELEASE rather than CC_SAFE_DELETE.
2016-05-25 13:54:13 +08:00
Ricardo Quesada
9ad3db0635
fix: make PolygonCode cleaner
...
not sure if this fixes the bug, but it makes the interfaces cleaner.
Github issue #15154
2016-05-24 20:57:40 -03:00
mogemimi
1e04cb5950
Use nullptr instead of 0 or NULL
2016-05-25 03:09:11 +09:00
Ricardo Quesada
23c5c18c91
Merge pull request #15646 from Rypac/fix_quadcommand_crash
...
Fix crash due to reallocation of shared indices memory
2016-05-24 11:29:28 -03:00
Ricardo Quesada
735dce1e91
Merge pull request #15711 from ricardoquesada/issue_15630
...
fix: update damping in physics
2016-05-24 10:54:55 -03:00
Ricardo Quesada
02a9c9aae3
fix: update damping in physics
...
github issue #15630
2016-05-24 10:53:23 -03:00
alecmilne
5daaa6e49b
Adding setBounce to webview ( #15623 )
...
* Adding setBounce to webview
This makes the .bounces of the scrollview section of webview publically accessible
When set to true it stops the grey over scroll of webviews
* Adding empty function for setBounces to Android
* Adding empty setBounces function for tizen
* Adding comments for empty Android and Tizen setBounce functions
* Small comment text change
2016-05-24 18:27:59 +08:00
minggo
fff7a78efe
lock mutext to get element from g_queue
2016-05-24 15:59:00 +08:00
minggo
d1cf94f3f1
Merge pull request #15702 from minggo/disable-remove-png-text
...
don't strip png text
2016-05-24 11:33:50 +08:00