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 |
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 |
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
|
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
|
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
|
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 |
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 |
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 |
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 |
WenhaiLin
|
581f1ab42b
|
Add test case
|
2015-07-07 15:41:54 +08:00 |
jianglong0156
|
abee4a376a
|
add write api in FileUtils
bool writeStringToFile(std::string dataStr, const std::string& fullPath);
bool writeDataToFile(Data retData, const std::string& fullPath);
bool writeValueMapToFile(ValueMap& dict, const std::string& fullPath);
bool writeValueVectorToFile(ValueVector vecData, const std::string& fullPath);
and
formate the FileUtils code
|
2015-07-07 14:06:59 +08:00 |
子龙山人
|
f28fbdd0c4
|
Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view
Add scroll bar feature into ScrollView
|
2015-07-07 13:56:09 +08:00 |
肖峰
|
37674c3689
|
Add bug test to Mac & iOS cpp-test project
|
2015-07-07 11:17:08 +08:00 |
XiaoFeng
|
9a6ffd8904
|
Add bug test for PageView layout & CCNodeDraw::onDrawGLLine
|
2015-07-07 09:54:42 +08:00 |
jianglong0156
|
6f3b977c1e
|
add UserDefault api deleteValueForKey
|
2015-07-06 17:01:17 +08:00 |
Neo Kim
|
3ab4285960
|
Refactor code
|
2015-07-04 16:06:05 +09:00 |
Neo Kim
|
ceeca575f3
|
Replace 'margin' of scroll bar with 'positionFromCorner'
|
2015-07-04 14:05:47 +09:00 |
Neo Kim
|
60c32f6fb5
|
Refactor some codes
|
2015-07-04 09:56:53 +09:00 |
Neo Kim
|
c093bb18e2
|
Add scroll bar manipulation methods into ScrollView
|
2015-07-04 09:56:52 +09:00 |
Neo Kim
|
2cae17b462
|
Add scroll bar feature into ScrollView
|
2015-07-04 09:56:52 +09:00 |
pandamicro
|
99bad19cff
|
Merge pull request #12660 from pandamicro/merge-v3.7
Merge v3.7-release
|
2015-07-03 11:08:50 +08:00 |
pandamicro
|
48c99d2ac4
|
Merge pull request #12635 from yangws/v3_scene3dtest
Fix bug: spine animition can't show in Scene3DTest.
|
2015-07-03 11:04:23 +08:00 |
pandamicro
|
1b22438792
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
Conflicts:
cocos/ui/UICheckBox.cpp
|
2015-07-03 10:23:49 +08:00 |
子龙山人
|
5b971ee93d
|
Merge pull request #12607 from neokim/add_radio_button_and_group
Add RadioButton and RadioButtonGroup widgets
|
2015-07-02 17:12:59 +08:00 |
Neo Kim
|
6550a9ccc2
|
Replace all tabs to 4 spaces to comply with the convention
|
2015-07-02 11:30:14 +09:00 |
Neo Kim
|
4b2bff4674
|
Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case.
|
2015-07-02 11:28:14 +09:00 |
Vincent Yang
|
46d25a45a0
|
Merge branch 'v3_scene3d_fixspineani' into v3_scene3dtest
|
2015-07-02 10:27:25 +08:00 |
Vincent Yang
|
dc6e966501
|
[ci skip] remove a unnecessary CCLOG info.
|
2015-07-01 14:55:31 +08:00 |
yangxiao
|
d35bf2305f
|
add clipping test
|
2015-07-01 14:48:37 +08:00 |
Vincent Yang
|
276ed46c01
|
Fixbug : issue 8194.
|
2015-07-01 14:39:35 +08:00 |
yangxiao
|
269feeb1f9
|
remove stencil from Renderstate
|
2015-07-01 14:06:37 +08:00 |
Neo Kim
|
3f05ad2b98
|
Replace all tabs to 4 spaces to comply with the convention
|
2015-06-30 20:31:31 +09:00 |
Neo Kim
|
bed90606d3
|
Add RadioButton feature and a test case for it.
|
2015-06-30 18:50:13 +09:00 |
yangxiao
|
538daf5bce
|
add empty line
|
2015-06-30 14:19:58 +08:00 |
yangxiao
|
2ed5ee123e
|
improve collider
|
2015-06-30 14:16:05 +08:00 |
Vincent Yang
|
1105111fab
|
Merge v3 branch.
|
2015-06-30 11:59:56 +08:00 |
子龙山人
|
29cccf631e
|
Merge pull request #12550 from kompjoefriek/v3-vibrate
Vibrate support in v3
|
2015-06-30 10:28:59 +08:00 |
子龙山人
|
265c9b55e0
|
Merge pull request #12586 from fusijie/add-autoculling-bug-testcase
add auto culling test case.
|
2015-06-30 09:33:36 +08:00 |
Jacky
|
0be9763a9c
|
add auto culling test case.
|
2015-06-29 17:25:13 +08:00 |
子龙山人
|
c997284825
|
Merge pull request #12352 from andyque/add-two-events-to-ui-slider
Improve ui::Slider
|
2015-06-29 17:01:27 +08:00 |
songchengjiang
|
7befab0f7b
|
add Physics3DCollider
|
2015-06-29 10:26:09 +08:00 |
pandamicro
|
88aeaa36f4
|
Merge pull request #12534 from super626/skybox
Skybox improvement
|
2015-06-26 17:05:17 +08:00 |
pandamicro
|
d29c5643bc
|
Merge pull request #12559 from WenhaiLin/v3-37-crashfix
[Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` again after a auto-tested.
|
2015-06-26 12:51:07 +08:00 |
Wenhai Lin
|
94c0c0c3fc
|
[Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` test case again after a auto-tested.
|
2015-06-26 12:02:15 +08:00 |
pandamicro
|
d2764918b9
|
Merge pull request #12545 from WenhaiLin/v3-37-removeUInclude
Remove unneeded include files and fixed warns.
|
2015-06-26 09:31:51 +08:00 |
kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02:00 |
WenhaiLin
|
1494f09f06
|
Remove unneeded include files and fixed warns.
|
2015-06-25 23:15:39 +08:00 |
andyque
|
516d45db62
|
update submodule
|
2015-06-25 20:16:43 +08:00 |
andyque
|
8f7b439dfe
|
add cocostudio 1.6 tests
|
2015-06-25 18:06:45 +08:00 |
yangxiao
|
63f948c822
|
modify skybox to projection space
|
2015-06-25 15:01:39 +08:00 |
pandamicro
|
117a72fa07
|
Merge pull request #12514 from WenhaiLin/v3-37-autotest-timeoutfix
[Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.
|
2015-06-24 23:07:38 +08:00 |
pandamicro
|
f9db471026
|
Merge pull request #12495 from super626/v3
Fix terrain getIntersectionPoint
|
2015-06-24 18:36:52 +08:00 |
WenhaiLin
|
a7632a962f
|
[Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.
|
2015-06-24 18:24:16 +08:00 |
XiaoFeng
|
0846dadbc3
|
Add a text label to Node3DReader Test, notice user there has no content to show
|
2015-06-24 14:58:14 +08:00 |
yangxiao
|
c3593c9d64
|
merge cocos
|
2015-06-23 18:29:39 +08:00 |
yangxiao
|
251c81d7be
|
Merge branch 'newcode' into v3
|
2015-06-23 18:25:41 +08:00 |
子龙山人
|
fca9b89a4c
|
Merge pull request #12480 from andyque/fix-rapidjson-assert-error
fix rapidjson assert error
|
2015-06-23 15:34:47 +08:00 |
andyque
|
70b709f4a8
|
fix rapidjson assert error
|
2015-06-23 13:54:11 +08:00 |
pandamicro
|
4823cc3bc2
|
Merge pull request #12476 from super626/fps
show fps in scene3d demo
|
2015-06-23 13:42:26 +08:00 |
子龙山人
|
d8a2695620
|
Merge pull request #12473 from WenhaiLin/v3-37-ParticleDemo-crashfix
[cpp-tests] ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
|
2015-06-23 13:36:36 +08:00 |
yangxiao
|
a433d57807
|
show fps
|
2015-06-23 11:56:50 +08:00 |
WenhaiLin
|
a68874d3cb
|
Node: Particles --> ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
|
2015-06-23 11:00:23 +08:00 |
andyque
|
931011809d
|
fixed unintended spaces in string
|
2015-06-23 10:38:43 +08:00 |
WenhaiLin
|
6bd46fcfcc
|
[ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App.
|
2015-06-20 17:07:11 +08:00 |
WenhaiLin
|
d32a317ea0
|
Label:Fixed line wrap error without space.
|
2015-06-19 13:39:19 +08:00 |
tangziwen
|
1989de7a04
|
fix terraintest and Terrain::getInstersectionPoint()
|
2015-06-18 12:20:44 +08:00 |
Vincent Yang
|
27bf636eab
|
Fix bug: spine animition can't show in Scene3DTest.
|
2015-06-18 11:45:17 +08:00 |
tangziwen
|
4187ea2241
|
fix Scene3D test
|
2015-06-18 10:17:46 +08:00 |
Vincent Yang
|
0e0c8cf72e
|
Modify Scene3DTest to composite 2D/3D scene by moving UI and camera far away.
|
2015-06-18 09:54:48 +08:00 |
WuHao
|
aeeed0f4ab
|
Merge remote-tracking branch 'origin' into fix_spritepolygon
# Conflicts:
# external/config.json
|
2015-06-16 11:19:20 +08:00 |
andyque
|
b8826d9de4
|
improve the enum naming
|
2015-06-16 09:42:06 +08:00 |
Ricardo Quesada
|
b167ab3e78
|
StateBlock() is public
|
2015-06-15 17:43:37 -07:00 |
Ricardo Quesada
|
ca3da86da7
|
StateBlock::restore() is public
It is possible to restore to default state
|
2015-06-15 14:12:44 -07:00 |
andyque
|
c1108db31e
|
Improve ui::Slider
1. Add two APIs to gain big precision
2. Add three type events in Slider's callback.
|
2015-06-15 18:31:21 +08:00 |
WuHao
|
27d0f51e9b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
|
2015-06-15 16:13:36 +08:00 |
pandamicro
|
0216d05eee
|
Merge pull request #12102 from super626/navigation2
3D Navigation
|
2015-06-15 13:39:05 +08:00 |
yangxiao
|
97ef7974bb
|
create agent in the onEnter
|
2015-06-15 11:57:05 +08:00 |
Ricardo Quesada
|
a8cf72dc43
|
pass bits to invalidate
|
2015-06-12 17:14:09 -07:00 |
Ricardo Quesada
|
4278bf51b1
|
Adds RenderState::StateBlock::invalidate();
handy function to restore the GL state to the default one.
Only use it if calling GL calls directly
|
2015-06-12 16:47:08 -07:00 |
Ricardo Quesada
|
d9b0b2ca38
|
more fixes
|
2015-06-12 15:28:29 -07:00 |
pandamicro
|
9806c09b0e
|
Merge pull request #12299 from WenhaiLin/v3-label-cropped
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
|
2015-06-12 21:33:09 +08:00 |
子龙山人
|
c01d1fe00a
|
Merge pull request #12310 from WenhaiLin/v3-particlefile-key
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
|
2015-06-12 16:44:12 +08:00 |
Jacky
|
29c108bdef
|
Merge remote-tracking branch 'origin' into fix_spritepolygon2
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-06-12 16:28:41 +08:00 |
WenhaiLin
|
4d97d5075b
|
Add test case for issue12310.
|
2015-06-12 15:39:57 +08:00 |
子龙山人
|
7a9b48bd83
|
Merge pull request #12214 from andyque/optimize-ui-memory-usage
Optimize ui memory usage
|
2015-06-12 10:11:21 +08:00 |
WenhaiLin
|
5aa31ea83a
|
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
|
2015-06-11 17:16:44 +08:00 |
子龙山人
|
43555272d5
|
Merge pull request #12236 from WenhaiLin/v3-box2d-compilefix
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
|
2015-06-11 16:34:45 +08:00 |
yangxiao
|
44c2b0d5ad
|
merge cocos
|
2015-06-11 15:54:42 +08:00 |
WenhaiLin
|
aff2f8c2c4
|
Fixed compile error.
|
2015-06-11 14:42:03 +08:00 |
samuele3hu
|
1b20e463d8
|
Update the Lua binding about the Polygon and update the test case.
|
2015-06-11 14:38:38 +08:00 |
Huabing.Xu
|
10352c40b2
|
Merge branch 'v3' into v3FrameBufferObject
# Conflicts:
# cocos/2d/CCCamera.h
|
2015-06-10 10:16:42 +08:00 |
Huabing.Xu
|
3e331128c6
|
file rename CCFrameBufferObject->CCFrameBuffer
|
2015-06-09 15:32:12 +08:00 |
Jacky
|
562d4b9a78
|
fix on the windows.
|
2015-06-09 11:23:37 +08:00 |
Huabing.Xu
|
9acab65e4f
|
rename FrameBufferObject->FrameBuffer
Move FrameBufferObject related class to experimental namespace
|
2015-06-09 10:59:43 +08:00 |
WuHao
|
a67e570ef7
|
deleted more leftover comments, placed polygon test further down the tests
|
2015-06-08 15:40:18 +08:00 |
WuHao
|
2650de030c
|
modified tests to show current epsilon
|
2015-06-08 15:08:16 +08:00 |
WuHao
|
0808b6aff9
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
cocos/2d/MarchingSquare.cpp
|
2015-06-08 13:59:26 +08:00 |
WenhaiLin
|
784f142f91
|
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
|
2015-06-08 11:06:02 +08:00 |
Jacky
|
3e62dd0473
|
remove unused file and code.
|
2015-06-06 13:31:25 +08:00 |
andyque
|
56b7037c5f
|
optimize uislider memory usage
|
2015-06-05 17:16:10 +08:00 |
pandamicro
|
399ecfcb9f
|
Merge pull request #12176 from super626/fixphysics3d
rename syncToNode and syncToPhysics
|
2015-06-05 16:02:45 +08:00 |
andyque
|
6390f063fe
|
optimize UILoadingBar memory usage
|
2015-06-05 15:57:39 +08:00 |
yangxiao
|
d50c1823d4
|
merge cocos
|
2015-06-05 14:25:37 +08:00 |
andyque
|
a7141bab38
|
improve imageView memory usage
|
2015-06-05 14:19:05 +08:00 |
andyque
|
91ddb802e1
|
optimize ui::CheckBox memory consumption
|
2015-06-05 10:32:22 +08:00 |
WuHao
|
5b572ab803
|
Polyinfo is no longer a pointer
|
2015-06-04 16:20:00 +08:00 |
WuHao
|
0a51c9bd27
|
Finished AutoPolygon and Sprite
|
2015-06-04 15:43:31 +08:00 |
zhangcheng
|
8d3d3a0348
|
1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer.
|
2015-06-04 14:06:31 +08:00 |
yangxiao
|
8b5333a5c9
|
Merge branch 'newcode' into navigation2
|
2015-06-04 12:44:39 +08:00 |
yangxiao
|
73d815b0ab
|
rename syncToNode and syncToPhysics
|
2015-06-04 12:04:41 +08:00 |
Ricardo Quesada
|
ff81078062
|
fixes bug when calculating the dynamic values
|
2015-06-02 17:48:50 -07:00 |
Chris Hannon
|
6bcf325630
|
[v3-update-sio] updates usage of log function to CCLOG macros, ensures correct data type is passed to log function
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
|
2015-06-02 20:17:34 -04:00 |
Chris Hannon
|
fb10217e2b
|
[v3-update-sio] updates SocketIO tests and examples for using the SocketIO extension
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
|
2015-06-02 20:17:33 -04:00 |
Ricardo Quesada
|
5f6f38616a
|
Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms
|
2015-06-02 17:05:05 -07:00 |
Ricardo Quesada
|
87a3a1844a
|
Adds support for Autobindings in Shader
...part of Material
|
2015-06-02 16:56:59 -07:00 |
yangxiao
|
3d4606921b
|
merge cocos
|
2015-06-02 14:27:31 +08:00 |
WuHao
|
3c5326ba1f
|
removed spritePolygon, merge into sprite and draft of AutoPolygon
|
2015-06-02 10:10:09 +08:00 |
yangxiao
|
a0adf507c0
|
getTriangleList instead of load obj
|
2015-06-01 10:56:17 +08:00 |
Dale Stammen
|
494a7079d3
|
fixed test for Windows 10 CC_PLATFORM_WINRT
|
2015-05-29 09:35:53 -07:00 |
Dale Stammen
|
a16d51cad9
|
keyboard events now available in Windows Universal Apps
|
2015-05-29 08:15:04 -07:00 |
WuHao
|
3d62805d04
|
Merge branch 'v3' into fix_spritepolygon
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# cocos/2d/MarchingSquare.cpp
|
2015-05-29 18:10:41 +08:00 |
yangxiao
|
c782d63bef
|
add 3d navigation
|
2015-05-29 16:45:33 +08:00 |
Jacky
|
8df4920f6e
|
fixed file name.
|
2015-05-29 15:03:36 +08:00 |
Huabing.Xu
|
22ddf53539
|
Merge branch 'v3FrameBufferObject' into v3
|
2015-05-29 10:38:42 +08:00 |
Huabing.Xu
|
df09bef567
|
use a different size to create fbo
|
2015-05-29 10:00:48 +08:00 |
Dale Stammen
|
2a71407501
|
fixed double to float conversion compiler warning
|
2015-05-28 15:00:49 -07:00 |
Dale Stammen
|
736de4e37c
|
fixed compiler warning for double to float conversion
|
2015-05-28 13:32:40 -07:00 |
Dale Stammen
|
7623ee390b
|
disable CURL and AssetsManager for Windows 10 UWP
|
2015-05-28 13:32:08 -07:00 |
Huabing.Xu
|
727231a888
|
change test cases
|
2015-05-28 17:04:49 +08:00 |
MAUSMAUSgames
|
847cba026c
|
added _flags to Action, change API to stopActionsByFlags
|
2015-05-28 09:52:49 +02:00 |
Dale Stammen
|
9ee4b4af1e
|
Merge branch 'v3' into v3-winrt-audio
|
2015-05-27 11:54:21 -07:00 |