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
Bin Zhang a680638de2 Optimize the implementation of generating binary templates. 2015-06-29 15:42:32 +08:00
Bin Zhang e21634f618 Update the reference of submodule cocos2d-console. 2015-06-29 15:18:00 +08:00
pandamicro b9a6e8c051 Merge pull request #12579 from jianglong0156/videoplayer 
[ci skip]improve Videoplayer test
 2015-06-29 10:19:08 +08:00
jianglong0156 b9cccc8a4d Merge branch 'v3.7-release' into videoplayer 2015-06-29 10:07:19 +08:00
子龙山人 8fd5db4812 Merge pull request #12571 from natural-law/v3.7-release 
[ci skip] Solve the error in framework-compile tools.
 2015-06-27 17:43:57 +08:00
Bin Zhang 02500976f7 Solve the error in framework-compile tools. 2015-06-27 17:42:15 +08:00
子龙山人 a05cc97d08 Merge pull request #12569 from natural-law/v3.7-release 
Solve the error in framework-compile tools.
 2015-06-27 15:55:59 +08:00
Bin Zhang 652aaf3bcd Solve the error in framework-compile tools. 2015-06-27 14:44:10 +08:00
Bin Zhang 0ac3da1636 Solve the error in framework-compile tools. 2015-06-26 21:00:32 +08:00
pandamicro c055028485 Merge pull request #12566 from jianglong0156/winrtMouse 
Winrt mouse
 2015-06-26 18:43:33 +08:00
pandamicro f1528b728c Merge pull request #12565 from WenhaiLin/v3-37-tests-runFix 
[ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32.
 2015-06-26 18:43:14 +08:00
WenhaiLin 24eca337ca [ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32. 2015-06-26 17:12:39 +08:00
pandamicro 88aeaa36f4 Merge pull request #12534 from super626/skybox 
Skybox improvement
 2015-06-26 17:05:17 +08:00
pandamicro 6cb9e87574 Merge pull request #12562 from pandamicro/v3.7-release 
Update submodules
 2015-06-26 17:04:26 +08:00
pandamicro 1fd45d6f30 Update submodules 2015-06-26 13:45:28 +08:00
pandamicro 8363ae0e00 Merge pull request #12561 from CocosRobot/update_cocosfiles_1435294617 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-26 12:58:16 +08:00
CocosRobot 48f03adc3f [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-26 04:56:58 +00:00
子龙山人 a7a5216941 Merge pull request #12560 from CocosRobot/update_cocosfiles_1435294343 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-26 12:53:14 +08:00
CocosRobot 47c0e45ec4 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-26 04:52:25 +00:00
pandamicro d29c5643bc Merge pull request #12559 from WenhaiLin/v3-37-crashfix 
[Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` again after a auto-tested.
 2015-06-26 12:51:07 +08:00
pandamicro b113580bdf Merge pull request #12558 from natural-law/v3.7-release 
[ci skip] Optimize the implementation of framework-compile.
 2015-06-26 12:50:30 +08:00
pandamicro c7efedfe0d Merge pull request #12557 from andyque/fix-tiff-32-bit-include-error 
fix tiff 32bit header file include erro
 2015-06-26 12:49:57 +08:00
Wenhai Lin 94c0c0c3fc [Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` test case again after a auto-tested. 2015-06-26 12:02:15 +08:00
Bin Zhang cc6f02584b Solve the error in framework-compile on Mac. 2015-06-26 12:01:45 +08:00
andyque a44eb39bb5 fix tiff 32bit header file include erro 2015-06-26 11:27:02 +08:00
子龙山人 260d5035bb Merge pull request #12555 from WenhaiLin/v3-simpleaudio-AndroidL-Fix 
Fixed SimpleAudioEngine may cause application to crash on Android L(5.0.x)
 2015-06-26 11:05:40 +08:00
jianglong0156 ef51fc46ed add videoplayer state, modify play label 2015-06-26 10:44:43 +08:00
Wenhai Lin 1875829ab4 [CppTests:ExtensionsTest-->CocoStudioComponentsTest]Fixed crash on Android 5.0.x 2015-06-26 10:16:52 +08:00
pandamicro ddb982246f Merge pull request #12553 from VisualSJ/v3-aa 
Encoded into AVC
 2015-06-26 10:15:02 +08:00
pandamicro e9ee303445 Merge pull request #12547 from MSOpenTech/v3.7-winrt-audio 
V3.7 winrt audio fix
 2015-06-26 09:47:11 +08:00
pandamicro d2764918b9 Merge pull request #12545 from WenhaiLin/v3-37-removeUInclude 
Remove unneeded include files and fixed warns.
 2015-06-26 09:31:51 +08:00
pandamicro 4b34963329 Merge pull request #12537 from andyque/fix-v3.7-scrollView-dpi 
use inch for childFocusCancelOffset in UIScrollView
 2015-06-26 08:11:00 +08:00
Dale Stammen 61f4e280b4 Merge branch 'v3.7-release' into v3.7-winrt-audio 2015-06-25 12:46:20 -07:00
WenhaiLin 1494f09f06 Remove unneeded include files and fixed warns. 2015-06-25 23:15:39 +08:00
pandamicro 1ab369a70b Merge pull request #12542 from andyque/fix-v3.7-stuio-percent-mode 
Fix v3.7 cocosStudio percent position bug
 2015-06-25 21:37:12 +08:00
子龙山人 81d47efb01 Merge pull request #23 from pandamicro/v3.7-scrollView-dpi 
Fix convertDistanceFromPointToInch logic
 2015-06-25 21:36:16 +08:00
pandamicro 3136bef9e3 Fix convertDistanceFromPointToInch logic (add x, y) 2015-06-25 21:34:00 +08:00
pandamicro e29284374b Fix convertDistanceFromPointToInch logic 2015-06-25 20:57:23 +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
andyque 516d45db62 update submodule 2015-06-25 20:16:43 +08:00
Bin Zhang d508d2ecdd Solve the error when generating binary templates. 2015-06-25 19:57:49 +08:00
Bin Zhang 7ca8542d75 Optimize the implementation of auto-generating prebuilt mk files. 2015-06-25 19:47:55 +08:00
VisualSJ 110e51d0bc Encoded into AVC 2015-06-25 19:01:55 +08:00
pandamicro 0275b54b63 Merge pull request #12540 from samuele3hu/v3_7_test 
Fix the compile error of js-template by using android-studio compile param.
 2015-06-25 18:49:43 +08:00
andyque 8f7b439dfe add cocostudio 1.6 tests 2015-06-25 18:06:45 +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
samuele3hu 3a654b4615 Fix the compile error of js-template by using android-studio compile param. 2015-06-25 17:44:51 +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 081869b4f0 Merge pull request #12538 from samuele3hu/v3_7_test 
[ci skip]Update the branches info to v3.7-release
 2015-06-25 17:11:19 +08:00