pandamicro
|
24478fab6b
|
Merge pull request #13941 from CocosRobot/update_cocosfiles_1442584523
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-18 21:56:14 +08:00 |
pandamicro
|
b1839ba150
|
Merge pull request #13939 from CocosRobot/update_cocosfiles_1442583921
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-18 21:55:47 +08:00 |
CocosRobot
|
29a4e861ed
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-18 13:55:26 +00:00 |
pandamicro
|
ce0166ef6e
|
Merge pull request #13940 from CocosRobot/update_lua_bindings_1442584025
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 21:55:21 +08:00 |
pandamicro
|
0699170a9d
|
Merge pull request #13938 from CocosRobot/update_cocosfiles_1442583700
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-18 21:55:13 +08:00 |
pandamicro
|
cc8e944050
|
Merge pull request #12220 from hanxi/v3
add UIEditBox support linux platform
|
2015-09-18 21:53:09 +08:00 |
CocosRobot
|
ad65343814
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 13:51:58 +00:00 |
CocosRobot
|
f21cafd7c9
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-18 13:45:23 +00:00 |
pandamicro
|
add24ccf95
|
Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug
Revert "remove CCClippingRectangleNode transform error support."
|
2015-09-18 21:43:42 +08:00 |
CocosRobot
|
a11062307a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-18 13:41:41 +00:00 |
pandamicro
|
724011f19b
|
Merge pull request #12071 from waiter/v3
Fix a bug in Scheduler which may case Force Close
|
2015-09-18 21:39:36 +08:00 |
pandamicro
|
7ac0b861c9
|
Merge pull request #13905 from perminovVS/win32-remove-dir-correct-point
FileUtilsWin32 removeDirectory correct remove file begins with point
|
2015-09-18 18:14:20 +08:00 |
pandamicro
|
685a1e5e07
|
Merge pull request #13914 from yangws/v3
Fix bug: new project created by template compile error.
|
2015-09-18 17:32:27 +08:00 |
pandamicro
|
6a975fe641
|
Merge pull request #13599 from perminovVS/winrt-mouse-support
WinRT support mouse
|
2015-09-18 17:26:15 +08:00 |
hanxi
|
b1ed1a8a51
|
add UIEditBox support linux platform.
|
2015-09-18 17:11:58 +08:00 |
pandamicro
|
cff3c74a9f
|
Merge pull request #13927 from CocosRobot/update_cocosfiles_1442564134
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-18 16:15:56 +08:00 |
CocosRobot
|
5be2cf3e5e
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-18 08:15:36 +00:00 |
pandamicro
|
13f3d46ad4
|
Merge pull request #13897 from super626/v3
SkyboxBrush : Make the shader parameter take effect at once
|
2015-09-18 16:14:06 +08:00 |
pandamicro
|
e38c386b19
|
Merge pull request #13925 from CocosRobot/update_lua_bindings_1442561799
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 15:42:04 +08:00 |
CocosRobot
|
79a7878687
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 07:41:46 +00:00 |
pandamicro
|
0c782c84c9
|
Merge pull request #13780 from super626/material
Sprite3D Material refactor
|
2015-09-18 15:33:22 +08:00 |
pandamicro
|
05ecef730b
|
Merge pull request #13921 from CocosRobot/update_cocosfiles_1442556510
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-18 14:08:49 +08:00 |
yangxiao
|
36d4f5564d
|
merge cocos
|
2015-09-18 14:08:33 +08:00 |
CocosRobot
|
6957b73939
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-18 06:08:31 +00:00 |
pandamicro
|
60c767db5f
|
Merge pull request #13907 from perminovVS/unzip-async-assetsmanagerex
AssetsManagerEx unzipping freeze app. Use async.
|
2015-09-18 14:06:57 +08:00 |
fusijie
|
23246b006b
|
fixed region x,y scale bug.
|
2015-09-18 13:39:22 +08:00 |
pandamicro
|
38d63ede91
|
Merge pull request #13918 from CocosRobot/update_lua_bindings_1442548961
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 13:12:53 +08:00 |
pandamicro
|
8d0d053249
|
Merge pull request #13909 from ZhangMenghe/v3-s9sprite
[ci skip] testcase for s9sprite action
|
2015-09-18 13:03:13 +08:00 |
CocosRobot
|
fe41739584
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-09-18 04:07:18 +00:00 |
pandamicro
|
50549e34cc
|
Merge pull request #13917 from CocosRobot/update_cocosfiles_1442548865
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-18 12:01:49 +08:00 |
CocosRobot
|
f9119bf3c1
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-18 04:01:07 +00:00 |
pandamicro
|
3f5df0ccc3
|
Merge pull request #13647 from super626/motionstreak3d
Motionstreak3d
|
2015-09-18 11:59:33 +08:00 |
Vincent Yang
|
56ea700d37
|
Fix bug: new project created by template compile error.
|
2015-09-18 11:40:16 +08:00 |
偶尔e网事
|
eb480fb021
|
Revert "remove CCClippingRectangleNode transform error support."
|
2015-09-18 11:31:37 +08:00 |
ZhangMenghe
|
6e4d39e909
|
s9sprite action testcase
|
2015-09-18 09:45:43 +08:00 |
yangxiao
|
6f1b04fd89
|
merge cocos
|
2015-09-18 09:37:26 +08:00 |
Vladimir Perminov
|
cb1a574b56
|
AssetsManagerEx unzipping freeze app
Unzipping in main thread bad idea.
Need good solution. My code fix freezing, but need similar batch
Download.
|
2015-09-17 23:43:56 +03:00 |
Vladimir Perminov
|
fdacdcae07
|
FileUtilsWin32 removeDirectory correct remove file begins with point
Need check fileName . and .. for delete folders and files begin name.
|
2015-09-17 22:36:43 +03:00 |
Vladimir Perminov
|
583e780e29
|
Correct all templates
|
2015-09-17 22:09:41 +03:00 |
pandamicro
|
731373b93d
|
Merge pull request #13902 from pandamicro/v3
[ci skip] Set js templates Mac target platform from null to 10.7
|
2015-09-17 23:11:22 +08:00 |
pandamicro
|
78c07c1c54
|
Set js templates Mac target platform from null to 10.7
|
2015-09-17 23:10:23 +08:00 |
pandamicro
|
ded9a9e6d4
|
Merge pull request #13893 from yangws/downloader
Remove AssetsManager dependence with CRUL.
|
2015-09-17 22:18:56 +08:00 |
yangxiao
|
757209e59e
|
make the shader parameter take effect at once
|
2015-09-17 18:14:17 +08:00 |
pandamicro
|
0d0d75a6d4
|
Merge pull request #13784 from ntotani/v3
Fix WebView lua-bind method name
|
2015-09-17 17:58:50 +08:00 |
pandamicro
|
8e4ff20b83
|
Merge pull request #13787 from avail/patch-1
Minor typo in README
|
2015-09-17 17:56:55 +08:00 |
pandamicro
|
1f0006efe8
|
Merge pull request #13859 from geron-cn/v3bugfixs
fix bug: ReEntry a same frameindex after scaled action's speed.
|
2015-09-17 17:48:06 +08:00 |
pandamicro
|
5f3a2bb000
|
Merge pull request #13874 from super626/light
Fix shader light parameter bug
|
2015-09-17 17:46:46 +08:00 |
pandamicro
|
4aaf017e4c
|
Merge pull request #13890 from jianglong0156/addsetUniformLocationWithMatrix
add CCGLProgram function binding setUniformLocationWithMatrix
|
2015-09-17 17:45:16 +08:00 |
Vincent Yang
|
5eafc93d86
|
Remove AssetsManager dependence with CRUL.
|
2015-09-17 16:52:31 +08:00 |
pandamicro
|
1eeafed072
|
Merge pull request #13884 from yangws/v3
Fix bug: in Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
|
2015-09-17 16:32:56 +08:00 |