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

30636 Commits

Author SHA1 Message Date
tangziwen 5b857f7d66 fix some bug 2015-06-23 16:11:00 +08:00
Vincent Yang 27d011dd50 Fixbug: LabelTestNew New Label + CharMap's effect is wrong. 2015-06-23 16:02:38 +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
pandamicro 4823cc3bc2 Merge pull request #12476 from super626/fps 
show fps in scene3d demo
 2015-06-23 13:42:26 +08:00
WenhaiLin b275ce2283 Label:Fixed IllegalArgumentException on Android 2.3.x 2015-06-23 13:38:06 +08:00
子龙山人 d8a2695620 Merge pull request #12473 from WenhaiLin/v3-37-ParticleDemo-crashfix 
[cpp-tests] ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
 2015-06-23 13:36:36 +08:00
pandamicro 27fe58f888 Merge pull request #12477 from CocosRobot/update_lua_bindings_1435036719 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-23 13:34:51 +08:00
CocosRobot 3381716232 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-23 05:22:46 +00:00
pandamicro 9445aeacb7 Merge pull request #12456 from super626/camera 
quaternion instead of euler angle
 2015-06-23 13:16:39 +08:00
pandamicro b08325dd5b Merge pull request #12475 from samuele3hu/v3_7_test 
[ci skip]Fix the some test cases error about Lua
 2015-06-23 13:15:21 +08:00
yangxiao a433d57807 show fps 2015-06-23 11:56:50 +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 a68874d3cb Node: Particles --> ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case. 2015-06-23 11:00:23 +08:00
Dale Stammen 2eeb37c747 Merge branch 'v3' into v3-winrt-audio 2015-06-22 19:47:34 -07:00
子龙山人 eb9a2784fb Merge pull request #12471 from andyque/fix-rapidjson-assert 
[ci skip]fixed unintended spaces in string
 2015-06-23 10:39:36 +08:00
andyque 931011809d fixed unintended spaces in string 2015-06-23 10:38:43 +08:00
samuele3hu 3b766e5236 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test 2015-06-23 10:20:05 +08:00
WenhaiLin fbe1bd8253 Label should be invisible when the line height is set to zero. 2015-06-23 09:42:48 +08:00
Dale Stammen 0a5581b534 Merge branch 'v3' into v3-winrt-audio 2015-06-22 08:24:08 -07:00
samuele3hu 683c5b4cb2 Fix the LabeLTestNew error. 2015-06-22 22:32:21 +08:00
pandamicro 0f5c343e1e Merge pull request #12460 from MSOpenTech/v3-winrt-readme 
Added Windows 10.0 UWP info to Readme
 2015-06-22 13:05:51 +08:00
pandamicro b1e24ee8f2 Merge pull request #12455 from natural-law/v3 
Solve the error when build tests projects with cocos command on win32.
 2015-06-22 13:04:17 +08:00
samuele3hu bc964c96da Fix the error about the Camera3D Test 2015-06-22 09:28:18 +08:00
samuele3hu 0181a84883 Fix the bugs about the particle3DTest 2015-06-22 09:27:34 +08:00
pandamicro d59db14370 Merge pull request #12462 from WenhaiLin/v3-UIRichTextTest-fix 
[ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App.
 2015-06-21 09:55:38 +08:00
WenhaiLin 6bd46fcfcc [ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App. 2015-06-20 17:07:11 +08:00
Anniruddh 4a15d57093 Fixed issue #168 2015-06-20 00:20:15 -07:00
Dale Stammen a052af355a Merge branch 'v3-winrt-readme' of github.com:MSOpenTech/cocos2d-x into v3-winrt-readme 2015-06-19 09:24:22 -07:00
Dale Stammen d438bd6f49 added app name to 150x150 windows tile 2015-06-19 09:23:50 -07:00
Dale Stammen a1bc973e6d Added Windows 10.0 UWP info 2015-06-19 09:08:57 -07:00
yangxiao d252250968 quaternion instead of euler angle 2015-06-19 18:46:14 +08:00
Bin Zhang 85fe9e8816 Solve the error when build tests projects with cocos command on win32. 2015-06-19 18:32:32 +08:00
子龙山人 e0ea8a460a Merge pull request #12454 from andyque/improve-samsung-api-docs 
[ci skip]add more docs for samsung enhanced API
 2015-06-19 18:11:15 +08:00
andyque 55b86b2e14 add more docs for samsung enhanced API 2015-06-19 18:09:42 +08:00
pandamicro 77fefbfd16 Merge pull request #12453 from CocosRobot/update_lua_bindings_1434707583 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-19 18:05:28 +08:00
CocosRobot c635881257 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-19 09:59:19 +00:00
pandamicro f75809f913 Merge pull request #12452 from natural-law/framework 
[ci skip] Solve the error in the scripts of modify templates for framework.
 2015-06-19 17:48:48 +08:00
Bin Zhang 53ca264eff Solve the error in the scripts of modify templates for framework. 2015-06-19 17:43:06 +08:00
子龙山人 8e1a70fffd Merge pull request #12450 from CocosRobot/update_cocosfiles_1434705879 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-19 17:33:01 +08:00
CocosRobot 7486c74209 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-19 09:24:40 +00:00
子龙山人 8ca0f18575 Merge pull request #12446 from pandamicro/v3 
Add auto bindings for navmesh
 2015-06-19 17:21:00 +08:00