Commit Graph

32870 Commits

Author SHA1 Message Date
Bin Zhang bb77101f0b Solve the error when building simulator for android. 2015-06-30 16:45:13 +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
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
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
Vincent Yang 2ba6f266ad Fixed bug: UI component can't click correctly by moving UI and camera far away of origin. 2015-06-30 14:32:14 +08:00
yangxiao 538daf5bce add empty line 2015-06-30 14:19:58 +08:00
yangxiao 2ed5ee123e improve collider 2015-06-30 14:16:05 +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
Shin Hirota 221d33a431 Fixed iOS/JS-Bind callStaticMethod() with bool arg 2015-06-30 14:00:28 +09: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
XiaoYang 1e7cc1b159 Merge pull request #355 from songchengjiang/physics3d
add Physics3DCollider
2015-06-30 09:39:50 +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
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
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
songchengjiang 7733f0fe19 add interfaces 2015-06-29 17:20:28 +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