Commit Graph

292 Commits

Author SHA1 Message Date
pandamicro 96b61bfb45 Merge pull request #118 from pandamicro/develop
Add AssetsManagerEx to extension
2016-05-18 14:28:15 +08:00
pandamicro 87ca37f50f Add AssetsManagerEx to extension 2016-05-18 14:19:55 +08:00
pandamicro eaf4396a67 Merge pull request #117 from pandamicro/develop
fix WebSocket  bug for JSB
2016-05-18 11:03:27 +08:00
knoxHuang 2c45914b84 fix WebSocket bug for JSB 2016-05-18 11:02:37 +08:00
pandamicro a54ab03bec Merge pull request #112 from knoxHuang/develop
update  cocos2d_specifics and jsb_cocos2d
2016-05-17 17:28:45 +08:00
knoxHuang cf885823b7 update cocos2d_specifics and jsb_cocos2d 2016-05-17 17:26:44 +08:00
Wang Nan c2d4805e68 Merge pull request #107 from 2youyouo2/develop
fixed binary template
2016-05-16 17:56:51 +08:00
2youyou2 3812522182 fixed binary template 2016-05-16 17:21:35 +08:00
Wang Nan 097bd10704 Merge pull request #105 from 2youyouo2/develop
merge master
2016-05-16 15:39:41 +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 8a7fe4171e Merge pull request #106 from WenhaiLin/master
Fixed  FileUtils::setDefaultResourceRootPath
2016-05-16 13:47:41 +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 24cc019914 Merge pull request #104 from WenhaiLin/master
FileUtils::setDefaultResourceRootPath-->Fixed crash if `searchPath` not start with the original  `_defaultResRootPath`.
2016-05-16 12:02:39 +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
Wang Nan 945ef78d01 Merge pull request #103 from 2youyouo2/develop
fixed CCFileUtils
2016-05-13 15:53:28 +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
2youyou2 e3058fb319 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-05-13 14:27:42 +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
2youyou2 409d78cd59 Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-05-13 13:46:55 +08:00
Wenhai Lin 67c317a2e9 Merge pull request #100 from WenhaiLin/master
Fixed compile fail on WIN32
2016-05-13 11:55:13 +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
zilongshanren 3e6d4b2d10 Merge pull request #99 from CocosRobot/update_cocosfiles_1463105830
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-13 10:18:08 +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 f17c5b961c Merge pull request #97 from WenhaiLin/master
Fixed compile fail on WIN32
2016-05-12 19:25:31 +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 e61de3f528 Merge pull request #95 from WenhaiLin/master
Fixed FPS
2016-05-12 17:22:15 +08:00
Wenhai Lin d89029f441 Fixed FPS 2016-05-12 17:21:32 +08:00
Wenhai Lin 58110a82ba Merge pull request #94 from WenhaiLin/master
refine
2016-05-12 16:33:38 +08:00
Wenhai Lin 0449d57993 refine 2016-05-12 16:31:16 +08:00
Wenhai Lin 88a7400afc Merge pull request #93 from WenhaiLin/master
Sync Bug fix:
2016-05-12 14:39:57 +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
zilongshanren c007b48803 Merge pull request #92 from CocosRobot/update_js_bindings_1462959916
[ci skip][AUTO]: updating jsbinding automatically
2016-05-11 19:36:19 +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
Wenhai Lin 3e8aa3612a Merge pull request #90 from knoxHuang/develop
fix CCMotionStreak code memory leak
2016-05-11 14:46:46 +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 250b70861d Merge pull request #88 from WenhaiLin/master
Fixed crash in `Director::popScene()`
2016-05-11 13:53:10 +08:00
Wenhai Lin 4eadc94cbc Fixed crash in Director::popScene() 2016-05-11 13:52:10 +08:00