Commit Graph

4804 Commits

Author SHA1 Message Date
pandamicro 2763b53ac1 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java
2016-08-26 19:11:51 +08:00
pandamicro 46bccf84f8 Update external 2016-08-26 19:04:06 +08:00
pandamicro 1c01a9df2c Fix android compilation issuse 2016-08-26 19:01:13 +08:00
pandamicro 26117d82b3 Fix compilation issues on iOS 2016-08-26 18:52:25 +08:00
pandamicro acae8886e8 Upgrade anysdk bindings 2016-08-26 18:51:48 +08:00
pandamicro 9bf561baee Upgrade to v3.13 release 2016-08-26 14:30:32 +08:00
pandamicro a2b0aa034c Fix viewport not supporting retina issue 2016-08-25 17:50:24 +08:00
pandamicro ba33766602 Upgrade scripting/js-bindings/script to v3.13 2016-08-25 17:25:51 +08:00
zhangbin f97b23514b Use java reflection to avoid API level dependent, Use API Level 10. 2016-08-25 09:56:32 +08:00
yanli.huang 17bba052e5 update cocos2d-console commit id :add cocospackage.pyc 2016-08-22 16:46:10 +08:00
yanli.huang 0df076d508 update cocos2d-console commit id : cocos package so change pyc 2016-08-22 16:29:13 +08:00
zilongshanren c18fa069ff fix android isPlaying API 2016-08-16 16:38:40 +08:00
zilongshanren 860428af73 add android support 2016-08-16 16:38:26 +08:00
zilongshanren 062169358d add currentTime and duration in iOS 2016-08-16 16:38:14 +08:00
pandamicro b742058510 Fix all compilation and linking issues 2016-08-16 16:09:39 +08:00
zilongshanren ca1a3d8870 fix android isPlaying API 2016-08-16 14:49:48 +08:00
zilongshanren 1844174f49 Merge remote-tracking branch 'upstream/develop' into improveVideoPlayer 2016-08-16 12:01:58 +08:00
zilongshanren c6ee3598d3 add android support 2016-08-16 12:01:23 +08:00
yanli.huang 15515c3d2d update cocos2d-console commit: add --env param to cocos package 2016-08-16 11:48:52 +08:00
Wang Nan 56d89a1e33 Merge pull request #274 from hylthink/develop
update cocos2d-console commit :add --env param to cocos package
2016-08-16 11:46:24 +08:00
yanli.huang c31ae1fe2c update cocos2d-console commit :add --env param to cocos package 2016-08-16 11:43:11 +08:00
pandamicro 7bfc19497b Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-08-16 11:34:42 +08:00
zilongshanren d5fbdb1e53 add currentTime and duration in iOS 2016-08-15 19:55:13 +08:00
pandamicro 6713fd2d11 Fix js-bindings project compilation issues 2016-08-15 19:08:58 +08:00
2youyouo2 b7c07b6b6c fixed graphics arc 2016-08-15 12:01:57 +08:00
CocosRobot 9da0205b30 [ci skip][AUTO]: updating jsbinding automatically 2016-08-14 17:25:41 +00:00
pandamicro 2a903b9ce2 Gen autobindings for v1.2 branch 2016-08-15 01:17:57 +08:00
pandamicro 32b4f63d45 Fix Creator module memory not controlled by cpp 2016-08-15 01:11:32 +08:00
zhangbin ac3b05b491 Solve the issue by reviewed. 2016-08-12 17:55:47 +08:00
zhangbin 4e8915ecd8 Solve the error is generated js bindings. 2016-08-12 15:56:52 +08:00
zhangbin c3f6840803 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into issue3120 2016-08-12 15:43:55 +08:00
pandamicro f06b057a3e Update bindings configurations 2016-08-11 13:59:38 +08:00
pandamicro 1dd701936b Fix compilation issues on Mac 2016-08-11 13:57:51 +08:00
pandamicro f05b67e287 Upgrade cocos/scripting to v3.13 2016-08-09 18:17:42 +08:00
2youyou2 5172ec698d tab to 4 spaces 2016-08-09 15:59:19 +08:00
2youyou2 7dc1869a41 fixed graphics crash on windows 2016-08-09 15:54:40 +08:00
pandamicro 5011a758cc Upgrade cocos/ui to v3.13 2016-08-07 22:18:28 +08:00
pandamicro 1bbdb8e80a Upgrade cocos/storage & extensions to v3.13 2016-08-05 19:48:24 +08:00
pandamicro ab95942886 Upgrade cocos/renderer to v3.13 2016-08-05 19:30:31 +08:00
pandamicro fe85f150d9 Upgrade cocos/platform to v3.13 2016-08-05 18:13:48 +08:00
pandamicro bcbc4e1131 Upgrade cocos/math & cocos/network to v3.13 2016-08-05 18:13:16 +08:00
pandamicro 4afa545394 Upgrade cocos/editor-support/spine to v3.13 2016-08-05 16:03:41 +08:00
pandamicro 46fd733efb Upgrade cocos/editor-support/cocostudio to v3.13 2016-08-05 14:57:18 +08:00
Wang Nan fb39a605a3 Merge pull request #265 from 2youyou2/template
Template
2016-08-05 14:47:02 +08:00
pandamicro b0287ce6de Upgrade cocos/editor-support/cocosbuilder to v3.13 2016-08-04 17:30:55 +08:00
pandamicro 2971980c03 Upgrade cocos/base to v3.13 2016-08-04 16:04:41 +08:00
zilongshanren 190a94fbcc modify the line truncate mode 2016-08-04 15:52:13 +08:00
zilongshanren 190e15d52c fix editbox password alignment 2016-08-04 15:10:31 +08:00
pandamicro 8bd0b63d83 Upgrade cocos/audio to v3.13 2016-08-04 12:01:26 +08:00
pandamicro 8642f8ef74 Upgrade cocos/2d to v3.13 2016-08-04 11:59:26 +08:00