Commit Graph

211 Commits

Author SHA1 Message Date
Wenhai Lin cb6b5f3c8e Merge pull request #132 from WenhaiLin/master
IPV6 compatibility
2016-05-19 09:48:55 +08:00
Wenhai Lin 033cd4649f IPV6 compatibility 2016-05-19 01:46:01 +08:00
Wenhai Lin c3a3a40af7 refine 2016-05-18 22:56:39 +08:00
Wenhai Lin 18c705f5c0 Merge pull request #128 from WenhaiLin/master
Fixed compile fail on Mac
2016-05-18 22:36:02 +08:00
Wenhai Lin 5935df42be Fixed compile fail on Mac 2016-05-18 22:32:40 +08:00
Wenhai Lin e7499a3e9a Merge pull request #127 from WenhaiLin/master
Refine FileUtilsAndroid::getData
2016-05-18 19:21:38 +08:00
Wenhai Lin bf7ad0dabd Refine FileUtilsAndroid::getData 2016-05-18 19:20:03 +08:00
Wenhai Lin 1083647744 Merge pull request #125 from WenhaiLin/master
Disable `cc.log` in release mode.(Redefine it in CocosRuntime)
2016-05-18 17:44:35 +08:00
Wenhai Lin e571338580 Disable cc.log in release mode.(Redefine it in CocosRuntime) 2016-05-18 17:43:47 +08:00
Wenhai Lin 87a9528c19 Merge pull request #122 from WenhaiLin/master
Use const references whenever possible
2016-05-18 14:57:30 +08:00
Wenhai Lin 7c57507422 Use const references whenever possible 2016-05-18 14:55:47 +08:00
Wenhai Lin 99a93d8599 Merge pull request #119 from WenhaiLin/master
Use const references whenever possible
2016-05-18 14:29:47 +08:00
Wenhai Lin 5dcd5ed979 Use const references whenever possible 2016-05-18 14:26:43 +08:00
Wenhai Lin 94c6dcdf6a Replace CCAssert macros with CCASSERT 2016-05-18 13:50:49 +08:00
pandamicro c54d2d6c03 Merge pull request #116 from knoxHuang/develop
fix WebSocket  bug for JSB
2016-05-18 10:13:27 +08:00
knoxHuang 3e79d5cab9 fix WebSocket bug for JSB 2016-05-18 10:09:43 +08:00
Wenhai Lin b81809ba77 Merge pull request #115 from WenhaiLin/master
Use https instead of git protocol
2016-05-17 21:42:35 +08:00
Wenhai Lin 78ac26e0bf Use https instead of git protocol 2016-05-17 21:40:40 +08:00
Wenhai Lin 0259163854 Merge pull request #114 from WenhaiLin/master
Enable `cc.log` in release mode.
2016-05-17 18:01:15 +08:00
Wenhai Lin b7f8bb7ab4 Enable cc.log in release mode. 2016-05-17 17:59:58 +08:00
Wenhai Lin e4ede3ea2f Merge pull request #113 from pandamicro/master
Sync changes needed in creator to master
2016-05-17 17:47:53 +08:00
pandamicro 9ce7955434 Some small fixes 2016-05-17 17:33:11 +08:00
knoxHuang db921c300c update cocos2d_specifics and jsb_cocos2d 2016-05-17 17:30:44 +08:00
2youyou2 76cee016f6 default search path should not be empty 2016-05-17 17:29:53 +08:00
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 e21c6db7bd Merge pull request #111 from cocos-creator/revert-110-master
Revert "[CocosPlay-Android]Fixed crash on single process application."
2016-05-17 16:22: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 5dadad1ed1 Merge pull request #110 from WenhaiLin/master
[CocosPlay-Android]Fixed crash on single process application.
2016-05-17 15:34:54 +08:00
Wenhai Lin a9b0bda241 [CocosPlay-Android]Fixed crash on single process application. 2016-05-17 15:34:13 +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
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
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
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
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
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