子龙山人
|
da9971f04f
|
Merge pull request #13449 from fusijie/fix_JSB_glGetUniformfv
fixed JSB_glGetUniformfv uniform location is different from index.
|
2015-08-19 11:42:36 +08:00 |
pandamicro
|
6d0422bcc3
|
Merge pull request #13448 from VisualSJ/v3.8-webIndex
[ci skip] Set the transparency will affect the labelTTF
|
2015-08-19 11:41:58 +08:00 |
Dale Stammen
|
fef0a1bb81
|
fixed typo in WindowsPhone file names
|
2015-08-18 20:33:53 -07:00 |
WenhaiLin
|
827f05c5e1
|
Fixed `Label::setGlobalZOrder ` is invalid when label create with system font.
|
2015-08-19 10:22:48 +08:00 |
fusijie
|
2dbb4ad50e
|
fixed JSB_glGetUniformfv uniform location is different from index.
|
2015-08-19 09:53:52 +08:00 |
子龙山人
|
e3c88533fe
|
Merge pull request #13447 from WenhaiLin/v3.8-refine-testcases
Test cases:improve small problems.
|
2015-08-19 09:46:13 +08:00 |
子龙山人
|
0e0ec2acbe
|
Merge pull request #13451 from WenhaiLin/v3.8-update-gradle-plugin
[ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0
|
2015-08-19 09:45:52 +08:00 |
pandamicro
|
ce9eb762fa
|
Merge pull request #13452 from MSOpenTech/v3-win10
V3: Windows 10 UWP and WP8.1 app certification fixes
|
2015-08-19 09:36:35 +08:00 |
Dale Stammen
|
47b72ba30e
|
Merge branch 'v3' into v3-win10
|
2015-08-18 11:07:38 -07:00 |
Dale Stammen
|
8493365be7
|
updates to pass Windows App Certification tests
|
2015-08-18 11:06:47 -07:00 |
WenhaiLin
|
5cdfdf8497
|
[ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0
|
2015-08-18 22:37:00 +08:00 |
WenhaiLin
|
5dd6d94c17
|
Test cases:improve small problems.
|
2015-08-18 22:19:24 +08:00 |
VisualSj
|
4d9a61569a
|
Set the transparency will affect the labelTTF
|
2015-08-18 18:30:03 +08:00 |
子龙山人
|
fb55c2cd63
|
Merge pull request #13398 from perminovVS/v3-dev-use-more-get-file-extension
More FileUtils::getFileExtension
|
2015-08-18 17:27:11 +08:00 |
pandamicro
|
f54791c13d
|
Merge pull request #13445 from ZhangMenghe/v3-shader
[ci skip] Fix shader position abnormal
|
2015-08-18 17:21:00 +08:00 |
ZhangMenghe
|
9fbc45171e
|
Fix shader position abnormal
|
2015-08-18 17:07:08 +08:00 |
子龙山人
|
593eb0737f
|
Merge pull request #13440 from WenhaiLin/v3.8-rc0
Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.
|
2015-08-18 17:06:37 +08:00 |
子龙山人
|
42cc72ba23
|
Merge pull request #13442 from fusijie/fix_13405
fix copy construct & assignment operator memory leakage.
|
2015-08-18 17:06:12 +08:00 |
pandamicro
|
289a264b50
|
Merge pull request #13443 from VisualSJ/v3.8-webIndex
[ci skip][js-tests][PageView] Button position error
|
2015-08-18 16:43:19 +08:00 |
VisualSj
|
22c8163bc8
|
[js-tests][PageView] Button position error
|
2015-08-18 16:12:32 +08:00 |
WenhaiLin
|
6bf15885b8
|
Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.
|
2015-08-18 15:42:05 +08:00 |
pandamicro
|
540910e830
|
Merge pull request #13441 from VisualSJ/v3.8-webIndex
[ci skip] Update Web Index
|
2015-08-18 14:49:00 +08:00 |
fusijie
|
223d5a7a5c
|
fix copy construct & assignment operator memory leakage.
|
2015-08-18 14:48:16 +08:00 |
VisualSj
|
8463aa4b96
|
Update Web Index
|
2015-08-18 14:39:15 +08:00 |
fusijie
|
a799c99b1a
|
fix setVertexAttribPointer luabinding
|
2015-08-18 11:46:45 +08:00 |
fusijie
|
f671d36e31
|
Fixed lua testacase setPointer error.
|
2015-08-18 11:19:32 +08:00 |
pandamicro
|
5b963ab47a
|
Merge pull request #13428 from pandamicro/v3.8
Made travis run for v3.8
|
2015-08-18 10:19:22 +08:00 |
pandamicro
|
78ef019561
|
Made travis run for v3.8
|
2015-08-18 10:17:44 +08:00 |
pandamicro
|
d2bc03f80f
|
Merge pull request #13424 from WenhaiLin/v3.8-rc0
Label:Fixed display not as expected(Redmine issue:22133).
|
2015-08-18 10:00:36 +08:00 |
pandamicro
|
b16dc7b425
|
Merge pull request #13427 from songchengjiang/v3_backup
performance optimization and bug fixing
|
2015-08-18 09:59:24 +08:00 |
songchengjiang
|
6008c8352b
|
performance optimization and bug fixing
|
2015-08-18 09:51:26 +08:00 |
Dale Stammen
|
ee7b9377de
|
removed old wp8 code that breaks Win10 WACK tests
|
2015-08-17 18:40:07 -07:00 |
Dale Stammen
|
9259696847
|
disable Downloader test for Win10 UWP. No CURL support yet
|
2015-08-17 18:37:54 -07:00 |
Dale Stammen
|
d297c0f381
|
update version to v3-deps-72
|
2015-08-17 18:36:47 -07:00 |
Dale Stammen
|
97ecec1d64
|
updated Win10 UWP app asset files
|
2015-08-17 18:35:42 -07:00 |
pandamicro
|
2deae3aa23
|
Merge pull request #13425 from CocosRobot/update_lua_bindings_1439823683
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-18 08:09:10 +08:00 |
Vladimir Perminov
|
24d06bb1c9
|
More use StringUtf8ToWideChar and PlatformStringFromString
|
2015-08-17 23:04:05 +03:00 |
CocosRobot
|
24a63e12ec
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-17 15:08:00 +00:00 |
pandamicro
|
81d5a8377f
|
Merge pull request #13418 from jianglong0156/fixTMXTileFlagsError
Remove duplicate function definition, Add function adaptation
|
2015-08-17 22:56:59 +08:00 |
pandamicro
|
de5810a9ac
|
Merge pull request #13423 from pandamicro/gamenode3d-parser
[ci skip]Fix gamenode3d parse failed error
|
2015-08-17 22:55:08 +08:00 |
WenhaiLin
|
990a25f759
|
Label:Fixed display not as expected(Redmine issue:22133).
|
2015-08-17 22:46:19 +08:00 |
肖峰
|
0473b08dbb
|
Fix gamenode3d parse failed error
- Fix the parser issue
- Add GameNode3DReader to win8 universal project
- Add GameNode3d reader to Android & Linux project
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13369
|
2015-08-17 22:42:21 +08:00 |
pandamicro
|
b4ec30cc47
|
Merge pull request #13416 from WenhaiLin/v3.8-beta2
cpp-tests[win32 project]:Fixed link errors in release mode.
|
2015-08-17 22:32:42 +08:00 |
pandamicro
|
22925c2710
|
Merge pull request #13413 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2015-08-17 21:48:32 +08:00 |
pandamicro
|
40581c1c25
|
Merge pull request #13422 from VisualSJ/v3-pb-21865
[ci skip] Change ActionManager test name
|
2015-08-17 21:47:20 +08:00 |
pandamicro
|
8d0359cac1
|
Merge pull request #13419 from pandamicro/v3
[ci skip] Permit webp image loading and Add default viewport meta to js templates
|
2015-08-17 21:46:05 +08:00 |
VisualSJ
|
be93b6bf2e
|
Change ActionManager test name
|
2015-08-17 20:35:38 +08:00 |
pandamicro
|
2d1fcecfa5
|
Add default viewport meta to js templates
|
2015-08-17 18:56:10 +08:00 |
pandamicro
|
be165ef900
|
Permit webp image loading
|
2015-08-17 18:55:53 +08:00 |
jianglong0156
|
b19e02bdf6
|
Remove duplicate function definition, Add function adaptation
|
2015-08-17 18:18:38 +08:00 |