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

30462 Commits

Author SHA1 Message Date
jianglong0156 90f9bf37cd fix redmine issue #20277 RestartGameTest only used in native will crash 2015-06-23 14:41:41 +08:00
pandamicro 4823cc3bc2 Merge pull request #12476 from super626/fps 
show fps in scene3d demo
 2015-06-23 13:42:26 +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
子龙山人 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
子龙山人 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
WenhaiLin fbe1bd8253 Label should be invisible when the line height is set to zero. 2015-06-23 09:42:48 +08: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
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
子龙山人 776dd1dd09 Merge pull request #12449 from WenhaiLin/v3-37-resoucesfix 
[ci skip]Fixed resources.
 2015-06-19 16:30:05 +08:00
WenhaiLin 45de0b650a [ci skip]Fixed resources. 2015-06-19 16:26:03 +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
pandamicro 8afba07820 Merge pull request #12445 from natural-law/framework 
[ci skip] Optimize the implementation of framework-compile scripts.
 2015-06-19 13:48:11 +08:00
Bin Zhang 146b99fda8 Support build VS project with VS2013 & VS2015. 2015-06-19 13:42:48 +08:00
Bin Zhang b01ef05797 Add parameter --app-abi to set the APP_ABI value of ndk-build. 2015-06-19 13:42:48 +08:00
Bin Zhang cd159bd12c Add a config file for generating prebuilt libs. 2015-06-19 13:42:48 +08:00
WenhaiLin d32a317ea0 Label:Fixed line wrap error without space. 2015-06-19 13:39:19 +08:00
VisualSJ 8fa755d0e4 Studio parser: Code for defense 2015-06-19 13:15:10 +08:00
VisualSJ ea0ab5c738 Studio parser: Code for defense 2015-06-19 11:13:07 +08:00
pandamicro f6abca383e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-06-19 10:44:27 +08:00
pandamicro 1bf8292e06 Merge pull request #12442 from natural-law/update-templates 
Update the VS projects of templates.
 2015-06-19 10:38:02 +08:00
pandamicro 8e9fed936c Add auto bindings 2015-06-19 10:36:36 +08:00
pandamicro ca989e2aed Fix physics3d js test issue 2015-06-19 10:35:45 +08:00
pandamicro 63e02ce4d9 Merge pull request #12441 from pandamicro/v3 
[ci skip] Update versions
 2015-06-19 09:56:51 +08:00