pandamicro
|
f377a9bff1
|
Merge pull request #13491 from zilongshanren/v3.8
add RadioButton and RadioButtonGroup event type
|
2015-08-21 09:17:46 +08:00 |
pandamicro
|
58178ea0c2
|
Merge pull request #13495 from MSOpenTech/v3.8-winrt-fix
V3.8: winrt project file fixes
|
2015-08-21 09:16:55 +08:00 |
pandamicro
|
eb1ab63611
|
Merge pull request #13493 from MSOpenTech/v3.8-win10-readme
V3.8: updated Win10 UWP requirements in ReadMe [ci skip]
|
2015-08-21 09:15:49 +08:00 |
Dale Stammen
|
c47de9d04f
|
make new render surface current after device lost
|
2015-08-20 13:26:03 -07:00 |
Dale Stammen
|
d55bc653e0
|
update c++ debug info settings
|
2015-08-20 13:25:17 -07:00 |
Dale Stammen
|
f49e6fda85
|
updated Win10 UWP requirements
|
2015-08-20 11:13:17 -07:00 |
andyque
|
15156a015a
|
add RadioButton and RadioButtonGroup event type
|
2015-08-20 22:49:42 +08:00 |
pandamicro
|
c6c1b429c6
|
Merge pull request #13489 from jianglong0156/fixwin32textureCacheTest
fix texturecache didn't show correctly in win32
|
2015-08-20 22:39:01 +08:00 |
jianglong0156
|
895c29efe4
|
fix texturecache didn't show correctly in win32
|
2015-08-20 18:11:05 +08:00 |
pandamicro
|
81ca089d27
|
Merge pull request #13479 from liamcindy/V3.8_reader
fix object size error while data is error
|
2015-08-20 18:09:28 +08:00 |
pandamicro
|
7bd5cc4e34
|
Merge pull request #13486 from fusijie/fix_11677
Fixed SpriteProgressToRadialMidpointChanged bug.
|
2015-08-20 18:06:38 +08:00 |
Liam
|
788be3016a
|
update annotation
|
2015-08-20 18:04:49 +08:00 |
pandamicro
|
a54f01ce2b
|
Merge pull request #13485 from VisualSJ/v3.8-webIndex
Update Studio js parser
|
2015-08-20 18:02:55 +08:00 |
pandamicro
|
918d7ce5d6
|
Merge pull request #13480 from geron-cn/v3.8
add blendfunc Frame test case
|
2015-08-20 18:02:40 +08:00 |
pandamicro
|
d84d703c15
|
Merge pull request #13488 from CocosRobot/update_cocosfiles_1440064144
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-08-20 17:49:38 +08:00 |
CocosRobot
|
217c698ef4
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-08-20 09:49:05 +00:00 |
pandamicro
|
5ef4f3159e
|
Merge pull request #13487 from jianglong0156/fixopenglErrorSquash
fix opengl test error
|
2015-08-20 17:47:08 +08:00 |
jianglong0156
|
10d5b73c7e
|
fix opengl test error
fix opengl test error, add the condition, when the data type is samewith long, it will reset data
relate pr:#13449
fix open gl show error
|
2015-08-20 17:42:26 +08:00 |
fusijie
|
f133e5a754
|
Fixed SpriteProgressToRadialMidpointChanged bug.
|
2015-08-20 17:07:53 +08:00 |
VisualSj
|
a4fec3a5e0
|
Update Studio js parser
|
2015-08-20 17:02:41 +08:00 |
子龙山人
|
5b0dcd8a10
|
Merge pull request #13484 from CocosRobot/update_lua_bindings_1440055948
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-20 15:42:06 +08:00 |
CocosRobot
|
a3b8423977
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-20 07:39:25 +00:00 |
子龙山人
|
f79d2c8a0a
|
Merge pull request #13483 from zilongshanren/fix-lua-ui-v3.8
[ci skip]add missing ui test in Lua
|
2015-08-20 15:28:25 +08:00 |
andyque
|
72496ae426
|
add missing ui test in Lua
|
2015-08-20 15:25:09 +08:00 |
pandamicro
|
13a271d96d
|
Merge pull request #13478 from xiaofeng11/v3.8
Fix Cocos Studio Bugs
|
2015-08-20 14:42:36 +08:00 |
XiaoFeng
|
6bdb5431f1
|
Update code, using condition macro to determine studio or user project
|
2015-08-20 13:33:48 +08:00 |
geron-cn
|
ede4651b5e
|
add blendfunc Frame test case
|
2015-08-20 11:29:52 +08:00 |
Liam
|
aa6f2ec4b6
|
fix object size error while data is error
|
2015-08-20 11:27:01 +08:00 |
XiaoFeng
|
93f026f8e6
|
Fix https://github.com/cocos2d/cocos2d-x/issues/9488
|
2015-08-20 11:18:59 +08:00 |
XiaoFeng
|
935b0f006b
|
Fix https://github.com/cocos2d/cocos2d-x/issues/10205
|
2015-08-20 10:55:30 +08:00 |
yangxiao
|
8f81267960
|
skybox is not transparent
|
2015-08-19 18:25:34 +08:00 |
pandamicro
|
fc763e9732
|
Merge pull request #13469 from pandamicro/v3.8
Fixed #12570: Correct `cc.pIsSegmentIntersect` for lua
|
2015-08-19 16:22:22 +08:00 |
pandamicro
|
2605865ca6
|
Fixed #12570: Correct `cc.pIsSegmentIntersect` for lua
|
2015-08-19 16:21:31 +08:00 |
子龙山人
|
f14c58877c
|
Merge pull request #13467 from fusijie/fix_testcase_as_compile_downloaderTest
[ci skip]fix as compile error.
|
2015-08-19 15:17:59 +08:00 |
fusijie
|
bdc22516c8
|
fix as compile error.
|
2015-08-19 15:05:18 +08:00 |
pandamicro
|
c6c71f8597
|
Merge pull request #13466 from xiaofeng11/v3.8
Fix when picture file used by TMX map file missing or broken, create TMX object will cause program crashed
|
2015-08-19 14:08:25 +08:00 |
XiaoFeng
|
f26509efe4
|
Fix when picture file used by TMX map file missing or broken, create TMX object will cause program crashed
|
2015-08-19 14:02:12 +08:00 |
pandamicro
|
b9fa482672
|
Merge pull request #13464 from CocosRobot/update_lua_bindings_1439963369
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-19 13:57:36 +08:00 |
CocosRobot
|
bf723eab91
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-08-19 05:55:16 +00:00 |
pandamicro
|
08fcf7e35b
|
Merge pull request #13463 from ZhangMenghe/v3.8-materialSys
[ci skip] Delete blur shader in js-resj
|
2015-08-19 13:49:31 +08:00 |
子龙山人
|
4f9a81198b
|
Merge pull request #13456 from WenhaiLin/v3.8-label-globalZOrder
Fixed `Label::setGlobalZOrder ` is invalid if label create with system font.
|
2015-08-19 13:46:00 +08:00 |
ZhangMenghe
|
e9bd14e1d7
|
Delete blur shader in js-resj
|
2015-08-19 13:41:45 +08:00 |
pandamicro
|
87aa2c6969
|
Merge pull request #13462 from MSOpenTech/v3-winrt-fix
V3.8: fixed typo in WindowsPhone 8.1 cpp template file names
|
2015-08-19 13:39:16 +08:00 |
pandamicro
|
9fe278b31f
|
Merge pull request #13459 from MSOpenTech/v3-winrt-fix
V3: fixed typo in WindowsPhone 8.1 cpp template file names
|
2015-08-19 13:39:01 +08:00 |
pandamicro
|
31bc04a301
|
Merge pull request #13455 from MSOpenTech/v3-win10
Windows 10 UWP and WP8.1 app certification fixes
|
2015-08-19 13:36:29 +08:00 |
子龙山人
|
1f735b4f0e
|
Merge pull request #13437 from fusijie/fix_lua_testcase_setPointer_error
Fixed setVertexAttribPointer luabinding and Test case.
|
2015-08-19 11:43:18 +08:00 |
子龙山人
|
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 |