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

30550 Commits

Author SHA1 Message Date
jianglong0156 aac1da2016 Merge branch 'jsbProjectMerge' of https://github.com/jianglong0156/cocos2d-x into jsbProjectMerge 2015-06-29 17:58:58 +08:00
jianglong0156 3c13cdd62c add space project 2015-06-29 17:58:38 +08:00
jianglong0156 8711ffddce delete js-tests project in win8.1 and wp8 2015-06-29 17:44:27 +08:00
jianglong0156 ba768c45ac add js-test into cocos2d project in win8 2015-06-29 17:23:19 +08:00
jianglong0156 58f7d568cd remove js project in win32 2015-06-29 17:14:22 +08:00
jianglong0156 bbf4476ff3 add win32 js-test project into cocos2d-x project 2015-06-29 16:48:09 +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
VisualSJ 110e51d0bc Encoded into AVC 2015-06-25 19:01:55 +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
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 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
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 1d4a496aaa Merge pull request #12472 from MSOpenTech/v3-winrt-audio 
V3: WinRT Fix for issue 12448 cpp-tests[ win8.1-universal--window 8.1]:Audio - CocosDenshion:Crash
 2015-06-23 20:01:18 +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
WenhaiLin ed029d264f Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform` 2015-06-23 18:40:39 +08:00
yangxiao bfdb06e31b add empty line 2015-06-23 18:31:20 +08:00
yangxiao c3593c9d64 merge cocos 2015-06-23 18:29:39 +08:00