Commit Graph

4804 Commits

Author SHA1 Message Date
zhangbin 8633eb2210 Solve the crash in simulator if there is no return value of onTouchBegan. 2016-05-17 17:26:41 +08:00
CocosRobot af8979aef2 [ci skip][AUTO]: updating jsbinding automatically 2016-05-17 17:26:12 +08:00
zilongshanren 866c396761 update js bindings 2016-05-17 17:23:26 +08:00
knoxHuang ec9f849fb4 fix CCMotionStreak code memory leak 2016-05-17 17:13:10 +08:00
knoxHuang a2d4e7e633 Perfect CCMotionStreak 2016-05-17 17:12:55 +08:00
yinkaile aa709267b4 fixed jsb DrawNode (#46)
Fixed jsb DrawNode
2016-05-17 17:12:21 +08:00
Wenhai Lin 55615f35a0 Revert "[CocosPlay-Android]Fixed crash on single process application." 2016-05-17 16:21:05 +08:00
Wenhai Lin a9b0bda241 [CocosPlay-Android]Fixed crash on single process application. 2016-05-17 15:34:13 +08:00
2youyou2 3812522182 fixed binary template 2016-05-16 17:21:35 +08:00
2youyou2 ef873c25f7 Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-05-16 13:48:17 +08:00
Wenhai Lin c714a50bb3 Fixed FileUtils::setDefaultResourceRootPath 2016-05-16 13:46:53 +08:00
2youyou2 287d765f8c Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-05-16 12:45:58 +08:00
Wenhai Lin 6fc6ffa6a5 FileUtils::setDefaultResourceRootPath-->Fixed crash if searchPath not start with the original _defaultResRootPath. 2016-05-16 12:00:41 +08:00
2youyou2 907569b779 refine code 2016-05-13 15:50:23 +08:00
2youyou2 cc706146c9 default search path should not be empty 2016-05-13 15:48:17 +08:00
Wang Nan a24ecabab0 Merge pull request #102 from nantas/develop
update prebuilt and simulator generation workflow
2016-05-13 14:27:00 +08:00
Wang Nan bc96a2ee9d Merge pull request #101 from cocos-creator/master
Master
2016-05-13 13:47:52 +08:00
Wenhai Lin 18d21ebdee Fixed compile fail on WIN32 2016-05-13 11:54:38 +08:00
Nan Wang 8710f4a65e fixed collect prebuilt-mk including itself issue 2016-05-13 10:52:22 +08:00
Wang Nan f987b90892 Merge pull request #96 from natural-law/develop
Solve the crash in simulator if there is no return value of onTouchBegan.
2016-05-13 10:26:10 +08:00
Nan Wang 32e621118b Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-05-13 10:17:12 +08:00
CocosRobot ffdb930e79 [AUTO][ci skip]: updating cocos2dx_files.json 2016-05-13 02:17:10 +00:00
Wang Nan 3978bdda22 Merge pull request #98 from cocos-creator/master
merge Master
2016-05-13 10:16:26 +08:00
Wenhai Lin 73fc83b6ef Fixed compile fail on WIN32 2016-05-12 19:24:42 +08:00
zhangbin 7b36208a0a Solve the crash in simulator if there is no return value of onTouchBegan. 2016-05-12 18:22:43 +08:00
Nan Wang b47e5bf5ea add prebult mk to output 2016-05-12 17:59:42 +08:00
Nan Wang 6672a614fa Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-05-12 17:31:42 +08:00
Wenhai Lin d89029f441 Fixed FPS 2016-05-12 17:21:32 +08:00
Wenhai Lin 0449d57993 refine 2016-05-12 16:31:16 +08:00
Wenhai Lin 850c479516 Sync Bug fix:
1. HttpClient: remove Content-Type limitation
2.VideoPlayer/WebView: hide system native control when the Node leaves the 'stage'
2016-05-12 14:26:28 +08:00
CocosRobot de5ec7e839 [ci skip][AUTO]: updating jsbinding automatically 2016-05-11 09:50:45 +00:00
zilongshanren 9d3e755606 Merge pull request #91 from zilongshanren/use-osx-to-generate-bindings
use osx to generate bindings
2016-05-11 17:33:33 +08:00
zilongshanren b6f19dfde6 use osx to generate bindings 2016-05-11 17:33:08 +08:00
knoxHuang cc253541c8 fix CCMotionStreak code memory leak 2016-05-11 14:28:17 +08:00
Wang Nan 5510cd9a5d Merge pull request #66 from knoxHuang/develop
Perfect CCMotionStreak
2016-05-11 14:03:44 +08:00
Wenhai Lin 4eadc94cbc Fixed crash in Director::popScene() 2016-05-11 13:52:10 +08:00
zilongshanren 1f2e6e9f48 use linux to generate bindings 2016-05-11 12:02:33 +08:00
zilongshanren 6ffebc4f03 [Dont' Merge!] It's just a dummy PR. 2016-05-11 11:54:20 +08:00
zilongshanren 6423852e1d Merge pull request #84 from zilongshanren/change-travis-secure-owner
add -q option to unzip
2016-05-11 11:48:25 +08:00
zilongshanren 0cc145d991 add -q option to unzip 2016-05-11 11:47:57 +08:00
zilongshanren a4fdc8217c Merge pull request #83 from zilongshanren/change-travis-secure-owner
change ndk version from r9d to r11c
2016-05-11 11:40:07 +08:00
zilongshanren d0b79965ac change ndk version from r9d to r11c 2016-05-11 11:39:35 +08:00
2youyouo2 96201232b8 Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-05-11 11:19:22 +08:00
CocosRobot f9a3dadd92 [AUTO][ci skip]: updating cocos2dx_files.json 2016-05-11 03:09:07 +00:00
zilongshanren 7c283ccd63 fix gen bindings and cocos files script 2016-05-11 11:02:08 +08:00
zilongshanren 6e2f691342 change travis secure data owner 2016-05-11 10:50:06 +08:00
Wenhai Lin dd5b3674c6 stability improvements 2016-05-11 10:29:54 +08:00
zilongshanren bbf8958779 fix indentation of secure in travis.yml 2016-05-11 10:16:03 +08:00
Wenhai Lin 194fa85b7e stability improvements 2016-05-10 22:48:00 +08:00
zilongshanren 82547394f1 generate new secure key 2016-05-10 19:13:14 +08:00