minggo
495dfd166f
Merge pull request #15753 from CocosRobot/update_lua_bindings_1464600269
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-05-30 17:37:20 +08:00
minggo
62f6c2144d
Merge pull request #15752 from CocosRobot/update_cocosfiles_1464600196
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-30 17:36:31 +08:00
CocosRobot
4f0869e51e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-05-30 09:27:04 +00:00
CocosRobot
6a2f417498
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-30 09:23:17 +00:00
minggo
2df2e71fc9
compile v3
2016-05-30 17:21:12 +08:00
minggo
e36351321e
Merge pull request #15740 from qbart/fix-bullet-definition-in-compiler-options
...
Use CC_USE_3D_PHYSICS=1 for Bullet physics only
2016-05-30 15:07:51 +08:00
minggo
3521e605f8
Merge pull request #15723 from urokuta/issue-9367
...
#9367 blend mode does not work with animated sprite
2016-05-30 10:53:15 +08:00
halx99
fa4bfe43d8
fix AudioEngine bug for iOS, UTF8 filePath ( #15743 )
...
* fix AudioEngine bug for iOS, UTF8 filePath
Fix bug for apple platform, open audio file failed with chinese App Name.
* Update AudioPlayer.mm
2016-05-30 10:47:48 +08:00
minggo
67c95549b3
Merge pull request #15744 from mogemimi/fix-refptr-warnings
...
Fix warnings caused by comparison between RefPtr and C++11's nullptr
2016-05-30 10:45:28 +08:00
minggo
15dc938f1f
Merge pull request #15747 from mogemimi/fix-c4267-warning
...
Fix C4267 and C4309 warnings when compiling for Windows 10 UWP
2016-05-30 10:37:23 +08:00
mogemimi
c647a95656
Fix C4267 and C4309 warnings when compiling for Windows 10 UWP
2016-05-29 14:43:28 +09:00
mogemimi
69974ab06f
Fix warnings caused by comparison between RefPtr and C++11's nullptr
2016-05-28 22:15:56 +09:00
bart
f4c353b678
Fix: Use CC_USE_3D_PHYSICS=1 for Bullet physics instead of CC_USE_PHYSICS
2016-05-28 01:04:17 +02:00
minggo
74fe77a367
Merge pull request #15737 from yalab/slicent_warning_android_clang
...
It mute warning on android clang.
2016-05-27 16:46:50 +08:00
minggo
533636e63a
Merge pull request #15726 from minggo/v3.11.1
...
merge v3.11.1 to v3
2016-05-27 16:45:04 +08:00
yalab
3ea46c617f
It mute warning on android clang.
2016-05-27 15:39:33 +09:00
minggo
7516db0fa8
Merge pull request #15734 from pandamicro/v3
...
Support cc.view.setOrientation on web
2016-05-27 14:26:50 +08:00
minggo
127f718dfc
Merge pull request #15728 from mogemimi/remove-duplicate-includes
...
Remove duplicate header includes
2016-05-27 14:25:39 +08:00
minggo
103bdb3d37
fix conflict
2016-05-27 14:22:03 +08:00
minggo
80039c4aee
Merge pull request #15731 from minggo/jsb-debug-issue
...
fix the bug that will lost message if only received one message
2016-05-27 09:46:36 +08:00
Ricardo Quesada
ff058eebc4
Merge pull request #15719 from ricardoquesada/issue_15594
...
fix: add code/resources to reproduce issue_15594
2016-05-26 20:40:38 -03:00
Ricardo Quesada
0be6645004
fix: 15594 compiles on android
...
github issue #15594
2016-05-26 19:25:39 -03:00
Ricardo Quesada
8bd4ddf081
fix: compile on linux, android and windows
2016-05-26 16:02:24 -03:00
mogemimi
fc6c612c4c
Remove duplicate header includes
2016-05-26 23:25:44 +09:00
Ricardo Quesada
1a7c22bd97
Merge pull request #15594 from yutaka-takeda-drecom/fix/sprite3d_singlesprite_bug
...
CCSprite::createNode bug fix.
2016-05-26 08:59:46 -03:00
capone
5b02460989
AudioEngine-linux fix: add map contains IDs of preloaded files
2016-05-26 17:57:56 +06:00
pandamicro
84d4b185f8
Update web engine ref
2016-05-26 19:34:03 +08:00
pandamicro
1928d24bf0
Made templates support cc.view.setOrientation on web
2016-05-26 19:24:24 +08:00
zilongshanren
f9415734f2
Merge pull request #15732 from zilongshanren/fix-actionNode-studio
...
fix actionNode studio 1.6 parser error
2016-05-26 18:17:25 +08:00
zilongshanren
13003d9a78
Merge pull request #15727 from dumganhar/editbox-fix
...
Make sure closeKeyboard run on UI thread
2016-05-26 18:08:03 +08:00
zilongshanren
2476722137
fix default value of studio version
2016-05-26 17:33:44 +08:00
zilongshanren
b317588e6e
fix include path
2016-05-26 17:25:03 +08:00
zilongshanren
517cb9e437
Merge pull request #15729 from dumganhar/editbox-fix-2
...
fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread.
2016-05-26 17:24:09 +08:00
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