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

9446 Commits

Author SHA1 Message Date
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
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
yangxiao 086b01321c code simplify 2015-06-24 14:10:38 +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
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 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
江龙 7ff383e4d2 add the return value 2015-06-23 20:27:30 +08:00
pandamicro 29840df88e Fix indent of Audio.cpp 2015-06-23 20:08:00 +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
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
pandamicro 60372056ce Merge pull request #12484 from andyque/fix-nine-patch-image-error 
fix nine patch image parser error on Windows.
 2015-06-23 18:26:16 +08:00
yangxiao 251c81d7be Merge branch 'newcode' into v3 2015-06-23 18:25:41 +08:00
pandamicro 2a0c2b6e32 Merge pull request #12250 from hawkwood/patch-10 
Fails if file does not exist
 2015-06-23 17:32:47 +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 4c7f33e66f Merge pull request #12481 from jianglong0156/restartGameBug 
fix Restart game bug
 2015-06-23 17:02:09 +08:00
WenhaiLin cbb073e905 Fixed Application may be created more than once on Android. 2015-06-23 16:58:38 +08:00
XiaoYang 59e6b6fdc2 Merge pull request #352 from tangziwen/v3 
Using ray-triangle intersect test instead of the newton method
 2015-06-23 16:30:18 +08:00
pandamicro ac138a3287 Merge pull request #12474 from xiaofeng11/v3_xiaofeng 
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
 2015-06-23 16:27:32 +08:00
XiaoFeng befe97a78b Update js parser for compatible with CocosStudio 2.3.2 json format export 2015-06-23 16:24:53 +08:00
tangziwen 5b857f7d66 fix some bug 2015-06-23 16:11:00 +08:00
andyque 7fff2bd3c4 fix nine patch image parser error on Windows. 2015-06-23 15:42:58 +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
pandamicro f617d6f1aa Merge pull request #12478 from WenhaiLin/v3-37-label-sfFix 
Label:Fixed IllegalArgumentException on Android 2.3.x
 2015-06-23 15:27:43 +08:00
Vincent Yang 4b768c5fd8 fixbug: cpp-test -> NewRenderer （drag the layer to test the result of culling）, some object will be culling before out of screen. 2015-06-23 15:22:27 +08:00
jianglong0156 90f9bf37cd fix redmine issue #20277 RestartGameTest only used in native will crash 2015-06-23 14:41:41 +08:00
tangziwen 1e016dc6d8 Always get the minimum distance intersect point. 2015-06-23 14:41:20 +08:00
tangziwen f71ca4f179 Using ray-triangle intersect test instead of the newton method 2015-06-23 14:27:19 +08:00
andyque 70b709f4a8 fix rapidjson assert error 2015-06-23 13:54:11 +08:00
WenhaiLin 79aa300448 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0 2015-06-23 13:42:32 +08:00
WenhaiLin b275ce2283 Label:Fixed IllegalArgumentException on Android 2.3.x 2015-06-23 13:38:06 +08:00
pandamicro 9445aeacb7 Merge pull request #12456 from super626/camera 
quaternion instead of euler angle
 2015-06-23 13:16:39 +08:00
XiaoFeng 375e80bd70 Update 3d reader for compatible with cocosstudio 3.1.2 version csd file 
Update easing default speed
 2015-06-23 11:31:16 +08:00
子龙山人 6bd61a3a5f Merge pull request #12469 from WenhaiLin/v3-37-label-lineheightfix 
Label should be invisible when the line height is set to zero.
 2015-06-23 11:02:48 +08:00
WenhaiLin fbe1bd8253 Label should be invisible when the line height is set to zero. 2015-06-23 09:42:48 +08:00
Anniruddh 4a15d57093 Fixed issue #168 2015-06-20 00:20:15 -07:00
yangxiao d252250968 quaternion instead of euler angle 2015-06-19 18:46:14 +08:00
andyque 55b86b2e14 add more docs for samsung enhanced API 2015-06-19 18:09:42 +08:00
子龙山人 8ca0f18575 Merge pull request #12446 from pandamicro/v3 
Add auto bindings for navmesh
 2015-06-19 17:21:00 +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
pandamicro 7b1694bfeb Merge pull request #12443 from VisualSJ/v3-aa 
[ci skip]Studio parser: Code for defense
 2015-06-19 14:24:39 +08:00