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

30811 Commits

Author SHA1 Message Date
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
jianglong0156 aac1da2016 Merge branch 'jsbProjectMerge' of https://github.com/jianglong0156/cocos2d-x into jsbProjectMerge 2015-06-29 17:58:58 +08:00
jianglong0156 3c13cdd62c add space project 2015-06-29 17:58:38 +08:00
jianglong0156 8711ffddce delete js-tests project in win8.1 and wp8 2015-06-29 17:44:27 +08:00
Jacky 0be9763a9c add auto culling test case. 2015-06-29 17:25:13 +08:00
jianglong0156 ba768c45ac add js-test into cocos2d project in win8 2015-06-29 17:23:19 +08:00
jianglong0156 58f7d568cd remove js project in win32 2015-06-29 17:14:22 +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
pandamicro 08bdf84183 Merge pull request #12584 from jianglong0156/tilemapTestCaseConflict 
resolve the conflict that the 3d testcase show error after click the the titlemap testcase
 2015-06-29 17:07:13 +08:00
子龙山人 c997284825 Merge pull request #12352 from andyque/add-two-events-to-ui-slider 
Improve ui::Slider
 2015-06-29 17:01:27 +08:00
子龙山人 aa86ed9a04 Merge pull request #12466 from neokim/feature/elastic_scrollview 
Enhance ScrollView with easing out scrolling
 2015-06-29 16:59:24 +08:00
jianglong0156 bbf4476ff3 add win32 js-test project into cocos2d-x project 2015-06-29 16:48:09 +08:00
jianglong0156 fd54b9941d resolve the titlemap testcase conflict with the 3d testcase. 2015-06-29 16:34:54 +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
Neo Kim 71fc49b6a6 Merge pull request #1 from andyque/testElasticScrollView 
Test elastic scroll view
 2015-06-29 16:38:44 +09:00
Bin Zhang e21634f618 Update the reference of submodule cocos2d-console. 2015-06-29 15:18:00 +08:00
yangxiao a56a5d24b6 fix camera mask of listview 2015-06-29 14:41:03 +08:00
andyque 60834e6f0c Merge branch 'v3' into v3-finish-android-9-patch-image-format 
Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-29 12:05:52 +08:00
andyque 30d2129f0c improve indent and getTime function 2015-06-29 11:52:53 +08:00
子龙山人 85af18f634 Merge pull request #12580 from andyque/v3 
merge v3.7 back to v3
 2015-06-29 11:51:38 +08:00
andyque cc1e126a84 Merge branch 'v3.7-release' into v3 2015-06-29 10:35:23 +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
pandamicro 9f32db9154 Merge pull request #12556 from jianglong0156/videoplayer 
[ci skip]add videoplayer state, modify play label
 2015-06-26 10:48:20 +08:00