Vincent Yang
|
e1d4d22353
|
Fixed #12692 : UILayout viewing area cutting position calculation error
|
2015-07-29 18:43:11 +08:00 |
WenhaiLin
|
a9f27865d3
|
Fixed the content size of Label is incorrect with GLOW effect.
|
2015-07-29 16:30:07 +08:00 |
tangziwen
|
cee43ccebb
|
update terrain again
|
2015-07-29 14:32:36 +08:00 |
yangxiao
|
ad80c11235
|
sync render state
|
2015-07-29 10:35:37 +08:00 |
geron-cn
|
7e05538521
|
ADD SKELETON NEST TEST CASE
|
2015-07-29 10:23:03 +08:00 |
pandamicro
|
81842417c4
|
Merge pull request #13032 from xiaofeng11/v3
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
|
2015-07-29 09:54:43 +08:00 |
geron-cn
|
d2de5b1c85
|
add test case for bug: #13060 and #13005
|
2015-07-28 19:18:58 +08:00 |
pandamicro
|
66b21fb2a8
|
Merge pull request #12972 from yangws/issue_12145
Fixed #12145 : formarRenderers in RichText doesn’t update container s…
|
2015-07-28 17:13:26 +08:00 |
XiaoFeng
|
bca6934786
|
Normalization function names
|
2015-07-28 14:05:56 +08:00 |
Vincent Yang
|
b92733c402
|
Add items as protected children.
|
2015-07-28 11:38:21 +08:00 |
子龙山人
|
3a58668d71
|
Merge pull request #12744 from fusijie/fix_pageturndown
Fix PageTurn3D
|
2015-07-28 11:35:15 +08:00 |
pandamicro
|
3cc039b063
|
Merge pull request #13036 from fusijie/fix_12505
fix shader-basic testcase 'center' uniform error.
|
2015-07-27 15:40:44 +08:00 |
fusijie
|
f8de67a0c4
|
fix shader-basic testcase 'center' uniform error.
|
2015-07-27 14:18:17 +08:00 |
子龙山人
|
7f383f961a
|
Merge pull request #13026 from fusijie/fix_13025
fix 13025 wild pointer.
|
2015-07-27 13:38:38 +08:00 |
XiaoFeng
|
f410fcd737
|
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
|
2015-07-27 11:55:18 +08:00 |
子龙山人
|
bd0bdae530
|
Merge pull request #12993 from WenhaiLin/v3.8-label-layout-refine
Label:refine the implementation about text layout and support debug draw.
|
2015-07-27 11:10:31 +08:00 |
fusijie
|
f2f425d19c
|
fix 13025 wild pointer.
|
2015-07-27 10:39:31 +08:00 |
pandamicro
|
7ae3dd12a1
|
Merge pull request #12995 from fusijie/fix_12505
fix blur shader compliant on win8 universal.
|
2015-07-25 12:42:35 +08:00 |
pandamicro
|
fa46a0abb4
|
Merge pull request #12992 from yangws/v3.7.1
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-25 09:52:00 +08:00 |
pandamicro
|
a666658764
|
Merge pull request #12998 from pandamicro/v3.7.1
Add BoneNode/SkeletonNode/SkinNode JS bindings
|
2015-07-24 23:42:38 +08:00 |
WenhaiLin
|
a1e682ca65
|
Improves the test to reproduce issue 12996
|
2015-07-24 21:34:59 +08:00 |
fusijie
|
647848e843
|
fix blur sprite shader on win8 universal.
|
2015-07-24 21:04:44 +08:00 |
pandamicro
|
05bb775438
|
Sync timelineParser and fix issue
|
2015-07-24 20:16:56 +08:00 |
VisualSj
|
64d247d91b
|
Issue #12997: Add JS test case (ccs.BoneNode)
|
2015-07-24 15:45:19 +08:00 |
fusijie
|
bd0a57242b
|
refine blur shader test case.
|
2015-07-24 13:52:40 +08:00 |
fusijie
|
d550dace35
|
fix blur shader compliant on win8 universal.
|
2015-07-24 12:47:38 +08:00 |
geron-cn
|
0b09fd5bcb
|
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
|
2015-07-24 11:38:09 +08:00 |
Vincent Yang
|
e4a8aeee45
|
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-24 11:16:45 +08:00 |
Dale Stammen
|
6669fec648
|
added missing bug test
|
2015-07-23 12:34:37 -07:00 |
Vincent Yang
|
35040e7bb1
|
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
|
2015-07-23 17:27:04 +08:00 |
zhangcheng
|
012053e163
|
replace space to tab.
|
2015-07-23 17:04:08 +08:00 |
zhangcheng
|
4b8248c015
|
Optimization of Custom Data.
replace ComExtensionData to ObjectExtensionData.
|
2015-07-23 16:30:23 +08:00 |
geron-cn
|
7255b5308b
|
config for mac
|
2015-07-23 15:13:14 +08:00 |
geron-cn
|
d46c8c6802
|
add lack file
|
2015-07-23 15:12:09 +08:00 |
geron-cn
|
915cefa208
|
bone node
|
2015-07-23 11:51:49 +08:00 |
Ricardo Quesada
|
b2b9bad83d
|
improves the test to reproduce bug 12847
|
2015-07-22 15:08:36 -07:00 |
pandamicro
|
6029ca3edd
|
Merge pull request #12949 from yangws/issue_12906
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 16:17:14 +08:00 |
Liam
|
99c1c33c61
|
update resource
|
2015-07-22 15:56:35 +08:00 |
pandamicro
|
741163db40
|
Merge pull request #12938 from WenhaiLin/v3.8-deps70
Update deps for support FullType.
|
2015-07-22 15:42:13 +08:00 |
pandamicro
|
e0e5ae9d99
|
Merge pull request #12924 from liamcindy/SkyBox_3.7.1
update for Game3DNodeReader & UserCameraReader
|
2015-07-22 15:34:18 +08:00 |
子龙山人
|
bb9500769f
|
Merge pull request #12885 from zilongshanren/add-jumpToPage-api
Fix PageView scrollToPage bug and the curPageIndex bug
|
2015-07-22 15:01:57 +08:00 |
fusijie
|
92e68cd9dc
|
add sprite frame flash line bug test case.
|
2015-07-22 13:42:10 +08:00 |
Vincent Yang
|
3addf38134
|
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 12:01:34 +08:00 |
andyque
|
fbfb3a9dac
|
update ccs-res submodule
|
2015-07-22 10:45:18 +08:00 |
WenhaiLin
|
979a9be1f5
|
Add test case for test font supported by FullType.
|
2015-07-21 17:09:27 +08:00 |
pandamicro
|
85d4ce0d5a
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
docs/RELEASE_NOTES.md
tools/cocos2d-console
tools/tojs/cocos2dx.ini
|
2015-07-21 11:39:24 +08:00 |
pandamicro
|
641ff2abf4
|
Merge pull request #12914 from WenhaiLin/v3.8-label-bmfont-opacity
Label:Fixed opacity setting is invalid with bitmap font.
|
2015-07-20 18:02:49 +08:00 |
WenhaiLin
|
63326c2826
|
Label:Fixed opacity setting is invalid with bitmap font.
|
2015-07-20 11:10:17 +08:00 |
yangxiao
|
beda48124c
|
merge cocos
|
2015-07-17 17:54:00 +08:00 |
yangxiao
|
ef49e5a169
|
merge cocos
|
2015-07-17 17:43:32 +08:00 |
子龙山人
|
22ef262295
|
Merge pull request #12894 from zilongshanren/fixXcode5Warning
fix xcode 5.1.1 warnings
|
2015-07-17 17:33:13 +08:00 |
子龙山人
|
309b563c5b
|
Merge pull request #12896 from yangws/v3
[ci skip] Fix bug: the Back button in Node: UI->UIEditBoxTests click area has p…
|
2015-07-17 15:57:19 +08:00 |
Vincent Yang
|
f9e90f31f6
|
Fix bug: the Back button in Node: UI->UIEditBoxTests click area has positoin offset.
|
2015-07-17 15:52:58 +08:00 |
andyque
|
8c31d70211
|
fix xcode 5.1.1 warnings
|
2015-07-17 15:20:49 +08:00 |
fusijie
|
d828c030cb
|
remove CCClippingRectangleNode transform error support.
|
2015-07-17 11:56:23 +08:00 |
子龙山人
|
89e5307f0c
|
Merge pull request #12867 from WenhaiLin/v3.8-label-letter-color
Label:Fixed the color of letter will be overridden by fade action.
|
2015-07-17 11:29:58 +08:00 |
yangxiao
|
bf20145e35
|
animate3d callback and test
|
2015-07-17 11:08:27 +08:00 |
WenhaiLin
|
a6f8031af9
|
Label:support font that contains GB2312 char map.[except android]
|
2015-07-16 17:10:05 +08:00 |
andyque
|
96f6c44281
|
fix auto scrolling and curPageIdx issue
|
2015-07-16 16:50:47 +08:00 |
WenhaiLin
|
d5d5af5ac3
|
change ‘auto’ to ‘auto&&’
|
2015-07-16 14:08:59 +08:00 |
子龙山人
|
40f4e0b27b
|
Merge pull request #12864 from zilongshanren/add-jumpToPage-api
add setCurPageIndex API to PageView.
|
2015-07-16 13:56:05 +08:00 |
andyque
|
517221a0df
|
add jumpToPage API to PageView.
1. This commit also fix the default font size issue in ui::Button.
|
2015-07-16 11:33:57 +08:00 |
WenhaiLin
|
1c9a181c35
|
Label:Fixed the color of letter will be overridden by fade action.
|
2015-07-15 20:17:05 +08:00 |
songchengjiang
|
282dc23bb2
|
modify interfaces of Animate3DCallback
|
2015-07-15 17:34:14 +08:00 |
pandamicro
|
99e504e668
|
Merge pull request #12854 from yangws/issue_11310
fixed #11310 : multiple camera case utils::captureScreen bug.
|
2015-07-15 15:00:29 +08:00 |
andyque
|
2f31f6baa6
|
fixed Scale9Sprite gray state issue.
When call `setCapInsets`, the Scale9Sprite's inner sprite will be
rebuild and it's state will be lose.
This commit reset the shader state.
|
2015-07-15 14:35:13 +08:00 |
Vincent Yang
|
7a105ce1e1
|
fixed #11310 : multiple camera case utils::captureScreen bug.
|
2015-07-15 12:09:08 +08:00 |
andyque
|
e4cad50c2f
|
fix tons of warnings
|
2015-07-15 12:04:48 +08:00 |
songchengjiang
|
6c83e8d81c
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
|
2015-07-15 11:13:27 +08:00 |
andyque
|
91dfb07a8c
|
add more descriptive message to ASSET macro.
|
2015-07-14 15:28:36 +08:00 |
andyque
|
ef5d4ddf86
|
Merge remote-tracking branch 'upstream/v3' into v3
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
|
2015-07-14 11:24:38 +08:00 |
Vincent Yang
|
0589c14302
|
Restructure CCFileUtils class, move platform related functions to CCFileUtilsXXX.
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
|
2015-07-14 09:44:36 +08:00 |
andyque
|
fc673ee502
|
Merge branch 'v3.7-release' into v3
|
2015-07-13 22:44:54 +08:00 |
Vincent Yang
|
74227eaf16
|
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
|
2015-07-13 22:44:40 +08:00 |
子龙山人
|
cdc7e5205b
|
Merge pull request #11995 from MAUSMAUSgames/v3
using Action::_tag as flag field
|
2015-07-13 22:19:03 +08:00 |
子龙山人
|
c151ba89e5
|
Merge pull request #12774 from WenhaiLin/v3-label-createfail
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
|
2015-07-13 21:58:39 +08:00 |
子龙山人
|
db71e073dd
|
Merge pull request #12742 from WenhaiLin/v3-audioengine-preload
AudioEngine:support preload for audio
|
2015-07-13 17:06:17 +08:00 |
Vincent Yang
|
e65b01bdc0
|
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
|
2015-07-13 17:06:01 +08:00 |
WenhaiLin
|
adfa6d4f0d
|
Add test case for issue 12775
|
2015-07-13 15:38:33 +08:00 |
songchengjiang
|
5a16748273
|
optimize Animate3DCallback
add Animate3DCallbackTest
|
2015-07-13 11:43:13 +08:00 |
WenhaiLin
|
80dff7f1c4
|
Rollback pr12299
|
2015-07-13 11:32:25 +08:00 |
pandamicro
|
c167e249cd
|
Merge pull request #12790 from pandamicro/shaderNormal
Use shader with normal while creating mesh with normals
|
2015-07-12 21:47:05 +08:00 |
pandamicro
|
600568fdba
|
Migrate test case from #10692 @babcca
|
2015-07-12 11:33:22 +08:00 |
Liam
|
4a53afc798
|
update for error resource,just for build
|
2015-07-10 17:24:35 +08:00 |
songchengjiang
|
21a8a8d567
|
fix mirrored Effect3DOutline
|
2015-07-10 16:30:45 +08:00 |
pandamicro
|
c30ce38cb5
|
Merge pull request #12766 from super626/v3.7-release
Set default 3d animation quality to low
|
2015-07-10 15:35:22 +08:00 |
pandamicro
|
2d27091398
|
Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge
add write api in FileUtils
|
2015-07-10 15:13:21 +08:00 |
songchengjiang
|
a1956e2210
|
fix issue#9310 issue#10151 issue#12551
|
2015-07-09 18:05:47 +08:00 |
yangxiao
|
10fe728eee
|
animation quality default to low, do not interpolation
|
2015-07-09 17:54:21 +08:00 |
Liam
|
e50fc4f184
|
merge code
|
2015-07-09 17:12:48 +08:00 |
WenhaiLin
|
41bc3a1900
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8
Conflicts:
AUTHORS
|
2015-07-09 11:11:34 +08:00 |
Liam
|
c6ebaa19ec
|
add scene 3d test
|
2015-07-09 10:19:07 +08:00 |
Jacky
|
02597eb369
|
Completed test case and comment.
|
2015-07-08 22:34:33 +08:00 |
Jacky
|
34d1cc0b1d
|
refactory Effects test case.
|
2015-07-08 21:56:14 +08:00 |
Jacky
|
4a9e9f3744
|
completed api.
|
2015-07-08 17:26:29 +08:00 |
子龙山人
|
155ac8c07e
|
Merge pull request #11583 from hannon235/v3-update-sio
Updates socket.io network extension to correctly detect and manage connection to socket.io server versions 0.9.x - 1.x
|
2015-07-08 16:11:05 +08:00 |
Jacky
|
260ce177d7
|
refine GridNode with rect.
|
2015-07-08 15:57:27 +08:00 |
WenhaiLin
|
b395ef06d8
|
AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1]
|
2015-07-08 10:48:20 +08:00 |
XiaoFeng
|
8429cc1d90
|
Update CCDrawNode bug test
|
2015-07-08 09:35:29 +08:00 |
XiaoFeng
|
707b4d8b90
|
Fix windows universal project file
|
2015-07-07 19:44:18 +08:00 |