Vincent Yang
|
2ba6f266ad
|
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
|
2015-06-30 14:32:14 +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 |
子龙山人
|
950cb840c2
|
Merge pull request #12582 from super626/listview
fix camera mask of listview
|
2015-06-30 10:25:57 +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 |
子龙山人
|
aa86ed9a04
|
Merge pull request #12466 from neokim/feature/elastic_scrollview
Enhance ScrollView with easing out scrolling
|
2015-06-29 16:59:24 +08:00 |
jianglong0156
|
fd54b9941d
|
resolve the titlemap testcase conflict with the 3d testcase.
|
2015-06-29 16:34:54 +08:00 |
Neo Kim
|
71fc49b6a6
|
Merge pull request #1 from andyque/testElasticScrollView
Test elastic scroll view
|
2015-06-29 16:38:44 +09:00 |
yangxiao
|
a56a5d24b6
|
fix camera mask of listview
|
2015-06-29 14:41:03 +08:00 |
andyque
|
60834e6f0c
|
Merge branch 'v3' into v3-finish-android-9-patch-image-format
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-06-29 12:05:52 +08:00 |
andyque
|
30d2129f0c
|
improve indent and getTime function
|
2015-06-29 11:52:53 +08:00 |
子龙山人
|
85af18f634
|
Merge pull request #12580 from andyque/v3
merge v3.7 back to v3
|
2015-06-29 11:51:38 +08:00 |
andyque
|
cc1e126a84
|
Merge branch 'v3.7-release' into v3
|
2015-06-29 10:35:23 +08:00 |
子龙山人
|
8fd5db4812
|
Merge pull request #12571 from natural-law/v3.7-release
[ci skip] Solve the error in framework-compile tools.
|
2015-06-27 17:43:57 +08:00 |
Bin Zhang
|
02500976f7
|
Solve the error in framework-compile tools.
|
2015-06-27 17:42:15 +08:00 |
子龙山人
|
a05cc97d08
|
Merge pull request #12569 from natural-law/v3.7-release
Solve the error in framework-compile tools.
|
2015-06-27 15:55:59 +08:00 |
Bin Zhang
|
652aaf3bcd
|
Solve the error in framework-compile tools.
|
2015-06-27 14:44:10 +08:00 |
Bin Zhang
|
0ac3da1636
|
Solve the error in framework-compile tools.
|
2015-06-26 21:00:32 +08:00 |
pandamicro
|
c055028485
|
Merge pull request #12566 from jianglong0156/winrtMouse
Winrt mouse
|
2015-06-26 18:43:33 +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
|
6cb9e87574
|
Merge pull request #12562 from pandamicro/v3.7-release
Update submodules
|
2015-06-26 17:04:26 +08:00 |
pandamicro
|
1fd45d6f30
|
Update submodules
|
2015-06-26 13:45:28 +08:00 |
pandamicro
|
8363ae0e00
|
Merge pull request #12561 from CocosRobot/update_cocosfiles_1435294617
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-26 12:58:16 +08:00 |
CocosRobot
|
48f03adc3f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-26 04:56:58 +00:00 |
子龙山人
|
a7a5216941
|
Merge pull request #12560 from CocosRobot/update_cocosfiles_1435294343
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-26 12:53:14 +08:00 |
CocosRobot
|
47c0e45ec4
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-26 04:52:25 +00: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 |
pandamicro
|
b113580bdf
|
Merge pull request #12558 from natural-law/v3.7-release
[ci skip] Optimize the implementation of framework-compile.
|
2015-06-26 12:50:30 +08:00 |
pandamicro
|
c7efedfe0d
|
Merge pull request #12557 from andyque/fix-tiff-32-bit-include-error
fix tiff 32bit header file include erro
|
2015-06-26 12:49:57 +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 |
Bin Zhang
|
cc6f02584b
|
Solve the error in framework-compile on Mac.
|
2015-06-26 12:01:45 +08:00 |
andyque
|
a44eb39bb5
|
fix tiff 32bit header file include erro
|
2015-06-26 11:27:02 +08:00 |
子龙山人
|
260d5035bb
|
Merge pull request #12555 from WenhaiLin/v3-simpleaudio-AndroidL-Fix
Fixed SimpleAudioEngine may cause application to crash on Android L(5.0.x)
|
2015-06-26 11:05:40 +08:00 |
pandamicro
|
9f32db9154
|
Merge pull request #12556 from jianglong0156/videoplayer
[ci skip]add videoplayer state, modify play label
|
2015-06-26 10:48:20 +08:00 |
jianglong0156
|
ef51fc46ed
|
add videoplayer state, modify play label
|
2015-06-26 10:44:43 +08:00 |
Wenhai Lin
|
1875829ab4
|
[CppTests:ExtensionsTest-->CocoStudioComponentsTest]Fixed crash on Android 5.0.x
|
2015-06-26 10:16:52 +08:00 |
pandamicro
|
ddb982246f
|
Merge pull request #12553 from VisualSJ/v3-aa
Encoded into AVC
|
2015-06-26 10:15:02 +08:00 |
pandamicro
|
e9ee303445
|
Merge pull request #12547 from MSOpenTech/v3.7-winrt-audio
V3.7 winrt audio fix
|
2015-06-26 09:47:11 +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 |
pandamicro
|
4b34963329
|
Merge pull request #12537 from andyque/fix-v3.7-scrollView-dpi
use inch for childFocusCancelOffset in UIScrollView
|
2015-06-26 08:11:00 +08:00 |
kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02:00 |
Dale Stammen
|
61f4e280b4
|
Merge branch 'v3.7-release' into v3.7-winrt-audio
|
2015-06-25 12:46:20 -07: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 |
子龙山人
|
81d47efb01
|
Merge pull request #23 from pandamicro/v3.7-scrollView-dpi
Fix convertDistanceFromPointToInch logic
|
2015-06-25 21:36:16 +08:00 |