hugo
|
2bf7f8ae3f
|
update console
|
2015-10-16 16:10:08 +08:00 |
mogemimi
|
73c0ce1a9a
|
Replace String::createWithFormat() with StringUtils::format()
|
2015-10-16 15:02:14 +09:00 |
mogemimi
|
8af6531c94
|
Replace deprecated CCApplication with Application
|
2015-10-16 15:02:06 +09:00 |
mogemimi
|
4600c41f9b
|
Add override keywords
|
2015-10-16 15:01:10 +09:00 |
子龙山人
|
6661f702ce
|
Merge pull request #14161 from CocosRobot/update_cocosfiles_1444973862
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-10-16 13:46:50 +08:00 |
CocosRobot
|
8bc74ad72e
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-10-16 05:37:43 +00:00 |
pandamicro
|
efeb6a44fb
|
Merge pull request #14143 from MSOpenTech/v3-win10-curl
V3 win10 curl
|
2015-10-16 13:35:48 +08:00 |
pandamicro
|
585fcf4d7d
|
Merge pull request #14156 from njh0602/somefix
Fix comment. (/cocos/math/Vec2.cpp)
|
2015-10-16 11:41:25 +08:00 |
pandamicro
|
1b2338df8e
|
Merge pull request #14152 from chengstory/Fix#22934
Fix#22934
|
2015-10-16 11:38:22 +08:00 |
pandamicro
|
8915fc6cb9
|
Revert "Remove screen direction check in simulator to avoid render error"
|
2015-10-16 11:36:20 +08:00 |
fjut
|
04c44fbe15
|
Merge pull request #1 from cocos2d/v3
合并原作者代码
|
2015-10-16 09:31:54 +08:00 |
남준현
|
5118a31faf
|
// cross pro'c'uct of 2 vector. A->B X C->D
// cross pro'd'uct of 2 vector. A->B X C->D
|
2015-10-16 03:24:54 +09:00 |
dimon4eg
|
ee3c000b43
|
Fix crash in web view on android
|
2015-10-15 16:43:53 +03:00 |
zhangcheng
|
3edbf0f4a3
|
Fix#22934
Node, Skeleton needs to show at the middle of the simulator.
|
2015-10-15 19:35:06 +08:00 |
pandamicro
|
e789ab97be
|
Merge pull request #14139 from super626/v3
fix obb performance test
|
2015-10-15 16:00:51 +08:00 |
pandamicro
|
c87a1ee5aa
|
Merge pull request #14146 from super626/terrain
Fix terrain render bug
|
2015-10-15 15:58:24 +08:00 |
pandamicro
|
639382d0b1
|
Merge pull request #14144 from xiaofeng11/v3
Remove screen direction check in simulator to avoid render error
|
2015-10-15 15:57:40 +08:00 |
yangxiao
|
907189ed14
|
correct wrong presion, which leads to failed on some devices
|
2015-10-15 11:59:38 +08:00 |
XiaoFeng
|
ca8977b6f8
|
Remove screen direction check in simulator to avoid render error
|
2015-10-15 10:11:26 +08:00 |
Dale Stammen
|
0e28ec68b8
|
updated version to v3-deps-74
|
2015-10-14 18:03:57 -07:00 |
Dale Stammen
|
3e3e47de10
|
added Win10 UWP curl support
|
2015-10-14 16:47:52 -07:00 |
Dale Stammen
|
7e252d2c3b
|
added BundleArtifacts
|
2015-10-14 16:47:39 -07:00 |
pandamicro
|
07c2ec49db
|
Merge pull request #14140 from xiaofeng11/v3
Bug fix
|
2015-10-14 21:12:06 +08:00 |
pandamicro
|
59a9f0c953
|
Merge pull request #14141 from mogemimi/fix-minor-typo
Fix minor typos
|
2015-10-14 14:29:58 +08:00 |
mogemimi
|
59d7868d4c
|
Fix minor typos
|
2015-10-14 15:12:22 +09:00 |
pandamicro
|
40aa4187be
|
Merge pull request #14138 from songchengjiang/cocos2d-v3-bugfix2
fix the #23272 bug
|
2015-10-14 14:05:09 +08:00 |
pandamicro
|
1c085c96f1
|
Merge pull request #14136 from songchengjiang/cocos2d-v3-bugfix
fix lua Scene3DTest "back" button not working issue
|
2015-10-14 14:01:58 +08:00 |
XiaoFeng
|
a6a3e24fdd
|
Fix when image size of variable button status texture are different, Helper::restrictCapInsetRect result may cause pressed & disabled status picture won't display.
|
2015-10-14 13:58:58 +08:00 |
yangxiao
|
85f40de424
|
fix obb performance test
|
2015-10-14 13:43:02 +08:00 |
songchengjiang
|
02f20db82a
|
fix the #23272 bug
|
2015-10-14 13:24:38 +08:00 |
pandamicro
|
e02ba57144
|
Merge pull request #14137 from pandamicro/androidbug
Fix Android activity destroyed after reopen the app
|
2015-10-14 11:46:27 +08:00 |
XiaochenFTX
|
ec2aa7e8f2
|
Fix Android activity destroyed after reopen the app
|
2015-10-14 11:45:27 +08:00 |
pandamicro
|
aa84c064b4
|
Merge pull request #14132 from xiaofeng11/v3
Fix UIPageViewVerticalTest in cpp-test can not scroll back to page 1
|
2015-10-14 11:32:43 +08:00 |
songchengjiang
|
29c5ca6ea9
|
fix the #23309 bug
|
2015-10-14 11:23:11 +08:00 |
XiaoFeng
|
767a4afb9f
|
Fix UIPageViewVerticalTest in cpp-test can not scroll back to page 1
|
2015-10-14 09:16:34 +08:00 |
Jim Range
|
4e73670f38
|
Fixed issues with the iOS icons and splash screens that could cause app validation failure with Apple and improper orientation / missing splash screens.
|
2015-10-13 11:11:27 -05:00 |
pandamicro
|
4301e3b876
|
Merge pull request #14126 from xiaofeng11/v3
Bug fix
|
2015-10-13 16:49:34 +08:00 |
pandamicro
|
a741bc525e
|
Merge pull request #14127 from super626/v3
Image Bug: pvr v3 and s3tc dxt5
|
2015-10-13 16:47:30 +08:00 |
yangxiao
|
4c7edd457e
|
set _hasPremultipliedAlpha to false
|
2015-10-13 15:45:24 +08:00 |
XiaoFeng
|
90b96be690
|
Fix when scene been set a very large size(eg. 2048x1536), the simulator windows will been move out of window
|
2015-10-13 13:01:37 +08:00 |
pandamicro
|
b19bf82170
|
Merge pull request #14108 from loadrunner/label2
Changed label font size type to float
|
2015-10-13 11:55:14 +08:00 |
pandamicro
|
5e43cfa129
|
Merge pull request #14107 from loadrunner/label1
Removed scale factor for label shadow
|
2015-10-13 11:54:14 +08:00 |
pandamicro
|
5b35796093
|
Merge pull request #14091 from yangws/v3
Fix textfield input Chinese error with specific IME on Android.
|
2015-10-12 14:54:56 +08:00 |
pandamicro
|
ef04ebe6bc
|
Merge pull request #14118 from natural-law/v3
[ci skip] Update the reference of submodule cocos2d-console.
|
2015-10-12 14:22:35 +08:00 |
zhangbin
|
f25b62b4b5
|
Update the reference of submodule cocos2d-console.
|
2015-10-12 14:16:18 +08:00 |
pandamicro
|
547e2f15a1
|
Merge pull request #14115 from mogemimi/fix-typo
Fix typo in UIEditBox
|
2015-10-12 13:45:47 +08:00 |
mogemimi
|
daa29752db
|
Fix typo in UIEditBox
|
2015-10-12 13:57:50 +09:00 |
pandamicro
|
f2e3a0c071
|
Merge pull request #14104 from xiaofeng11/v3_bugfix
Bug fix
|
2015-10-12 10:14:26 +08:00 |
pandamicro
|
3dde02ba93
|
Merge pull request #14106 from loadrunner/tilemap
TMXLayer cast bug
|
2015-10-11 18:43:24 +08:00 |
Danut Chereches
|
471c23930c
|
added line spacing/leading
|
2015-10-10 19:15:45 +03:00 |