Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,709 Commits 3 Branches 31 Tags 1.1 GiB
Commit Graph

30709 Commits

Author SHA1 Message Date
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
pandamicro ef80ddd638 Merge pull request #12510 from natural-law/v3 
Solve the error when run tests projects with `cocos run`.
 2015-06-24 17:09:39 +08:00
samuele3hu 63eb0d34f3 Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1) 2015-06-24 16:11:36 +08:00
pandamicro 49e783820e Merge pull request #12507 from dabingnn/v3_fixClearColor 
fix clearcolor bug which has no effect
 2015-06-24 15:58:53 +08:00
yangxiao 77f1af91f9 opt getIntersectionPoint 2015-06-24 15:49:09 +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 086b01321c code simplify 2015-06-24 14:10:38 +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
Huabing.Xu ecfe35489c fix clearcolor bug which has no effect 2015-06-24 11:40:23 +08:00
yangxiao 7546bfe9af make getChunkByIndex protected 2015-06-24 10:56:46 +08:00
yangxiao d1baacdf8a fix terrain ray trace 2015-06-24 10:49:18 +08:00
WenhaiLin 3b7fb108bf Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0 2015-06-24 09:37:08 +08:00
pandamicro ba2741f10e Merge pull request #12504 from pandamicro/v3 
#12494 Upgrade platform constants for WP8 & WINRT
 2015-06-23 23:24:19 +08:00
pandamicro 04af5dfbe3 #12494 Upgrade platform constants for WP8 & WINRT 2015-06-23 23:23:25 +08:00
pandamicro e574c38a6b Merge pull request #12496 from WenhaiLin/v3-tagetplatform-fix 
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
 2015-06-23 22:26:54 +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
pandamicro 72fde7efb8 Merge pull request #12500 from jianglong0156/webviewHide 
fix the bug:webview can not display
 2015-06-23 21:11:33 +08:00
pandamicro cc00cbedbe Merge pull request #12482 from yangws/fixbug_20214 
fixbug: cpp-test -> NewRenderer （drag the layer to test the result of…
 2015-06-23 21:09:59 +08:00
WenhaiLin 276e306619 Merge branch 'fixbug_20214' of https://github.com/yangws/cocos2d-x into v3-37alpha0 2015-06-23 21:01:26 +08:00
江龙 7ff383e4d2 add the return value 2015-06-23 20:27:30 +08:00
pandamicro 99df8c4e0e Merge pull request #12498 from samuele3hu/v3_7_test 
[ci skip]Fix the LayerTest error about Lua
 2015-06-23 20:10:00 +08:00
pandamicro aeb5a543c8 Merge pull request #12499 from pandamicro/v3 
[ci skip] Fix indent of Audio.cpp
 2015-06-23 20:08:57 +08:00
pandamicro 29840df88e Fix indent of Audio.cpp 2015-06-23 20:08:00 +08:00