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
Bin Zhang e24975f0fe Add python script for generate cocos simulator. 2015-07-02 13:43:52 +08:00
Bin Zhang 8d928e60c8 Update the version displayed in simulator about dialog. 2015-07-01 17:23:34 +08:00
pandamicro 48cc900198 Merge pull request #12622 from natural-law/framework 
Add link libs config in simulator project for framework.
 2015-07-01 17:03:46 +08:00
Bin Zhang d0fc1e9d34 Add link libs config in simulator project for framework. 2015-07-01 15:31:03 +08:00
pandamicro 168d56ff98 Merge pull request #12610 from natural-law/v3.7-release 
Remove the plugin-x related files from the Xcode project of js-bindings.
 2015-07-01 12:48:30 +08:00
子龙山人 d65900ea3d Merge pull request #12606 from natural-law/v3.7-release 
Optimize the implementation of framework-compile tools & simulator project.
 2015-07-01 09:32:43 +08:00
Bin Zhang d0db3aee98 Remove the plugin-x related files from the Xcode project of js-bindings . 2015-06-30 17:28:47 +08:00
Bin Zhang 0726b2be9c Generate prebuilt Android.mk when compiling prebuilt libs for android. 2015-06-30 16:53:11 +08:00
Bin Zhang 78c5f2e77e Build simulator project when generating prebuilt libs for android. 2015-06-30 16:45:55 +08:00
Bin Zhang bb77101f0b Solve the error when building simulator for android. 2015-06-30 16:45:13 +08:00
Bin Zhang 9b45a9ee6f Add preprocessor CC_ENABLE_BULLET_INTEGRATION=1 in simulator. 2015-06-30 16:14:25 +08:00
Bin Zhang a6a1cbdfbe Solve the error config of js runtime template. 2015-06-30 16:03:39 +08:00
pandamicro 92c869f408 Merge pull request #12594 from MSOpenTech/v3-winrt-js-keyboard 
V3 winrt js keyboard support
 2015-06-30 07:24:17 +08:00
子龙山人 5fae3f23a9 Merge pull request #12593 from MSOpenTech/v3-winrt-wic 
V3: WinRT unsupported cocos2d-x image formats removed or updated
 2015-06-30 06:27:52 +08:00
Dale Stammen 38b687f8d8 enable support for keyboard on winrt platforms to fix back button 2015-06-29 09:13:19 -07:00
Dale Stammen 7684c208e0 unsupported cocos2d-x image formats removed or updated 2015-06-29 08:41:44 -07:00
Dale Stammen eb668f63ce unsupported cocos2d-x image formats removed or updated 2015-06-29 08:39:31 -07:00
pandamicro d07b8643df Merge pull request #12591 from pandamicro/v3.7-release 
[ci skip] Add video player and web view to template and simulator
 2015-06-29 20:58:27 +08:00
pandamicro 1f93fcfc2a Remove duplicated code 2015-06-29 20:00:49 +08:00
pandamicro f67ad0352c Fix simulator js modules 2015-06-29 19:57:12 +08:00
pandamicro 5b9b130223 Add video player and web view to template 2015-06-29 18:23:01 +08:00
pandamicro 53fb76ecfe Merge pull request #12588 from pandamicro/v3.7-release 
[ci skip]Update engine version
 2015-06-29 18:22:02 +08:00
pandamicro 15c763d84a Update engine version 2015-06-29 18:21:06 +08:00
pandamicro a6ef03d580 Merge pull request #12585 from natural-law/3.7-release-framework 
[ci skip] Optimize the implementation of framework-compile.
 2015-06-29 17:10:30 +08:00
Bin Zhang 06dec2be87 Remove unused configuration. 2015-06-29 16:24:15 +08:00
子龙山人 e29e4f31ee Merge pull request #12583 from natural-law/v3.7-release 
Update the reference of submodule cocos2d-console.
 2015-06-29 16:17:32 +08:00
Bin Zhang d3e9403f20 Generating prebuilt Android.mk when generating prebuilt libs. 2015-06-29 16:00:35 +08:00
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