子龙山人
|
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 |
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 |
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 |
pandamicro
|
3136bef9e3
|
Fix convertDistanceFromPointToInch logic (add x, y)
|
2015-06-25 21:34:00 +08:00 |
pandamicro
|
e29284374b
|
Fix convertDistanceFromPointToInch logic
|
2015-06-25 20:57:23 +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 |
Bin Zhang
|
d508d2ecdd
|
Solve the error when generating binary templates.
|
2015-06-25 19:57:49 +08:00 |
Bin Zhang
|
7ca8542d75
|
Optimize the implementation of auto-generating prebuilt mk files.
|
2015-06-25 19:47:55 +08:00 |
VisualSJ
|
110e51d0bc
|
Encoded into AVC
|
2015-06-25 19:01:55 +08:00 |
pandamicro
|
0275b54b63
|
Merge pull request #12540 from samuele3hu/v3_7_test
Fix the compile error of js-template by using android-studio compile param.
|
2015-06-25 18:49:43 +08:00 |
andyque
|
8f7b439dfe
|
add cocostudio 1.6 tests
|
2015-06-25 18:06:45 +08:00 |
pandamicro
|
246aa619aa
|
Merge pull request #12539 from jianglong0156/winrtMouse
[ci skip]winrt not suppot mouse
|
2015-06-25 17:47:25 +08:00 |
samuele3hu
|
3a654b4615
|
Fix the compile error of js-template by using android-studio compile param.
|
2015-06-25 17:44:51 +08:00 |
jianglong0156
|
11ac928f59
|
winrt use touch event replace mouse event
|
2015-06-25 17:44:03 +08:00 |
jianglong0156
|
c60e9dfc9e
|
winrt not suppot mouse
|
2015-06-25 17:25:27 +08:00 |
pandamicro
|
081869b4f0
|
Merge pull request #12538 from samuele3hu/v3_7_test
[ci skip]Update the branches info to v3.7-release
|
2015-06-25 17:11:19 +08:00 |
samuele3hu
|
b963b63701
|
Update the branches info for the related travis scripts to v3.7
|
2015-06-25 17:07:15 +08:00 |
andyque
|
d83f528327
|
use inch for childFocusCancelOffset in UIScrollView
|
2015-06-25 16:57:00 +08:00 |
WenhaiLin
|
c5ce388cb5
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
|
2015-06-25 16:40:02 +08:00 |
pandamicro
|
1660b04675
|
Merge pull request #12535 from samuele3hu/v3_7_test
[ci skip]Fix the compile error for cpp-tests based on android-studio
|
2015-06-25 16:22:45 +08:00 |
andyque
|
0c1ee8b26a
|
fix studio json reader percentage mode bug
|
2015-06-25 16:14:22 +08:00 |
samuele3hu
|
7feaa18d82
|
Fix the compile error for cpp-tests based on android studio
|
2015-06-25 16:08:48 +08:00 |
pandamicro
|
76eb095f32
|
Merge pull request #12533 from samuele3hu/v3_7_test
[ci skip]Fix the some lua test cases bug
|
2015-06-25 15:16:59 +08:00 |
yangxiao
|
f4a81f0e53
|
optimize draw
|
2015-06-25 15:14:44 +08:00 |
samuele3hu
|
ad4f5b8ec0
|
Fix the some lua tests case bug
|
2015-06-25 15:13:01 +08:00 |
yangxiao
|
13dbd44250
|
remove unused variable
|
2015-06-25 15:05:21 +08:00 |
yangxiao
|
63f948c822
|
modify skybox to projection space
|
2015-06-25 15:01:39 +08:00 |
pandamicro
|
9820e2e96b
|
Merge pull request #12529 from natural-law/v3.7-release
[ci skip] Solve the error in framework-compile tools.
|
2015-06-25 13:41:13 +08:00 |
Bin Zhang
|
444bddccca
|
Solve the error in framework-compile tools.
|
2015-06-25 13:36:42 +08:00 |
pandamicro
|
ac3f2f235b
|
Merge pull request #12523 from andyque/fix-linux-audio-engine-crash
add guard to audio engine pointer
|
2015-06-25 11:48:23 +08:00 |
pandamicro
|
8d4676907b
|
Merge pull request #12526 from natural-law/v3.7-release
[ci skip] Solve the error in git-archive-all tools.
|
2015-06-25 11:47:56 +08:00 |
Bin Zhang
|
6a61f1de40
|
Solve the error in git-archive-all tools.
|
2015-06-25 11:23:27 +08:00 |
子龙山人
|
f545794b56
|
Merge pull request #12525 from WenhaiLin/v3-37-warnfix
[ci skip]Fixed warns
|
2015-06-25 11:02:02 +08:00 |
WenhaiLin
|
3cb29bbc65
|
[ci skip]Fixed warns
|
2015-06-25 10:53:41 +08:00 |
andyque
|
2bb7b96839
|
add guard to audio engine pointer
|
2015-06-25 10:17:31 +08:00 |
anniruddh
|
e89a6c1651
|
fixed issue #160
|
2015-06-24 17:50:11 -07: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
|
19c57daf92
|
Merge pull request #12511 from samuele3hu/v3_7_test
Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1)
|
2015-06-24 21:46: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 |