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
|
bcd20b1bf0
|
Merge pull request #12861 from pandamicro/v3
Sync Cocos2d-x v3.7 RC1
|
2015-07-15 17:16:44 +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 |
pandamicro
|
436564f922
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
docs/RELEASE_NOTES.md
web
|
2015-07-15 14:39:40 +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 |
pandamicro
|
efffea5b91
|
Fixed #12834 Invoke cleanup function when override in JS
|
2015-07-14 15:35:29 +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 |
ZhangMenghe
|
aca7914d86
|
Modify testcase for page Turndown
|
2015-07-13 13:44:58 +08:00 |
ZhangMenghe
|
3396da508f
|
pageTurnDown in WebGL testCase
|
2015-07-13 12:45:07 +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 |
WenhaiLin
|
5c9e8848bf
|
[ci skip]Add missing configuration for Nibiru.
|
2015-07-10 21:16:21 +08:00 |
WenhaiLin
|
205e77a4fb
|
Add missing configuration for Nibiru.
|
2015-07-10 21:09:15 +08:00 |
WenhaiLin
|
7f3e0b2a8c
|
[ci skip]Replace tab with spaces.
|
2015-07-10 20:56:21 +08:00 |
WenhaiLin
|
c68469a611
|
Update Nibiru SDK.
|
2015-07-10 20:42:05 +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 |
pandamicro
|
d155d42c0e
|
Merge pull request #12617 from yangws/issue_8194
Fixbug :EventDispatcher wrong dispatch order
|
2015-07-02 14:42:30 +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
|
7794bc9d46
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest
|
2015-07-02 10:27:55 +08: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 |
jianglong0156
|
9e9625feca
|
add bool parm in android
|
2015-07-01 10:57:43 +08:00 |
jianglong0156
|
2ef2016c39
|
add call reflection with bool test case
|
2015-07-01 10:41:24 +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 |
pandamicro
|
08bdf84183
|
Merge pull request #12584 from jianglong0156/tilemapTestCaseConflict
resolve the conflict that the 3d testcase show error after click the the titlemap testcase
|
2015-06-29 17:07: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 |
jianglong0156
|
fd54b9941d
|
resolve the titlemap testcase conflict with the 3d testcase.
|
2015-06-29 16:34:54 +08:00 |
andyque
|
cc1e126a84
|
Merge branch 'v3.7-release' into v3
|
2015-06-29 10:35:23 +08:00 |
songchengjiang
|
7befab0f7b
|
add Physics3DCollider
|
2015-06-29 10:26:09 +08:00 |
pandamicro
|
b9a6e8c051
|
Merge pull request #12579 from jianglong0156/videoplayer
[ci skip]improve Videoplayer test
|
2015-06-29 10:19:08 +08:00 |
jianglong0156
|
b9cccc8a4d
|
Merge branch 'v3.7-release' into videoplayer
|
2015-06-29 10:07:19 +08:00 |
pandamicro
|
f1528b728c
|
Merge pull request #12565 from WenhaiLin/v3-37-tests-runFix
[ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32.
|
2015-06-26 18:43:14 +08:00 |
WenhaiLin
|
24eca337ca
|
[ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32.
|
2015-06-26 17:12:39 +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 |
jianglong0156
|
ef51fc46ed
|
add videoplayer state, modify play label
|
2015-06-26 10:44:43 +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 |
samuele3hu
|
ad4f5b8ec0
|
Fix the some lua tests case bug
|
2015-06-25 15:13:01 +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 |
pandamicro
|
fb852046e1
|
Merge pull request #12508 from jianglong0156/AccelerometerCrash
reduce the accelerometer log num, avoid log too much in vs
|
2015-06-24 13:45:53 +08:00 |
jianglong0156
|
9b31e8ed16
|
reduce the accelerometer log num, avoid log too much in vs
|
2015-06-24 12:03:16 +08:00 |
pandamicro
|
7ddb6308e9
|
Merge pull request #12503 from jianglong0156/hidepluginx
hide facebook testcase
|
2015-06-23 22:19:10 +08:00 |
江龙
|
f3eb455669
|
hide facebook testcase
|
2015-06-23 22:14:27 +08:00 |
samuele3hu
|
5c5f3dcc79
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test
|
2015-06-23 20:03:14 +08:00 |
samuele3hu
|
e2aa669b8d
|
Fix the LayerTest error about Lua
|
2015-06-23 20:02:26 +08:00 |
pandamicro
|
32accbf21b
|
Merge pull request #12488 from WenhaiLin/v3-37-androidApplicationFix
Fixed Application may be created more than once on Android.
|
2015-06-23 19:43:39 +08:00 |
pandamicro
|
0b26f966b5
|
Merge pull request #12497 from VisualSJ/v3-aa
[ci skip]add info into BlendFunc tests on canvas and tests data problem
|
2015-06-23 19:43:08 +08:00 |
VisualSJ
|
5472928aaa
|
add info into BlendFunc tests on canvas and tests data problem
|
2015-06-23 18:54:18 +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 |
pandamicro
|
ce508bab87
|
Merge pull request #12487 from pandamicro/v3
Fix TransitionTest issue that depth test haven't been disabled after transition
|
2015-06-23 16:59:08 +08:00 |
WenhaiLin
|
cbb073e905
|
Fixed Application may be created more than once on Android.
|
2015-06-23 16:58:38 +08:00 |
pandamicro
|
cd1233f801
|
Fix TransitionTest issue that depth test haven't been disabled after transition
|
2015-06-23 16:58:15 +08:00 |
Vincent Yang
|
27d011dd50
|
Fixbug: LabelTestNew New Label + CharMap's effect is wrong.
|
2015-06-23 16:02: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 |
pandamicro
|
b08325dd5b
|
Merge pull request #12475 from samuele3hu/v3_7_test
[ci skip]Fix the some test cases error about Lua
|
2015-06-23 13:15:21 +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 |
samuele3hu
|
3b766e5236
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test
|
2015-06-23 10:20:05 +08:00 |
samuele3hu
|
683c5b4cb2
|
Fix the LabeLTestNew error.
|
2015-06-22 22:32:21 +08:00 |
pandamicro
|
0f5c343e1e
|
Merge pull request #12460 from MSOpenTech/v3-winrt-readme
Added Windows 10.0 UWP info to Readme
|
2015-06-22 13:05:51 +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 |
samuele3hu
|
bc964c96da
|
Fix the error about the Camera3D Test
|
2015-06-22 09:28:18 +08:00 |
samuele3hu
|
0181a84883
|
Fix the bugs about the particle3DTest
|
2015-06-22 09:27:34 +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 |
Dale Stammen
|
d438bd6f49
|
added app name to 150x150 windows tile
|
2015-06-19 09:23:50 -07:00 |
Bin Zhang
|
85fe9e8816
|
Solve the error when build tests projects with cocos command on win32.
|
2015-06-19 18:32:32 +08:00 |
子龙山人
|
8ca0f18575
|
Merge pull request #12446 from pandamicro/v3
Add auto bindings for navmesh
|
2015-06-19 17:21:00 +08:00 |
子龙山人
|
776dd1dd09
|
Merge pull request #12449 from WenhaiLin/v3-37-resoucesfix
[ci skip]Fixed resources.
|
2015-06-19 16:30:05 +08:00 |
WenhaiLin
|
45de0b650a
|
[ci skip]Fixed resources.
|
2015-06-19 16:26:03 +08:00 |
子龙山人
|
869e3c5243
|
Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix
Label:Fixed line wrap error without space.
|
2015-06-19 15:08:13 +08:00 |
WenhaiLin
|
d32a317ea0
|
Label:Fixed line wrap error without space.
|
2015-06-19 13:39:19 +08:00 |
pandamicro
|
ca989e2aed
|
Fix physics3d js test issue
|
2015-06-19 10:35:45 +08:00 |
pandamicro
|
c6d4f283bb
|
Fix compilation issue in navmesh conversion
|
2015-06-19 08:11:45 +08:00 |
江龙
|
91bc19fb29
|
Merge branch 'v3_origin' into navmesh
Conflicts:
tests/js-tests/src/Physics3DTest/Physics3DTest.js
|
2015-06-18 23:50:19 +08:00 |
pandamicro
|
b757837239
|
Move NavMesh to jsb namespace
|
2015-06-18 22:57:41 +08:00 |
Bin Zhang
|
a4ecfdb7e2
|
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
|
2015-06-18 22:00:57 +08:00 |
VisualSJ
|
3da67d3358
|
change the seek to time
|
2015-06-18 22:00:55 +08:00 |
samuele3hu
|
a98b493151
|
Update UIS9NinePatchTest for jsb
|
2015-06-18 22:00:55 +08:00 |
samuele3hu
|
cbfa92d3fd
|
Add a new line.
|
2015-06-18 22:00:55 +08:00 |
samuele3hu
|
496ce50ff5
|
issue #12414:Add UIS9NinePatchTest for js
|
2015-06-18 22:00:55 +08:00 |
samuele3hu
|
77c3e9bdde
|
issue #12414:Add UIS9NinePatchTest for Lua and js
|
2015-06-18 22:00:54 +08:00 |
VisualSJ
|
0a526875a8
|
Fixed a bug that xhr cross-domain error
|
2015-06-18 22:00:54 +08:00 |
VisualSJ
|
82c09e8d0c
|
Fixed a bug that xhr cross-domain error
|
2015-06-18 22:00:54 +08:00 |
pandamicro
|
cd7252014a
|
Merge pull request #12432 from pandamicro/v3
Change physics3d api to jsb namespace
|
2015-06-18 21:53:39 +08:00 |
pandamicro
|
10a8adad53
|
Change physics3d api to jsb namespace
|
2015-06-18 20:39:40 +08:00 |
pandamicro
|
491d89baec
|
Merge pull request #12429 from natural-law/v3
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
|
2015-06-18 20:28:52 +08:00 |
jianglong0156
|
4fe1542d17
|
add navmesh tests
|
2015-06-18 19:22:27 +08:00 |
Bin Zhang
|
d288b13957
|
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
|
2015-06-18 17:22:30 +08:00 |
pandamicro
|
aa566a3722
|
Merge pull request #12424 from pandamicro/physics3d
Fix Physics3D test and js bindings
|
2015-06-18 16:09:49 +08:00 |
jianglong0156
|
85c40b6580
|
Merge pull request #8 from pandamicro/physics3d
Physics3d
|
2015-06-18 14:54:32 +08:00 |
pandamicro
|
811173ea3b
|
Fix Physics3D test and js bindings
|
2015-06-18 14:33:16 +08:00 |
pandamicro
|
9dc52ba72f
|
Merge pull request #12403 from VisualSJ/v3-aa
[ci skip]Fixed some bug
|
2015-06-18 12:31:27 +08:00 |
pandamicro
|
000be8316b
|
Merge pull request #12415 from samuele3hu/v3_7_ui
[ci skip]issue #12414:Add UIS9NinePatchTest for Lua and js
|
2015-06-18 12:30:28 +08:00 |
tangziwen
|
1989de7a04
|
fix terraintest and Terrain::getInstersectionPoint()
|
2015-06-18 12:20:44 +08:00 |
pandamicro
|
7952477469
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d
|
2015-06-18 12:05:01 +08:00 |
VisualSJ
|
44c37c676e
|
change the seek to time
|
2015-06-18 11:54:25 +08:00 |
Vincent Yang
|
27bf636eab
|
Fix bug: spine animition can't show in Scene3DTest.
|
2015-06-18 11:45:17 +08:00 |
samuele3hu
|
6c749a77f2
|
Fix the bugs about the Physics3DTest for Lua.
|
2015-06-18 11:17:08 +08:00 |
tangziwen
|
4187ea2241
|
fix Scene3D test
|
2015-06-18 10:17:46 +08:00 |
samuele3hu
|
7f21731bb1
|
Update UIS9NinePatchTest for jsb
|
2015-06-18 10:08:13 +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 |
samuele3hu
|
31ce264c6a
|
Add a new line.
|
2015-06-18 09:44:47 +08:00 |
samuele3hu
|
8c01d94945
|
issue #12414:Add UIS9NinePatchTest for js
|
2015-06-18 09:43:05 +08:00 |
samuele3hu
|
31aae38fac
|
issue #12414:Add UIS9NinePatchTest for Lua and js
|
2015-06-18 09:41:16 +08:00 |
VisualSJ
|
400b2d7663
|
Fixed a bug that xhr cross-domain error
|
2015-06-18 09:23:15 +08:00 |
pandamicro
|
3ffc0e6be6
|
Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d
|
2015-06-18 09:20:37 +08:00 |
pandamicro
|
3975d44d3b
|
Chain NavMeshTest
|
2015-06-18 00:58:03 +08:00 |
pandamicro
|
bcf9659408
|
Merge branch 'v3' into navmesh
|
2015-06-18 00:36:37 +08:00 |
pandamicro
|
5b23e8b381
|
Fix resource issue
|
2015-06-18 00:24:01 +08:00 |