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

30666 Commits

Author SHA1 Message Date
Neo Kim a37015d083 To create radio button feature which uses almost same logic with CheckBox, extract the common logic from CheckBox and make it as AbstractCheckButton class. 2015-06-30 18:50:13 +09:00
子龙山人 40521ad1c4 Merge pull request #12600 from fusijie/fix_spritebatchnode_sort_error 
Fix SpriteBatchNode sort error.
 2015-06-30 17:29:59 +08:00
子龙山人 077241eecf Merge pull request #12599 from jianglong0156/jsbProjectMerge 
merge the jsb project into cocos2d project
 2015-06-30 17:04:12 +08:00
子龙山人 d5d68223f1 Merge pull request #12604 from WenhaiLin/v3.8-audio-iosfix 
AudioEngine:Fixed play audio may fail(error code:-1) on iOS
 2015-06-30 16:30:05 +08:00
子龙山人 3b4d134050 Merge pull request #12603 from jianglong0156/autoPolygonFileEncode 
change the file encoding,
 2015-06-30 16:29:44 +08:00
jianglong0156 1f4e65e401 Merge pull request #10 from andyque/testMergeJSB 
update daily build and pr build
 2015-06-30 16:26:57 +08:00
andyque a6451c6c5e update daily build and pr build 2015-06-30 16:24:03 +08:00
Wenhai Lin e124593a5c AudioEngine:Fixed play audio may fail(error code:-1) on iOS 2015-06-30 15:38:24 +08:00
jianglong0156 bc341edf1f change the file encoding, 
It  display a coded warning in current encoding, leading to incredbuild unusable
 2015-06-30 15:33:54 +08:00
Jacky 25bac2f6a9 Fix SpriteBatchNode sort error. 2015-06-30 14:12:18 +08:00
jianglong0156 329aab4a7a delete invalid project file 2015-06-30 13:52:00 +08:00
jianglong0156 f20f8a2777 delete invalid project files 2015-06-30 13:51:13 +08:00
jianglong0156 185b4419be merge job project into cocos2d-x project 2015-06-30 13:49:24 +08:00
pandamicro c0ff3abef6 Merge pull request #12419 from yangws/v3_scene3dtest 
Modify Scene3DTest to composite 2D/3D scene by moving UI and camera f…
 2015-06-30 13:44:20 +08:00
Vincent Yang 1105111fab Merge v3 branch. 2015-06-30 11:59:56 +08:00
子龙山人 29cccf631e Merge pull request #12550 from kompjoefriek/v3-vibrate 
Vibrate support in v3
 2015-06-30 10:28:59 +08:00
子龙山人 950cb840c2 Merge pull request #12582 from super626/listview 
fix camera mask of listview
 2015-06-30 10:25:57 +08:00
子龙山人 265c9b55e0 Merge pull request #12586 from fusijie/add-autoculling-bug-testcase 
add auto culling test case.
 2015-06-30 09:33:36 +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 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
Neo Kim 71fc49b6a6 Merge pull request #1 from andyque/testElasticScrollView 
Test elastic scroll view
 2015-06-29 16:38:44 +09: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
子龙山人 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