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 |
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
|
a9dfd8012c
|
Add new bug test to Android, Win 10, Win Universal, Linux project file
|
2015-07-07 11:02:00 +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 |
Neo Kim
|
a3cbd13402
|
Update the resource sub module reference
|
2015-07-01 18:44:59 +09: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 |
Neo Kim
|
00e360f438
|
Add the missing file into CMake and Windows project configurations.
|
2015-07-01 15:36:53 +09: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
|
f5e7184f0b
|
Add new cpp files into Android.mk
|
2015-06-30 18:50:13 +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
|
ddb982246f
|
Merge pull request #12553 from VisualSJ/v3-aa
Encoded into AVC
|
2015-06-26 10:15:02 +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 |
pandamicro
|
1ab369a70b
|
Merge pull request #12542 from andyque/fix-v3.7-stuio-percent-mode
Fix v3.7 cocosStudio percent position bug
|
2015-06-25 21:37:12 +08:00 |
pandamicro
|
a81d7aa8b4
|
Merge pull request #12541 from VisualSJ/v3-aa
[ci skip] Encoded into AVC
|
2015-06-25 20:32:53 +08:00 |
andyque
|
516d45db62
|
update submodule
|
2015-06-25 20:16:43 +08:00 |
VisualSJ
|
110e51d0bc
|
Encoded into AVC
|
2015-06-25 19:01:55 +08:00 |
andyque
|
8f7b439dfe
|
add cocostudio 1.6 tests
|
2015-06-25 18:06:45 +08:00 |
samuele3hu
|
7feaa18d82
|
Fix the compile error for cpp-tests based on android studio
|
2015-06-25 16:08:48 +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 |
pandamicro
|
6638a53d69
|
Merge pull request #12509 from xiaofeng11/v3_xiaofeng
Add a text label to Node3DReader Test, notice user there has no content to show
|
2015-06-24 17:10:08 +08:00 |
Bin Zhang
|
c9c212d0e1
|
Solve the error when run tests projects with `cocos run`.
|
2015-06-24 15:33:13 +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 |
WenhaiLin
|
f95245312a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
|
2015-06-23 17:08:25 +08:00 |
WenhaiLin
|
cbb073e905
|
Fixed Application may be created more than once on Android.
|
2015-06-23 16:58:38 +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 |
pandamicro
|
b1e24ee8f2
|
Merge pull request #12455 from natural-law/v3
Solve the error when build tests projects with cocos command on win32.
|
2015-06-22 13:04:17 +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 |
Bin Zhang
|
85fe9e8816
|
Solve the error when build tests projects with cocos command on win32.
|
2015-06-19 18:32:32 +08:00 |
WenhaiLin
|
45de0b650a
|
[ci skip]Fixed resources.
|
2015-06-19 16:26:03 +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 |
pandamicro
|
4fa1cdc302
|
Update submodules
|
2015-06-17 15:43:35 +08:00 |
Jacky
|
3c5ab4f518
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-06-17 13:04:24 +08:00 |
WuHao
|
aeeed0f4ab
|
Merge remote-tracking branch 'origin' into fix_spritepolygon
# Conflicts:
# external/config.json
|
2015-06-16 11:19:20 +08:00 |
Dale Stammen
|
8d8e7d6cb9
|
Merge branch 'v3' into v3-winrt-librecast
|
2015-06-15 19:27:40 -07:00 |
Dale Stammen
|
0781978788
|
added librecast. Updated build properties
|
2015-06-15 18:44:14 -07:00 |
andyque
|
b8826d9de4
|
improve the enum naming
|
2015-06-16 09:42:06 +08:00 |
Dale Stammen
|
e14fdedf67
|
added missing NavMeshTest files
|
2015-06-15 18:19:51 -07: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 |
Jacky
|
b41c60dbdb
|
Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2
# Conflicts:
# external/config.json
|
2015-06-10 10:23:43 +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 |
Huabing.Xu
|
97b387560b
|
revert some accidental changes
|
2015-06-09 14:06:11 +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 |
Dale Stammen
|
d4c9a81908
|
Merge branch 'v3' into v3-winrt-ogg
|
2015-06-05 16:03:54 -07:00 |
Ricardo Quesada
|
453a3d93bc
|
samplers are treated as uniforms
|
2015-06-05 14:55:33 -07:00 |
Dale Stammen
|
bc1ea87adf
|
updated app guid and disables auto version increment for App Cert tests
|
2015-06-05 06:21:03 -07: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 |
Huabing.Xu
|
ad1f7c472c
|
add render buffer render target for color attachment
|
2015-06-04 11:18:35 +08:00 |
子龙山人
|
95934bf310
|
Merge pull request #12168 from MSOpenTech/v3-winrt-js-fix
V3: Fixes for Windows 8.1 Universal App JavaScript
|
2015-06-04 09:22:21 +08:00 |
Ricardo Quesada
|
6a19661a80
|
Merge pull request #12150 from ricardoquesada/material_custom_uniforms
Material custom uniforms
|
2015-06-03 13:08:04 -07:00 |
Dale Stammen
|
18ce48dc2a
|
/NODEFAULTLIB:MSVCRT to fix linker warning
|
2015-06-03 09:26:15 -07:00 |
zhukaixy
|
76ad42bb0b
|
configure recast project for win8.1 project
|
2015-06-03 14:31:12 +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 |
jianglong0156
|
0c821379f8
|
modify video mp4 formate
|
2015-06-02 17:07:11 +08: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 |
Dale Stammen
|
e0c65c203a
|
Merge branch 'v3' into v3-uwp
|
2015-05-29 08:09:05 -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 |
Huabing.Xu
|
b5e76c7521
|
Merge branch 'v3_origin' into v3FrameBufferObject
|
2015-05-29 15:59:38 +08:00 |
Jacky
|
8df4920f6e
|
fixed file name.
|
2015-05-29 15:03:36 +08:00 |
子龙山人
|
a968bc2d15
|
Merge pull request #12062 from jianglong0156/jsWebviewTest
Js webview test
|
2015-05-29 11:35:30 +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
|
d702012972
|
don't auto update version number for each windows app certification test
|
2015-05-28 15:04:09 -07:00 |
Dale Stammen
|
2a71407501
|
fixed double to float conversion compiler warning
|
2015-05-28 15:00:49 -07:00 |
Dale Stammen
|
dadbbc18d6
|
added Windows 10 UWP project files
|
2015-05-28 13:51:25 -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 |
samuele3hu
|
a89e000f80
|
Synchronize the modification of filenames about shaders to fix the bug of MateriaSystemTest .
|
2015-05-28 10:46:44 +08:00 |
Dale Stammen
|
9ee4b4af1e
|
Merge branch 'v3' into v3-winrt-audio
|
2015-05-27 11:54:21 -07:00 |
jianglong0156
|
e105c47cb0
|
improve testcase
|
2015-05-27 18:23:56 +08:00 |
andyque
|
74f0b3b436
|
add bmfont test
|
2015-05-27 16:58:52 +08:00 |
子龙山人
|
c8d8a9cfd2
|
Merge pull request #12022 from jianglong0156/modifyTestResource
Modify test resource
|
2015-05-27 15:05:32 +08:00 |
子龙山人
|
4cd5d479c0
|
Merge pull request #12028 from samuele3hu/v3_issue10302
issue #10302: Remove duplicated test cases
|
2015-05-27 15:05:10 +08:00 |
子龙山人
|
4a1c5954a3
|
Merge pull request #12045 from andyque/v3
fix iOS 64bit implicit conversion error.
|
2015-05-27 15:04:41 +08:00 |
andyque
|
452248c0dd
|
fix iOS 64bit implicit conversion error.
|
2015-05-27 13:45:07 +08:00 |
子龙山人
|
fc8f556f98
|
Merge pull request #12027 from jianglong0156/modifyShaderSample
rename shader file name
|
2015-05-27 13:33:02 +08:00 |
Huabing.Xu
|
471547e0b0
|
refactor FrameBufferObject to FrameBufferObject and RenderTarget
|
2015-05-27 11:40:12 +08:00 |
Vincent Yang
|
8105e9c714
|
Fix bug: terrain can't move to other position except origin point.
|
2015-05-26 17:51:26 +08:00 |
jianglong0156
|
7820610f13
|
Merge branch 'modifyTestResource' into jsWebviewTest
Conflicts:
cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
tests/js-tests/project.json
tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
tools/tojs/genbindings.py
|
2015-05-26 17:49:17 +08:00 |
jianglong0156
|
4d6b763eb6
|
rename shader file name
|
2015-05-26 17:21:35 +08:00 |
jianglong0156
|
5b7cf14384
|
rename shader file name
|
2015-05-26 17:20:48 +08:00 |
samuele3hu
|
ea75e222ba
|
issue #10302: Remove duplicated test cases
|
2015-05-26 17:20:46 +08:00 |
jianglong0156
|
6f67ec1e6c
|
Merge branch '2d-xv3' into modifyTestResource
|
2015-05-26 16:23:25 +08:00 |
jianglong0156
|
fe677f32dd
|
delete js resource
|
2015-05-26 14:28:53 +08:00 |
jianglong0156
|
fd05998b5f
|
fix the bug: shader in jsb can not run correctly.
|
2015-05-25 17:48:34 +08:00 |
Bin Zhang
|
c491b6a5c1
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-05-25 17:01:29 +08:00 |
Huabing.Xu
|
c22a8e81ce
|
Merge branch 'v3' into v3FrameBufferObject
|
2015-05-25 16:56:22 +08:00 |
Bin Zhang
|
3298145eb5
|
Support build & run Android Studio project in console.
|
2015-05-25 16:53:36 +08:00 |
jianglong0156
|
82c5fbbc76
|
add js resource for web tests
|
2015-05-25 16:50:27 +08:00 |
anniruddh.koppal
|
b2eb946c14
|
Added MP3 support
|
2015-05-23 19:13:12 -07:00 |
Huabing.Xu
|
6d9f850e2c
|
use trianglescommand for sprite
|
2015-05-22 15:54:56 +08:00 |
Bin Zhang
|
3d0c716ee9
|
Add script in build.gradle for sign the release apk.
|
2015-05-22 15:52:41 +08:00 |
minggo
|
d5d329b74f
|
Merge pull request #11946 from andyque/v3-final-android-9-patch-feature
add Android 9-patch image format support
|
2015-05-22 09:52:12 +08:00 |
minggo
|
1a1860e126
|
Merge pull request #11949 from jianglong0156/modifyTestResource
Modify test resource
|
2015-05-22 09:49:08 +08:00 |
minggo
|
10fb660fca
|
Merge pull request #11947 from dabingnn/v3_bugForCameraVisitingScene
add test case to reproduce the bug for visiting scene by multiple camera
|
2015-05-22 09:47:18 +08:00 |
Dale Stammen
|
7d0ca21167
|
use stringstream instead to to_string
|
2015-05-21 12:39:00 -07:00 |
Dale Stammen
|
8bb393f16f
|
use stringstream instead to to_string
|
2015-05-21 12:20:43 -07:00 |
Dale Stammen
|
52546112a5
|
added tests for saving cocos2d::Data buffers
|
2015-05-21 11:22:37 -07:00 |
Bin Zhang
|
94e2e1cb00
|
Modify the configuration for android studio support in console.
|
2015-05-21 18:27:30 +08:00 |
jianglong0156
|
9ed290e64e
|
Merge branch 'jsTest' into modifyTestResource
|
2015-05-21 17:35:13 +08:00 |
Huabing.Xu
|
2d147f0b97
|
[ci skip] and an empty line at the end of file
|
2015-05-21 17:12:35 +08:00 |
Huabing.Xu
|
c202cad712
|
add test case to reproduce the bug for visiting scene by multiple camera
|
2015-05-21 16:57:13 +08:00 |
Bin Zhang
|
41792caa6b
|
Add files & configuration for android studio support in console.
|
2015-05-21 16:34:03 +08:00 |
andyque
|
0352a7a3ea
|
add Android 9-patch image format support
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:16:09 2015 +0800
Add Android 9-patch format support.
Squashed commit of the following:
commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:08:05 2015 +0800
finish refactoring
commit 730bf817f833de56999c616779fc0279890e14bf
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 11:47:08 2015 +0800
refactoring 9-patch
commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 09:42:06 2015 +0800
refactor
commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 17:59:21 2015 +0800
fix lua and Android compile error
commit 2877538fb3a436f95400b2ad637ea147b9df81d7
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 11:32:43 2015 +0800
Add Android 9-patch image format support.
The 9-patch format is used for creating Scale9Sprite.
|
2015-05-21 16:04:37 +08:00 |
Bin Zhang
|
78d4089215
|
Add the project.properties for the ndk-build of proj.android-studio.
|
2015-05-21 15:43:01 +08:00 |
jianglong0156
|
5af04be9ad
|
add js-test resources
|
2015-05-21 15:38:41 +08:00 |
Bin Zhang
|
37dddf9b15
|
Add execute permission for the gradlew in proj.android-studio.
|
2015-05-21 15:31:18 +08:00 |
Dale Stammen
|
209e7c62f4
|
added libbullet to Windows 8.1 Universal App projects
|
2015-05-20 08:01:01 -07:00 |
WenhaiLin
|
a569d877ba
|
[ci skip]Remove unnecessary code.
|
2015-05-20 18:05:46 +08:00 |
minggo
|
7024d3129c
|
Merge pull request #11893 from MSOpenTech/v3-winrt-audio
New audio engine support in winrt win8.1-universal
|
2015-05-20 13:40:41 +08:00 |
WenhaiLin
|
df3548673f
|
Remove unnecessary files.
|
2015-05-20 10:19:32 +08:00 |
anniruddh.koppal
|
8432323450
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio
|
2015-05-19 16:01:10 -07:00 |
Ricardo Quesada
|
aa027fbe0f
|
Properties fixes
`createNonRefCounted` instead of `CrateWithoutAutorelease`
`readlines()` code is easier to read. Same performance
|
2015-05-19 13:51:52 -07:00 |
Jacky
|
514c8ae965
|
move sprite polygon logic to sprite polygon cache.
|
2015-05-19 11:25:53 +08:00 |
anniruddh.koppal
|
e0b3091dcf
|
Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio
Conflicts:
tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
|
2015-05-18 19:21:48 -07:00 |
anniruddh.koppal
|
9081304e80
|
reduced audio file sizes
|
2015-05-18 19:00:59 -07:00 |
minggo
|
e700ef6d30
|
Merge pull request #11856 from WenhaiLin/v3-support-android-studio
Add Android Studio support
|
2015-05-18 16:17:24 +08:00 |
WenhaiLin
|
26f094b1a7
|
Remove unnecessary files
|
2015-05-18 16:02:05 +08:00 |
WenhaiLin
|
54b6260dfd
|
Rename module
|
2015-05-18 15:17:05 +08:00 |
WenhaiLin
|
6dd3108e42
|
Rename module
|
2015-05-18 15:01:20 +08:00 |
Huabing.Xu
|
f96e704f7d
|
Merge branch 'v3' into v3FrameBufferObject
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/cocos2d.h
cocos/renderer/CCGLProgramCache.cpp
|
2015-05-18 13:48:50 +08:00 |
WenhaiLin
|
68188f7424
|
Add native code for AS project.
|
2015-05-18 13:41:58 +08:00 |
minggo
|
8068a2c220
|
Merge pull request #11836 from dabingnn/v3_CameraMaskFor2DAnd3DRendering
V3 camera mask for2 d and3 d rendering
|
2015-05-18 13:32:26 +08:00 |
WenhaiLin
|
7caa6bb2fc
|
Update Copyright.
|
2015-05-18 09:59:50 +08:00 |
anniruddh.koppal
|
2db5a89b87
|
Added new audio engine with wav support
|
2015-05-15 18:17:52 -07:00 |
samuele3hu
|
562c711cda
|
Update CocoStudioUIEditorTest for Lua and replace some deprecated functions.
|
2015-05-15 18:26:21 +08:00 |
WenhaiLin
|
dc8492948e
|
Add Android Studio support
|
2015-05-15 16:37:43 +08:00 |
Huabing.Xu
|
c994f28914
|
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
|
2015-05-15 09:55:51 +08:00 |
minggo
|
973d169cd5
|
Merge pull request #11841 from xiaofeng11/v3
shorten csb file name in ccs-res
|
2015-05-15 09:33:31 +08:00 |
Ricardo Quesada
|
989848a358
|
fixes memory leak
improves performance a little bit
|
2015-05-14 17:24:27 -07:00 |
minggo
|
9f3284d62f
|
Merge pull request #11833 from super626/v3
getTriangleList to bundle and add terrain to 3d render queue
|
2015-05-14 18:16:27 +08:00 |
yusheng.lu
|
60190a1be6
|
changed csb names in ccs-res to shorter
|
2015-05-14 18:08:37 +08:00 |
Vincent Yang
|
efc3f7cb73
|
Add Scene3DTest source to cpp-tests win32/win8 project.
|
2015-05-14 15:19:39 +08:00 |
Huabing.Xu
|
9963480abd
|
linux works
|
2015-05-14 14:49:48 +08:00 |
Huabing.Xu
|
8bdb8125a2
|
fix android compile error
|
2015-05-14 14:36:45 +08:00 |
Huabing.Xu
|
84540c1ff4
|
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
|
2015-05-14 11:55:10 +08:00 |
yangxiao
|
5b8b4fed50
|
multiply scale before construct physics
|
2015-05-14 10:44:08 +08:00 |
Huabing.Xu
|
e6e0a1d15c
|
refactor: FrameBufferObject will contain an Texture2D instead of inheriting from Texture2D
|
2015-05-14 10:36:49 +08:00 |
yangxiao
|
e659373648
|
add getTriangleList to bundle
|
2015-05-14 10:30:20 +08:00 |
minggo
|
7732cd6e77
|
Merge pull request #11814 from super626/issue9767
add issue9767 test
|
2015-05-14 10:20:09 +08:00 |
minggo
|
3b60f67041
|
Merge pull request #11816 from fusijie/fix_spritepolygon
fix memory leakage.
|
2015-05-14 10:19:48 +08:00 |
Ricardo Quesada
|
fde5f8d63c
|
Adds better sample
adds clone support as well
|
2015-05-13 17:39:39 -07:00 |
Ricardo Quesada
|
e95de4de62
|
fixes mipmap issue with parsing Sampler
|
2015-05-13 10:24:32 -07:00 |
Huabing.Xu
|
8311cf8920
|
Fix clearcolor overwrite bug
change test case for FrameBufferObject
|
2015-05-13 17:40:10 +08:00 |
Jacky
|
c7acb9b83d
|
fix memory leakage.
|
2015-05-13 17:21:57 +08:00 |
Huabing.Xu
|
6097b4ddd2
|
add clearAllFBOs function in FrameBufferObject
|
2015-05-13 17:17:54 +08:00 |
yangxiao
|
ec69a34c51
|
add issue9767 test
|
2015-05-13 16:16:45 +08:00 |
Huabing.Xu
|
42514ee62f
|
FrameBufferObject works
|
2015-05-13 14:24:53 +08:00 |
Ricardo Quesada
|
f23b15c6d3
|
Merge pull request #11810 from ricardoquesada/api_fixes
More material samples
|
2015-05-12 23:03:40 -07:00 |
minggo
|
50aa8dba47
|
Merge pull request #11806 from MSOpenTech/v3-winrt-ad-fix
V3: updates to app.xaml code to correctly support touches on Microsoft Ads
|
2015-05-13 13:39:29 +08:00 |
Ricardo Quesada
|
c693573d77
|
more samples
and API fixes
|
2015-05-12 22:24:52 -07:00 |
Ricardo Quesada
|
a83c10fdbf
|
Merge pull request #11807 from ricardoquesada/material_vertexattrib
Adds support of VertexAttribBinding per Pass
|
2015-05-12 21:05:02 -07:00 |
Ricardo Quesada
|
d23ff0ea2c
|
Adds support of VertexAttribBinding per Pass
|
2015-05-12 19:58:09 -07:00 |
Dale Stammen
|
40c19b31c8
|
updates to app.xaml code to correctly support touches on Microsoft AdControls for WP8.1
|
2015-05-12 19:39:40 -07:00 |
minggo
|
a587b28e38
|
Merge pull request #11792 from super626/v3
particle3d can not be seen when added to scene with terrain
|
2015-05-13 09:38:21 +08:00 |
minggo
|
9a479b59f8
|
Merge pull request #11800 from WenhaiLin/v3-pt-sprite
Fix the performance test of sprite
|
2015-05-13 09:37:27 +08:00 |
Wenhai Lin
|
7af99d1991
|
Fix the performance test of sprite
|
2015-05-12 17:59:22 +08:00 |
WenhaiLin
|
c70bac7bb4
|
Add support for visual studio 2015.
|
2015-05-12 16:26:28 +08:00 |
Ricardo Quesada
|
1937431596
|
Material uses new file format
The new file format is easier to read and less error prone
It also fixes many bugs and adds new test cases
|
2015-05-11 21:31:33 -07:00 |
yangxiao
|
4d71175318
|
resove conflict
|
2015-05-12 12:12:29 +08:00 |
Huabing.Xu
|
35940ba8ef
|
Merge branch 'v3_addClearforCamera' of github.com:dabingnn/cocos2d-x into v3_addClearforCamera
|
2015-05-12 10:08:12 +08:00 |
Huabing.Xu
|
cc0b3ffd2e
|
Merge branch 'v3' into v3_addClearforCamera
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
|
2015-05-12 09:49:15 +08:00 |
minggo
|
b5d932668c
|
Merge pull request #11778 from WenhaiLin/v3-per-test
Put back the test cases of performance.
|
2015-05-11 18:16:37 +08:00 |
WenhaiLin
|
1e1d14ec40
|
Remove unused variable.
|
2015-05-11 17:33:27 +08:00 |
WenhaiLin
|
22d04c7c39
|
Put back the test cases of performance.
|
2015-05-11 16:26:14 +08:00 |
Vincent Yang
|
761da2fd20
|
Scene3DTest ok.
|
2015-05-11 14:41:50 +08:00 |
songchengjiang
|
f25c02f230
|
fix bugs of terrain
|
2015-05-11 12:02:32 +08:00 |
Dale Stammen
|
351a898a70
|
removed CC_PLATFORM_WP8
|
2015-05-08 09:19:13 -07:00 |
Vincent Yang
|
3bf16dcc4d
|
Add skybox and partile 3d in Scene3DTest.
|
2015-05-08 18:28:12 +08:00 |
yangxiao
|
2391558c96
|
add physics3d support
|
2015-05-08 15:49:33 +08:00 |
Vincent Yang
|
966f3b6a3f
|
Add terrain in Scene3DTest.
|
2015-05-08 11:46:27 +08:00 |
Vincent Yang
|
60aa223065
|
Add dialog in Scene3DTest.
|
2015-05-07 18:43:07 +08:00 |
Vincent Yang
|
1daca7fac9
|
Merge bug fix code.
|
2015-05-07 16:52:37 +08:00 |
Vincent Yang
|
a8f0ad9d68
|
Add Scene3DTest.
|
2015-05-07 16:22:30 +08:00 |
samuele3hu
|
23e4e0d4e3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
|
2015-05-07 16:21:03 +08:00 |
WenhaiLin
|
03bdb7055a
|
Fixed typo
|
2015-05-07 11:48:55 +08:00 |
minggo
|
fb112995d8
|
Merge pull request #11491 from milos1290/tween
Adding FloatAction to animate any property over time.
|
2015-05-07 09:34:44 +08:00 |
minggo
|
ba1e77d656
|
Merge pull request #11720 from WenhaiLin/v3-label-outline
Label:Fixed outline doesn't match with the characters exactly.
|
2015-05-07 09:30:37 +08:00 |
WenhaiLin
|
b1803d40db
|
Label:Fixed outline doesn't match with the characters exactly.
|
2015-05-06 17:17:30 +08:00 |
Ricardo Quesada
|
fe59b093b5
|
adds love to header files
|
2015-05-05 21:48:05 -07:00 |
minggo
|
074b335d83
|
Merge pull request #11711 from super626/texturecube
Make the skybox seamless
|
2015-05-06 10:17:40 +08:00 |
Ricardo Quesada
|
26bca75e0e
|
Merge pull request #11708 from ricardoquesada/no_exceptions
No throws in cocos2d-x code
|
2015-05-05 17:57:28 -07:00 |
Ricardo Quesada
|
10b71464a7
|
No throws in cocos2d-x code
|
2015-05-05 17:17:41 -07:00 |
Ricardo Quesada
|
90c9dffc1a
|
cleanup Material Code
- removes unused code
- removes experimental code
|
2015-05-05 15:59:41 -07:00 |
Ricardo Quesada
|
ce95bfe059
|
Squashed commit of the following:
commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:46:57 2015 -0700
compiles on win32
commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:01:04 2015 -0700
compiles on windows!
commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 10:20:13 2015 -0700
windows fix
CALLBACK is defined in windows. Use CALLBACK_FN instead
commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15
Merge: 17c5102 f843466
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 09:51:02 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 17c5102215e60c9e9b8b69ceb6b61b84b657ec91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 17:05:49 2015 -0700
Material system works Ok.
Deftaul states are being applyied to RenderState::StateBlock::_default
state as well!
commit 3f5285102ef95c77c505d0f2174f8f77b9bd86e1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 15:52:09 2015 -0700
more fixes for material
blending works as expected
commit 347eaea42248eb07bc77844dcee56dcbcf0fbcb2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 12:14:00 2015 -0700
compiles on Android
compiles on Android
commit 5feef67410a6e8408414230887c177a5cc3d8c35
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 11:01:46 2015 -0700
Cmakefiles
works with Cmake again
commit 1366da20efd4f63f683ac9264e18aa71d84bcc71
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat May 2 18:17:50 2015 -0700
Particle3D working Ok with its own uniforms
commit c6cfa32e1f693e6d71d00e0cd9dd9610ca1e7663
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 1 17:32:00 2015 -0700
MeshCommand now works 100% on Material!
commit 92d641e29675ffc58daba48fcdcc5ec6459be02f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 1 15:49:14 2015 -0700
multiple meshes work Ok
commit 842927d18b5605b2fd1bd3a679fc25418c7eeab8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 1 13:43:56 2015 -0700
Adds `clone` to GLProgramState
commit c4b8e222f8e852254b1f23f0e17c16dfca7cc5ca
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 18:54:34 2015 -0700
adds comment about the glprogramstate bug
commit 2d008ec90557025507e0b17284e60b39fc9b42d3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 18:28:39 2015 -0700
some uniforms moved to Material
commit 11f59f87079a6cb698c7e9b5a55735f6d51cf420
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 16:52:07 2015 -0700
depth test moved to Material!
commit 4dabb53641c293bfe8c417fe3491ec33b33ffc4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 13:12:28 2015 -0700
Material/Technique/Pass subclass of RenderState
Inheritance of RenderState. Code from GamePlay3D
commit a8b888dc30cf7ab4fae186acec2a366dfb967116
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 12:05:26 2015 -0700
same as v3
commit c026de5318a2a03beed1de6d7a0efda431569a5c
Merge: 4561e3f 254a4b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 11:37:40 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 4561e3f5763849872d888a3be9ebbdcfb1a7bf9d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 18:02:21 2015 -0700
fixes on blending
commit 1b4cd8fd1c7b2a489b6a52ab6d42548eb7c7fac0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 17:51:05 2015 -0700
better defaults for StateBlock
commit 3a661c35908aa075754d7b9dfac45be1af3b38e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 17:46:36 2015 -0700
RenderState::bind() binds lots of states
commit 074d5fb4a485e4ac32996c345e314594806e3cf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 16:40:07 2015 -0700
Adds REnderState parsing in .material
commit 7c0f098b7e2e198aa4a821bfbdec661eeba2587e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 16:06:31 2015 -0700
RenderState added into RenderState
Code based on GamePlay3D. Adds GamePlay3d License.
commit 04a6295ca5839e2e1202881b8a10733685c113d6
Merge: 52c916f 5671818
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 11:27:55 2015 -0700
Merge branch 'v3' into material_system
commit 52c916fb4df04558433b1370102a5e9269f73607
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 18:15:12 2015 -0700
order files alphabetically
order files alphabetically
commit a5f54f0c1ca5d997a87e0231ce1b28d3c8d9ca64
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 17:46:07 2015 -0700
Adds cmake and android support
commit 2432b1dd2ec3c7db78d4d9e5e7b9fbe491b95884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 16:33:50 2015 -0700
for some reason the callback was crashing
... bug in the callback code?
in any case, we didn't need it and it was making the code slower.
commit 7844d32d04cb411ddae139d9598adcb04b899606
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 14:00:24 2015 -0700
more little fixes
commit 2992a5e0f4a8dfac87d6aab37e101154f8b41519
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 12:11:28 2015 -0700
MeshCommand using Material internally
works
commit 67a435d66b4e554b4d24e462ca2ad42408157e69
Merge: 6dee7ca b9a994f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 10:34:03 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 6dee7cac6a51b4c123aabb111b0f8951082b1507
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 27 17:41:27 2015 -0700
improved readebility of MeshCommand code
commit 3a57eb200f7cba4a17f512060dd3f121d83e32fd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 27 15:41:07 2015 -0700
mesh supports Material
`Mesh` supports `Material`
Now `MeshCommand` needs to implement it correctly.
commit 2fc745c787555fbd5c6b100b0a2833ef0e65ad73
Merge: 05b16f5 bd5f4e0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 27 11:23:28 2015 -0700
Merge branch 'v3' into material_system
commit 05b16f5c6f783ff38b4ae54528f9b949d8bb39a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 17:40:48 2015 -0700
Adding Material into Mesh
WIP.
commit bc62f1a146ff9ad9864d8ff317f6a9540760066a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 16:39:54 2015 -0700
cosmetic
commit 2f86d50cee15c6af20abb512368aa36dc4ed3ccf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 16:26:41 2015 -0700
moves even more code form Sprite3D to Mesh
commit 04643bed3c277f0a775e962a5c87f550b1a59e74
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 16:15:21 2015 -0700
Moves "draw" from `Sprite3D` to `Mesh`
commit 4bf884cdcb1a8df7522adeab364368493aba11e0
Merge: 2f305fc 2199bf1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 15:00:50 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 2f305fc68ad847fd4bdf855611c6f6f6a4bf63d2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 14:46:28 2015 -0700
cosmetic
commit a697b43a96e5f9440787aa2a1c4e178d98b2e5bc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 23 16:44:21 2015 -0700
revert my changes...
...actually the GLProgramState code was Ok... ouch
commit 36323c62eae2f8dbdcd7e13075758752cce44132
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 23 15:40:54 2015 -0700
parsing GLProgramState validates the attributes
commit a406d6236a78244f73e81ded0b4148199a8677e5
Merge: 3be7fde cf177bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 23 12:10:31 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 3be7fdee9d88a14916b4f25b1c0b6f50cb619c04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 17:45:34 2015 -0700
little progress on Sprite3D + Material
GLProgramState needs to decouple Uniforms from Attributes in
`applyGLProgram`.
binding the attributes is something that needs to be done
at a different order.
Perhaps the attributes are part of a VAO or something else.
the method `applyAttributes()` has a variable to avoid that...
but everything looks very hackish.
commit f82496c61c9cb5a0787f883a4fb2d475889fa711
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 15:46:02 2015 -0700
doesn't crash :)
but doesn't show anything either
commit 0593fb09dc987aa2dd22af3a6c3aa8241fedfe5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 13:35:45 2015 -0700
adding sprit3d test
commit e716da63fe053b48db06f2aed9e0280256dd5f1b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 12:10:32 2015 -0700
MeshCommand: initial draw with Material
commit d758041d81c3e6275997205e6395c46006bcc4ca
Merge: 8cdc99f ca1a95f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 10:41:05 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 8cdc99fca664b0c9c2a536d431ffcc7844d69b3e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 21 21:57:28 2015 -0700
adding Material to MeshCommand
commit 0121872709c5e584b9b9f102e0f8dfc9c836841b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 21 19:39:09 2015 -0700
pre commit before merging MeshCommand
commit 06c0ac2a67e303bde98dff75ac436ec22de59263
Merge: 736feb1 0287b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 21 18:19:00 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 736feb1b6495b7411525afb130015bdb31b5c471
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 20 17:22:03 2015 -0700
Pass conforms to create()/init() pattern
commit 6103ffbb8479681b6665e81f0572bc3287919d07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 20 17:04:19 2015 -0700
defines are strings
better error checking when creating objects
autorelase added in Pass, Material, Technique
commit 1efcbab63c7ca4259d50825144184baee1b577ac
Merge: 5b233bc fd3e38b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 20 11:23:47 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 5b233bc879bd65123092d366257843465ec1d306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 17 15:31:37 2015 -0700
blur effect works with alpha
commit 836d3c4a0dcc3a363e1b0290e628b7ac2a973c89
Merge: e4c1dd2 425b2b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 17 15:04:35 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit e4c1dd23d8b28f2631efe30f6cc9da9eda4501bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 17 15:04:07 2015 -0700
Material, Technique, Pass: they have parent
commit 7c3f258a1c9e4ff319db4e3eebfd39006d673d91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 21:48:06 2015 -0700
multipass works
commit b73ede73b72d8305f6f9d7898b4a5aa2336e9e32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 17:31:04 2015 -0700
yeah!
more materials... a lot to do yet
commit d54d24ed185071ce1350bbf71914a64c9f6f228e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 17:06:46 2015 -0700
yeah! works!
commit 1e70cb553148e6c136df42a789bf85184e73762d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 16:43:54 2015 -0700
simple test of material system works!!!
commit c8581dfe9e970a3004254987416d75cccc644ccd
Merge: 83aeec4 5d5fa3d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 13:51:45 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 83aeec41c7933ee46f5763ad64dcdc71a50885dc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 15 18:04:23 2015 -0700
JSON file curated
fixes minor bugs
commit 35f669e7fad6257ff6e60023e95ec757fdfe23f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 15 17:22:36 2015 -0700
parsers shaders!
including uniforms
commit 3f58bad0b2bc7ebbcfcf74e1eb02048f9d574340
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 14 23:24:18 2015 -0700
Material parses texture
commit 1f678faf9d6c25f6405591f052da511281be8768
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 14 18:22:33 2015 -0700
material parsing almost working
commit 9a79c45fe4d735a772d5e6d9e1f8bcb02546560d
Merge: d0ff296 d54ddbd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 14 09:23:23 2015 -0700
Merge branch 'v3' into material_system
commit d0ff2960f4f9edc4714f9d3edf921f3365d305c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 13 18:42:42 2015 -0700
json parsing broken
ha... I need to parse the content of the file, to the name of the file.
to be fixed tomorrow
commit e5aab39e5774d997f848155fc7209e9fbbd03bbc
Merge: 81e93fa bc34554
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 13 10:19:11 2015 -0700
Merge branch 'v3' into material_system
commit 81e93faac9d80888e975ee19d7412c54daf439a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 17:41:12 2015 -0700
Adds more dummy files for material
commit 5552a1e099bcf960d962c5369973ea663f802895
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 17:01:16 2015 -0700
adds empty test
commit 7027c85fb24109f1ed4c50877dbec35618b5b39c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 15:36:24 2015 -0700
more material fixes
multiple passes added in renderer
commit db6745ead9879c6ce66b1921f32bf927421c54d9
Merge: 58d2412 8a160d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 11:52:30 2015 -0700
Merge branch 'v3' into material_system
commit 58d241266bdbd88162bb7ae9a7e868af173e6375
Merge: 0eccb23 b409f20
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 15:42:35 2015 -0700
Merge branch 'v3' into material_system
commit 0eccb236aa933eb471416258c5bb55a7ca3a24f0
Merge: 83494de 967f35a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 15:18:34 2015 -0700
Merge branch 'cpp_compiles_on_mac' into material_system
commit 83494dedd0f4e7092f0267187cf07bd7de7723c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 15:09:59 2015 -0700
compiles on Mac
commit cca5b060164182b67df21fa330dce938e17fb324
Merge: dfc3740 09c50c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 13:54:59 2015 -0700
Merge branch 'v3' into material_system
commit dfc374099ca02e547478d24fa8fd61817a85862c
Merge: fa2152b 64c45fa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 8 14:16:27 2015 -0700
Merge branch 'v3' into material_system
commit fa2152b3402e3519d35f98309c4acc03b6790370
Merge: 90b7b6f b648d1f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 3 10:15:28 2015 +0800
Merge branch 'v3' into material_system
commit 90b7b6f6540edff156e22fdf38021a5c83194deb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 3 10:13:24 2015 +0800
little changes to pass
commit 7f8b83017f03572a3698f431b6af497d62fcfa25
Merge: 7460614 0779d05
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 2 08:36:43 2015 +0800
Merge branch 'v3' into material_system
commit 7460614dd8b7eff5d8c759be54dd205333b26033
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 2 08:23:17 2015 +0800
small changes
commit fa0354e74983795adafad3bedc9c50f6e8e328c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Mar 26 18:20:46 2015 -0700
initial Material system
|
2015-05-05 13:07:32 -07:00 |
minggo
|
902c033838
|
Merge pull request #11683 from WenhaiLin/v3-label-i10576
Label:Fixed the character positions could be wrong if `getLetter(letterIndex)` get called.
|
2015-05-05 18:19:33 +08:00 |
samuele3hu
|
f1b5729183
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
|
2015-05-05 16:14:57 +08:00 |
samuele3hu
|
037c17fe5d
|
Remove vs2012 support in v3
|
2015-05-05 16:11:26 +08:00 |
minggo
|
701d5fa827
|
Merge pull request #11673 from vovkasm/dev/v3-cleanup
Fix warnings in v3.
|
2015-05-05 11:26:10 +08:00 |
zhangbin
|
23ed3dbe4c
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-05-05 10:53:04 +08:00 |
zhangbin
|
b4f2d94109
|
Update js bindings & js tests.
|
2015-05-05 10:50:19 +08:00 |
zhukaixy
|
a103d792f3
|
modify the texture.repeatParam to clamp to avoid warping artifacts of skybox
|
2015-05-04 17:43:42 +08:00 |
WenhaiLin
|
ed4c638663
|
Add test case for issue#10576
|
2015-05-04 10:09:14 +08:00 |
Vladimir Timofeev
|
62cad07a81
|
Fix couple of unused entities in cpp-tests
|
2015-05-01 12:24:04 +03:00 |
Vladimir Timofeev
|
0aecc15a25
|
Correct field initialization order in various places (Xcode warnings)
|
2015-05-01 12:19:30 +03:00 |
WenhaiLin
|
0e1338f6f8
|
Add test case for issue#10773
|
2015-04-30 16:11:59 +08:00 |
minggo
|
4acd231f89
|
merge v3.6
|
2015-04-30 13:46:08 +08:00 |
Dale Stammen
|
904abeab87
|
added CC_WINDOWS_PHONE_8_1 to preprocessor defines
|
2015-04-29 09:48:14 -07:00 |
WenhaiLin
|
ce7e36f76e
|
Fixed warns and crash on Win32.
|
2015-04-28 20:10:56 +08:00 |
Milos Jakovljevic
|
0343fd4061
|
Changing the name of the Action, adding more comments
|
2015-04-28 11:48:19 +02:00 |
WuHao
|
2b245e0318
|
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6
|
2015-04-28 15:19:52 +08:00 |
WuHao
|
9d46c5413d
|
added performance test for SpritePolygon
|
2015-04-28 15:18:40 +08:00 |
minggo
|
7ddbc59c95
|
Merge pull request #11622 from MSOpenTech/v3.6-winrt-fix
Use TextBMFont when text is updated from slider for faster performance
|
2015-04-28 11:55:33 +08:00 |
andyque
|
854fcdf2bf
|
fix spritepolygon
|
2015-04-28 11:26:21 +08:00 |
Dale Stammen
|
4d7e6567ea
|
Use TextBMFont when text is updated from slider for faster performance
|
2015-04-27 19:48:15 -07:00 |
minggo
|
1ac0c8c0b1
|
Merge pull request #11616 from WenhaiLin/v3.6
TransitionsTests:Fixed Transition not work when switch between test cases
|
2015-04-28 09:35:45 +08:00 |
minggo
|
ce9f40fb9a
|
Merge pull request #11619 from samuele3hu/v3.6_test1
Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygon
|
2015-04-28 09:32:30 +08:00 |
samuele3hu
|
51bcac9e84
|
Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygonTest
|
2015-04-28 09:17:00 +08:00 |
WuHao
|
597d2289c0
|
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6
|
2015-04-27 17:31:50 +08:00 |
WuHao
|
a046f74c4d
|
fix anchor point bug
|
2015-04-27 17:30:38 +08:00 |
WenhaiLin
|
70a641e2b3
|
TransitionsTests:Fixed Transition not work when switch between test cases.
|
2015-04-27 17:22:20 +08:00 |
minggo
|
c9bacd58e8
|
Merge pull request #11591 from Wu-Hao/v3.6
V3.6
|
2015-04-27 14:22:21 +08:00 |
WuHao
|
9f2ea5fbb9
|
fixed some SpritePolygon create, added more tests
|
2015-04-27 13:34:47 +08:00 |
minggo
|
0a8f533e80
|
Merge pull request #11590 from super626/v3
Animate3D Quality control
|
2015-04-27 10:58:10 +08:00 |
samuele3hu
|
bd5ca083e9
|
Fix the compile error of SpritePolygonTest on the win32 and wp8.1
|
2015-04-26 23:08:14 +08:00 |
WuHao
|
c1d10ffa1c
|
fixed poly2tri creation method, added testCase
|
2015-04-24 18:28:28 +08:00 |
WuHao
|
5620da1adf
|
fixed anchor point issue, removed rect rotated property
|
2015-04-24 18:17:12 +08:00 |
WuHao
|
0e318dd8dc
|
fixed UV issue, also taking account of contentScaleFactor, made test case better
|
2015-04-24 17:39:43 +08:00 |
lvlong
|
59dc646c17
|
modify test
|
2015-04-24 14:12:24 +08:00 |
lvlong
|
8e51a561b1
|
modify some about animate3D quality!
|
2015-04-24 11:49:28 +08:00 |
WuHao
|
07349ff588
|
initial cpp test
|
2015-04-23 18:03:03 +08:00 |
zhangbin
|
61cf0ad28b
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
|
2015-04-23 15:46:19 +08:00 |
samuele3hu
|
8d9064b4e4
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test
Conflicts:
tests/cpp-tests/Classes/AppDelegate.cpp
|
2015-04-22 10:31:39 +08:00 |
samuele3hu
|
47e2698986
|
Fix the cocos3.6beta0 bugs
|
2015-04-22 10:20:21 +08:00 |
Dale Stammen
|
e4ae0f9c2c
|
disable INCREMENTAL for ARM builds. Fixes lnk2013 error
|
2015-04-21 08:50:43 -07:00 |
zhangbin
|
f75bf93706
|
Update the js-tests project files.
|
2015-04-21 15:30:47 +08:00 |
Dale Stammen
|
6c7ecf0b18
|
removed CC_PLATFORM_WINRT messagebox code
|
2015-04-20 10:32:11 -07:00 |
Dale Stammen
|
aae82c24f9
|
removed CC_PLATFORM_WP8
|
2015-04-19 16:28:54 -07:00 |
Milos Jakovljevic
|
a13c519882
|
Adding FloatAction to animate any property over time.
|
2015-04-18 14:35:14 +02:00 |
minggo
|
3c7d5afce2
|
Merge pull request #11465 from WenhaiLin/v3-videoplayer-iosfix
Fix crash when play streamed MP4 file.
|
2015-04-16 18:16:28 +08:00 |
WenhaiLin
|
fc75f46abb
|
Fix crash when play streamed MP4 file.
|
2015-04-16 16:27:09 +08:00 |
minggo
|
408d164fea
|
Merge pull request #11458 from andyque/fix-a-side-effect-of-button-memory-optimization
fix side effect of ui::button clone
|
2015-04-16 16:15:25 +08:00 |
andyque
|
8a9f420735
|
fix side effect of ui::button clone
|
2015-04-16 14:38:00 +08:00 |
Dale Stammen
|
b700798287
|
removed WP8 project files
|
2015-04-15 07:13:54 -07:00 |
minggo
|
d54ddbd010
|
Merge pull request #11440 from WenhaiLin/v3-TextFieldTTFDefaultTest
TextFieldTTFDefaultTest: Fixed can't take input from the keyboard.
|
2015-04-14 22:36:32 +08:00 |
WenhaiLin
|
5f4fd20b06
|
TextFieldTTFDefaultTest: Fixed can't take input from the keyboard.
|
2015-04-14 18:04:35 +08:00 |
andyque
|
3c3d76fd9e
|
remove listview focus test
|
2015-04-14 17:48:43 +08:00 |
minggo
|
fbb1c578a2
|
Merge pull request #11430 from minggo/update-spine
update spine runtime to v2.1.25
|
2015-04-14 17:01:11 +08:00 |
minggo
|
cdd7acc537
|
add spine test case
|
2015-04-14 16:14:51 +08:00 |
XiaoYang
|
5ed65e13c9
|
Merge pull request #303 from zhukaixy/texturecube
bugfix for cubemap
|
2015-04-14 14:25:35 +08:00 |
zhukaixy
|
451a560200
|
bugfix for cubemap
|
2015-04-14 14:20:31 +08:00 |
yangxiao
|
8c8058a9be
|
merge cocos resolve conflict
|
2015-04-14 13:56:05 +08:00 |
zhukaixy
|
6684491249
|
1: update cube texture for sky box
2: add mouse-controled camera for test case (skybox)
|
2015-04-14 01:39:23 +08:00 |
minggo
|
da69dbd133
|
Merge pull request #11388 from xiaofeng11/v3
Reader update
|
2015-04-13 11:20:53 +08:00 |
pipu
|
755134ba3f
|
Update parse animation easing
|
2015-04-10 17:05:55 +08:00 |
minggo
|
698d93a42b
|
Merge pull request #11379 from WenhaiLin/v3-physics-fix
Physics: Fixed position of physics body is wrong when the position of parent node changes
|
2015-04-10 16:45:45 +08:00 |
Wenhai Lin
|
97082cb169
|
Physics: Fixed position of physics body is wrong when the position of parent node changes
|
2015-04-10 15:39:39 +08:00 |
andyque
|
10c90b06aa
|
fix ui::Text outline don't change content size
|
2015-04-10 15:33:48 +08:00 |
pipu
|
7a67b6ccce
|
Test samples
|
2015-04-10 14:52:54 +08:00 |
andyque
|
c8d8a0d220
|
add disableEffect API for ui::Text
|
2015-04-10 14:18:16 +08:00 |
Ricardo Quesada
|
967f35ad82
|
removes warning
warnings are treated as errors on Mac.
Why this was even merged? Do we have a Mac builder? The Mac builder
should fail.
|
2015-04-09 15:15:15 -07:00 |
WenhaiLin
|
b5ae74c52b
|
[ci skip]Update the reference of submodule ccs-res.
|
2015-04-09 17:07:37 +08:00 |
WenhaiLin
|
8b839edfde
|
Test automation support: Fixed may not to restore TestList to the original position.
|
2015-04-09 16:46:35 +08:00 |
WenhaiLin
|
f502c5900b
|
[ci skip]Remove unwanted code.
|
2015-04-09 16:23:29 +08:00 |
WenhaiLin
|
c5ff21f7c6
|
[ci skip]Remove unwanted code.
|
2015-04-09 16:18:24 +08:00 |
WenhaiLin
|
16bce0bfd3
|
Fixed crashes in test case of Scene/Node.
|
2015-04-09 15:43:01 +08:00 |
WenhaiLin
|
2e24f302d6
|
Fixed the test case of BillBoard not respond click event as expected.
|
2015-04-09 15:08:49 +08:00 |
WenhaiLin
|
e5bd611604
|
Test automation support:Make test cases didn't need to care about TestSuite when invoking Director::getInstance()->replaceScene.
|
2015-04-09 14:59:34 +08:00 |
WenhaiLin
|
a378651320
|
Fixed some test cases of action not respond click event as expected.
|
2015-04-09 14:20:59 +08:00 |
minggo
|
c022b7d615
|
Merge pull request #11351 from WenhaiLin/v3-autotest
Test automation support:
|
2015-04-09 13:41:20 +08:00 |
Ricardo Quesada
|
510d502631
|
Merge remote-tracking branch 'cocos2d/v3' into xcode_6_3_tests_compiles
|
2015-04-08 21:59:22 -07:00 |
WenhaiLin
|
57508b3c12
|
Fixed compile errors
|
2015-04-09 12:49:32 +08:00 |
Ricardo Quesada
|
49e2e8964e
|
more compilations issues.
compiles on Android
|
2015-04-08 21:40:39 -07:00 |
Ricardo Quesada
|
23b0d4d2f6
|
more fixes with the namespaces
|
2015-04-08 21:23:47 -07:00 |
WenhaiLin
|
565a79022b
|
Test automation support:
1.TestList support mouse scroll.
2.TestList respond click event in the right response area.
|
2015-04-09 11:56:49 +08:00 |
tangziwen
|
0649f9709c
|
remove unnecessary reload in terrain test
|
2015-04-09 10:20:06 +08:00 |
tangziwen
|
4ca6b559e6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
|
2015-04-09 09:40:22 +08:00 |
tangziwen
|
58a9e43c9c
|
update terrain test
|
2015-04-09 09:39:27 +08:00 |
Ricardo Quesada
|
51374eb822
|
tests compiles on xcode 6.3
no more USING_NS in the header files.
it creates conflict with xcode 6.3
|
2015-04-08 17:37:30 -07:00 |
tangziwen
|
0c2c8b072a
|
terrain update terrain test update ,resource update
|
2015-04-08 15:13:24 +08:00 |
minggo
|
8f52d950de
|
Merge pull request #11309 from WenhaiLin/v3-autotest
Test automation support:Catch crash event on WIN32/MAC/IOS/ANDROID
|
2015-04-08 09:59:13 +08:00 |
andyque
|
9f5932ceeb
|
resolve the chipmunk compile issue
|
2015-04-07 23:20:02 +08:00 |
WenhaiLin
|
6bcddbc779
|
Test automation support:Catch crash event on WIN32/MAC/IOS/ANDROID
|
2015-04-07 16:14:27 +08:00 |
minggo
|
eb928432ce
|
Merge pull request #11302 from WenhaiLin/v3-label-shadowcolor
Label: Fixed shadow color is incorrect.
|
2015-04-07 15:27:19 +08:00 |
minggo
|
b85d26b2f6
|
Merge pull request #11303 from WenhaiLin/v3-autotest
Add missing test
|
2015-04-07 14:28:05 +08:00 |
minggo
|
420ace04e5
|
Merge pull request #11304 from tangziwen/terrain
terrain test update
|
2015-04-07 14:02:01 +08:00 |
tangziwen
|
176f7dd879
|
slightly modified the camera's default position & terrain's Lod distance in the terrain test
|
2015-04-07 11:50:09 +08:00 |
WenhaiLin
|
a6699058a0
|
Add missing test
|
2015-04-07 11:43:02 +08:00 |
WenhaiLin
|
c5c5d3e39d
|
Label: Fixed shadow color is incorrect.
|
2015-04-07 11:17:01 +08:00 |
minggo
|
deaa6a19f0
|
Merge pull request #11257 from super626/terrain
Terrain
|
2015-04-07 09:32:35 +08:00 |
Ricardo Quesada
|
a782eb022d
|
fixes warnings on Xcode 6.3
instead of using `abs()` it uses `std::abs()`
|
2015-04-06 12:08:30 -07:00 |
tangziwen
|
14b94a6aac
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
Resolve Conflicts:
tests/cpp-tests/Classes/controller.cpp
|
2015-04-03 17:50:08 +08:00 |
tangziwen
|
d79c38e17a
|
add WP8 support
|
2015-04-03 16:50:09 +08:00 |
tangziwen
|
0193420dfc
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
Resovle Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-04-03 15:45:51 +08:00 |
tangziwen
|
ee41c9b3f1
|
add win rt support
|
2015-04-03 14:36:29 +08:00 |
WenhaiLin
|
0d51c13743
|
Make all test cases work fine with new test framework.
|
2015-04-03 14:31:03 +08:00 |
tangziwen
|
8a7b318c1a
|
Add some helper function to detect the heightMap size,refact Terrain::Create, fix typo ,add doxygen comment
|
2015-04-03 13:49:07 +08:00 |
WenhaiLin
|
6f47006324
|
Add new test framework.
|
2015-04-03 11:54:39 +08:00 |
yangxiao
|
cfbfe3b676
|
add to linux
|
2015-04-02 16:57:38 +08:00 |
yangxiao
|
784c68f9a0
|
modify test title
|
2015-04-02 14:18:22 +08:00 |
XiaoYang
|
984babc9c9
|
Merge pull request #281 from tangziwen/terrain
update terrain
|
2015-04-02 10:19:11 +08:00 |
tangziwen
|
6cd1077cb0
|
update terrain
|
2015-04-01 18:24:05 +08:00 |
minggo
|
eefd06415b
|
Merge pull request #11229 from xiaofeng11/v3
Add destroyCocosStudio()
|
2015-04-01 10:49:49 +08:00 |
pipu
|
bc7d8f0a09
|
Add method destroyCocosStudio() for CocoStudio
|
2015-03-31 19:55:56 +08:00 |
minggo
|
c1cd041912
|
Merge pull request #11221 from super626/v3
3d animation quality control
|
2015-03-31 17:23:58 +08:00 |
pipu
|
a0a461f319
|
Supplement some Reader.
|
2015-03-31 11:22:34 +08:00 |
yangxiao
|
4e03c62b03
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2015-03-31 11:09:59 +08:00 |
yangxiao
|
a6c1d15120
|
fix warning
|
2015-03-31 11:09:38 +08:00 |
XiaoYang
|
45987b6a60
|
Merge pull request #276 from tangziwen/terrain
update Terrain, support skirt
|
2015-03-31 09:14:27 +08:00 |
tangziwen
|
1a93f87a15
|
update terrain
|
2015-03-30 18:25:22 +08:00 |
lvlong
|
4bc44c207d
|
modify config-example.plist
|
2015-03-30 18:07:32 +08:00 |
lvlong
|
cbdfd77400
|
modify some name.
|
2015-03-30 17:46:45 +08:00 |
lvlong
|
f967fef7d0
|
modify Sprite3DWithSkinTest, can switch animation quality.
|
2015-03-30 17:08:49 +08:00 |
lvlong
|
ccb5039411
|
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
Conflicts:
cocos/base/CCConfiguration.h
|
2015-03-30 11:50:01 +08:00 |
minggo
|
59441adc2c
|
Merge pull request #11213 from super626/texturecube
Texturecube bug fix
|
2015-03-30 10:48:10 +08:00 |
yangxiao
|
b469cfa928
|
merge cocos
|
2015-03-30 10:28:14 +08:00 |
XiaoYang
|
dbf86e3e66
|
Merge pull request #270 from zhukaixy/patch-2
Bugfix: for glcontext recreated
|
2015-03-27 17:08:51 +08:00 |
zhukaixy
|
8a1637e3de
|
Update cube_map.frag
|
2015-03-27 16:50:59 +08:00 |
yangxiao
|
a45f0d1a76
|
merge cocos
|
2015-03-27 16:50:40 +08:00 |
zhukaixy
|
a5bda44f22
|
Update Sprite3DTest.cpp
|
2015-03-27 16:47:48 +08:00 |
tangziwen
|
3a3e1e9ad1
|
update terrain test
|
2015-03-27 10:47:52 +08:00 |
yangxiao
|
c23746fbcd
|
modify
|
2015-03-26 13:05:42 +08:00 |
yangxiao
|
7af9957e1c
|
reset submodule
|
2015-03-26 12:56:38 +08:00 |
yangxiao
|
000e34c6d0
|
merge cocos
|
2015-03-26 12:50:18 +08:00 |
yangxiao
|
84535feb0c
|
merge cocos
|
2015-03-26 11:59:26 +08:00 |
lvlong
|
c999307150
|
add different animate quality.
|
2015-03-26 11:30:22 +08:00 |
yangxiao
|
8d24ea7efe
|
rename to nodeanimation
|
2015-03-26 10:20:28 +08:00 |
yangxiao
|
90e010aec8
|
add light
|
2015-03-26 10:09:12 +08:00 |
zhukaixy
|
572ede87f2
|
correct for code indent
|
2015-03-26 10:05:43 +08:00 |
zhukaixy
|
aead9e5855
|
correct for code indent
|
2015-03-26 09:53:41 +08:00 |
lvlong
|
f93dffdeb0
|
node frame animation test and resource
|
2015-03-26 09:25:37 +08:00 |
lvlong
|
ecfd66cda3
|
node frame code!!!!!
|
2015-03-26 09:12:05 +08:00 |
zhukaixy
|
c1e5e47bdb
|
fix code style issue
|
2015-03-25 13:46:30 +08:00 |
zhukaixy
|
54472497a4
|
fix comments
|
2015-03-25 13:43:55 +08:00 |
zhangbin
|
7aaf122a41
|
Support compile & run test projects with cocos2d-console on wp8.
|
2015-03-25 11:42:55 +08:00 |
zhukaixy
|
2ebc854335
|
Modify code style
|
2015-03-25 11:36:11 +08:00 |
zhukaixy
|
6eaa78d1cb
|
add reload mechanism for TextureCube and Skybox
|
2015-03-24 15:43:59 +08:00 |
minggo
|
7e7cef3556
|
Merge pull request #11066 from super626/v3
Fix android switch back and foreground bug
|
2015-03-23 11:15:17 +08:00 |
XiaoYang
|
fcf6cab884
|
Merge pull request #262 from tangziwen/v3_abc
fix UVAnimation test while switching back to foreground
|
2015-03-23 10:38:11 +08:00 |
tangziwen
|
e213cd1747
|
fix UVAnimation test while switching back to foreground
|
2015-03-23 10:19:00 +08:00 |
pipu
|
0bdfe99731
|
Update resources of Test TestTimelineProjectNode.
|
2015-03-20 17:08:15 +08:00 |
Dale Stammen
|
73e01c0d5e
|
added missing PerformanceParticle3DTest.cpp to WP8 project
|
2015-03-19 05:53:37 -07:00 |
minggo
|
f3e518b103
|
Merge pull request #10985 from dabingnn/v3_fixRenderTextureCrash
fix crash problem when switch to a new scene after call RenderTexture::s...
|
2015-03-19 20:00:31 +08:00 |
minggo
|
1aec5a9508
|
Merge pull request #10980 from super626/v3
3d particle performance test
|
2015-03-19 20:00:07 +08:00 |
yangxiao
|
0d045feec5
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2015-03-19 18:10:41 +08:00 |
yangxiao
|
6c6fffc847
|
modify enum to static int
|
2015-03-19 18:10:16 +08:00 |
Huabing.Xu
|
8b04a15ee8
|
fix crash problem when switch to a new scene after call RenderTexture::saveToFile()
|
2015-03-19 16:39:45 +08:00 |
XiaoYang
|
dfe9e45d50
|
Merge pull request #259 from lvlonggame/camera_culling_crash
fix: Camera culling crash
|
2015-03-19 16:30:00 +08:00 |
tangziwen
|
f60649b39f
|
add particle-perf for win rt
|
2015-03-19 16:09:16 +08:00 |
lvlong
|
9e3ae9bfb5
|
remove get window size.
|
2015-03-19 15:24:58 +08:00 |
zhukaixy
|
0587122ccc
|
Move Skybox.shader from Sprite3DTest to Shader3D folder
|
2015-03-19 15:11:24 +08:00 |
lvlong
|
9c0b618046
|
Merge branch 'v3' of github.com:super626/cocos2d-x into camera_culling_crash
|
2015-03-19 15:04:18 +08:00 |
lvlong
|
7f18c9809c
|
fix :camera-culling MoveTo
|
2015-03-19 15:02:38 +08:00 |
yangxiao
|
0106c1184e
|
add pu for performance test
|
2015-03-19 15:00:07 +08:00 |
yangxiao
|
b6a29d80de
|
3d particle performance test
|
2015-03-19 14:43:29 +08:00 |
songchengjiang
|
9329ba1b37
|
add particle3D performance Test
|
2015-03-19 12:32:53 +08:00 |
yangxiao
|
e6770909f2
|
reset expolosion
|
2015-03-17 17:47:53 +08:00 |
yangxiao
|
dced8004e1
|
reset explosion and fix bug of event handler
|
2015-03-17 17:44:52 +08:00 |
Martin Konopka
|
2c80b6ae3a
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-15 00:10:08 +01:00 |
Martin Konopka
|
cd12d08a52
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-14 19:33:15 +01:00 |
Nite Luo
|
cfa1f0c84f
|
Merge pull request #10843 from konopka/fix_compiler_reorder_warnings
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
|
2015-03-13 21:12:35 -07:00 |
Nite Luo
|
3194da4e7d
|
Merge pull request #10720 from darkdukey/hide_cursor
Hide cursor
|
2015-03-13 10:48:15 -07:00 |
Huabing.Xu
|
67fef0eb5e
|
Merge pull request #10856 from super626/v3
modify dds to png
|
2015-03-13 17:00:26 +08:00 |
songchengjiang
|
7e5af41817
|
replace mp_fire_02_2x2.dds with mp_fire_02_2x2.png
|
2015-03-13 16:34:21 +08:00 |
Huabing.Xu
|
639ed335b3
|
Merge pull request #10839 from pipu/node_load_callback
To add the function node load callback called during create node from csb file.
|
2015-03-13 15:06:14 +08:00 |
songchengjiang
|
7026b89b02
|
fix the bug of moveTo
|
2015-03-13 11:35:58 +08:00 |
Martin Konopka
|
350b81501d
|
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
Initialization follows the order of declaration, not the order of the initialization list.
|
2015-03-12 23:47:58 +01:00 |
pipu
|
56c3d1c6f6
|
To add the function node load callback called during create node from csb file.
|
2015-03-12 17:36:39 +08:00 |
Dale Stammen
|
afd0fbab10
|
added missing /bigobj to c++ compiler command line options
|
2015-03-09 10:16:42 -07:00 |
Dale Stammen
|
a828f73ccb
|
updated expiration date of project certificates
|
2015-03-09 08:31:06 -07:00 |
yangxiao
|
8137b01f23
|
merge cocos
|
2015-03-06 18:31:57 +08:00 |
songchengjiang
|
444dbfdf9e
|
replace .mesh with .c3b
modify ParticleUniverse file structure
|
2015-03-05 14:54:32 +08:00 |
yangxiao
|
faf299c5a1
|
make path shorter
|
2015-03-05 13:24:06 +08:00 |
Nite Luo
|
95bd326829
|
Replace std::to_string
|
2015-03-04 01:42:24 -08:00 |
yangxiao
|
573fdafbd8
|
android work
|
2015-03-04 14:25:46 +08:00 |
andyque
|
942ceccd99
|
fix android and win32 compile error
|
2015-03-04 14:12:11 +08:00 |
yangxiao
|
68eaadaffb
|
merge cocos
|
2015-03-04 09:57:42 +08:00 |
Nite Luo
|
e23eeafa4d
|
Create test case for show/hide mouse
|
2015-03-03 14:52:55 -08:00 |
Dale Stammen
|
e93fe1b13b
|
Merge branch 'v3' into v3-wp8-fix
|
2015-03-03 08:40:07 -08:00 |
minggo
|
13e4525772
|
Merge pull request #10659 from super626/v3
Remove expolosion particle
|
2015-03-03 23:03:02 +08:00 |
yangxiao
|
36723fcb68
|
reset submodule
|
2015-03-03 18:34:51 +08:00 |
yangxiao
|
901cfd627b
|
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
|
2015-03-03 17:59:25 +08:00 |
songchengjiang
|
d25c025cbe
|
replace star.pu with lineStreak.pu
|
2015-03-03 17:53:19 +08:00 |
yangxiao
|
9e06a4b848
|
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
|
2015-03-03 17:47:22 +08:00 |
yangxiao
|
3db3d9ae11
|
merge cocos
|
2015-03-03 17:23:33 +08:00 |
songchengjiang
|
9bdcdec60a
|
add test demo
use particleSystemScaleVelocity
|
2015-03-03 15:10:42 +08:00 |
songchengjiang
|
a9eb4dc7f9
|
support read material files on linux
modify the name of getAliveParticleCnt function
|
2015-03-02 16:28:38 +08:00 |
songchengjiang
|
a71aed6cc8
|
mix particle with sprite3D
|
2015-03-02 13:51:43 +08:00 |
songchengjiang
|
5c460ebb2d
|
add/update particle files
|
2015-03-02 13:07:32 +08:00 |
yangxiao
|
924a3cdff0
|
create particle with pu and material
|
2015-02-28 14:26:33 +08:00 |
yangxiao
|
d5bde9e536
|
add missing material
|
2015-02-28 12:57:15 +08:00 |
yangxiao
|
218de84cc5
|
remove expolosion particle
|
2015-02-28 11:31:15 +08:00 |
Dale Stammen
|
fb25ce9d1b
|
disabled LTCG to speed up release builds
|
2015-02-27 11:10:33 -08:00 |
Dale Stammen
|
f68a966485
|
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
|
2015-02-27 11:07:51 -08:00 |
Dale Stammen
|
b5e936c657
|
disabled LTCG to speed up release builds
|
2015-02-27 10:43:13 -08:00 |
Dale Stammen
|
5e6865ce53
|
added missing CC_PLATFORM_WINRT
|
2015-02-27 10:38:18 -08:00 |
Dale Stammen
|
2eb919bb7a
|
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
|
2015-02-27 10:36:48 -08:00 |
minggo
|
b973d08b6e
|
Merge pull request #10608 from super626/v3
Add project function to camera and fix cocos ui bug
|
2015-02-27 11:47:55 +08:00 |
yangxiao
|
437a59fb9a
|
modify project & unproject api
|
2015-02-27 10:01:57 +08:00 |