Commit Graph

476 Commits

Author SHA1 Message Date
2youyou2 c0dee4ed6e fixed windows graphics 2016-07-06 09:36:55 +08:00
Wang Nan 84a8ea7851 Merge pull request #194 from nantas/develop
Add branch to the upload path
2016-07-05 15:00:51 +08:00
Nan Wang 69bd9f1227 merged 2016-07-05 11:46:31 +08:00
Nan Wang 2e75326e24 upload cpp engine packages to branch folder 2016-07-05 11:39:43 +08:00
Wang Nan 0eef32114f Merge pull request #192 from knoxHuang/v1.1
fix JSB Label does not support Boolean value. for #fireball/issues/3519
2016-07-04 18:32:46 +08:00
knoxHuang 07f1344db5 fix JSB Label does not support Boolean value. for #fireball/issues/3519 2016-07-04 18:27:24 +08:00
Wang Nan 0e85517ade Merge pull request #191 from knoxHuang/v1.1
add isScheduled for JSB #fireball/issues/3510
2016-07-04 18:18:16 +08:00
knoxHuang ce4ea88297 add isScheduled for JSB #fireball/issues/3510 2016-07-04 18:16:48 +08:00
pandamicro 2be93ef540 Merge pull request #190 from knoxHuang/develop
add isScheduled for JSB #fireball/issues/3510
2016-07-04 18:14:29 +08:00
knoxHuang 8f1026d667 add isScheduled for JSB #fireball/issues/3510 2016-07-04 18:09:08 +08:00
Wang Nan 988599ed7d Merge pull request #187 from 2youyou2/graphics
Graphics
2016-07-04 17:29:48 +08:00
Nan Wang b333c736ce merge v1.1 2016-07-01 15:39:44 +08:00
2youyouo2 c4fc8d0e84 add graphics 2016-06-30 14:56:31 +08:00
Wang Nan ee55a7fcf3 Merge pull request #186 from 2youyou2/v1.1
add project.properties
2016-06-30 13:50:34 +08:00
Wang Nan 6902941dcc Merge pull request #188 from knoxHuang/develop
fix ScriptingCore code error
2016-06-30 13:50:10 +08:00
knoxHuang 94bec4a581 fix ScriptingCore code error 2016-06-30 13:06:59 +08:00
2youyouo2 4aadc944c3 add project.properties 2016-06-29 18:36:09 +08:00
Wang Nan fd9282e7ee Merge pull request #185 from nantas/v1.1
update info.plist to add app transport security setting
2016-06-29 15:40:51 +08:00
Nan Wang 9ae1360be9 update info.plist to add app transport security setting to allow http connection 2016-06-29 15:39:50 +08:00
Wang Nan 2967c28303 Merge pull request #184 from knoxHuang/v1.1
fix Follow native error, for #fireball/issues/3409
2016-06-29 15:32:25 +08:00
knoxHuang aa266594db fix Follow native error, for #fireball/issues/3409 2016-06-29 15:21:51 +08:00
Nan Wang 3d8bf47f7b Merge branch 'v1.1' of github.com:cocos-creator/cocos2d-x-lite into v1.1 2016-06-29 11:47:12 +08:00
Nan Wang ae3ba4ddd9 update external repo url 2016-06-29 11:46:47 +08:00
Wang Nan f8d3af3ed8 Merge pull request #182 from knoxHuang/develop
fix Follow native error, for #fireball/issues/3409
2016-06-29 11:05:31 +08:00
knoxHuang ca32680d27 fix Follow native error, for #fireball/issues/3409 2016-06-29 10:18:58 +08:00
pandamicro e8f9aa8dd9 Merge pull request #181 from knoxHuang/develop
merge code for #/fireball/issues/2787
2016-06-28 14:37:39 +08:00
knoxHuang 06bf021143 merge code for #/fireball/issues/2787 2016-06-28 14:22:22 +08:00
Wang Nan 231b9ac4f1 Merge pull request #180 from cocos-creator/v1.1
merge V1.1
2016-06-27 18:09:56 +08:00
子龙山人 ad9faba421 Merge pull request #178 from zilongshanren/improveEditBox
Improve edit box
2016-06-27 17:11:48 +08:00
Wang Nan f6b8839bbd Merge pull request #179 from 2youyou2/simulator
fixed simulator http request
2016-06-24 17:54:18 +08:00
2youyouo2 ea3f6634e0 fixed simulator http request 2016-06-24 17:52:33 +08:00
zilongshanren 0b69cec407 sync editbox changes from cocos2d-x 2016-06-24 17:33:58 +08:00
pandamicro c16d2164fb Merge pull request #177 from knoxHuang/v1.1
fix cc.Follow code error for  jsb_create_apis
2016-06-24 17:07:03 +08:00
knoxHuang 4352ca56d6 fix cc.Follow code error for jsb_create_apis 2016-06-24 17:00:19 +08:00
zilongshanren 6e5b266496 add all lowercase support 2016-06-24 15:30:59 +08:00
Wang Nan 4ea65e124d Merge pull request #176 from nantas/v1.1
use fs-extra to copy simulator script files
2016-06-23 18:39:04 +08:00
Wang Nan 834e8b0b26 Merge pull request #175 from nantas/v1.1
Use fs-extra to copy simulator script files
2016-06-23 18:38:22 +08:00
Nan Wang bc7c27dcc6 fix simulator path check 2016-06-23 18:35:59 +08:00
Nan Wang e42924a978 use fs-extra.copy to copy script and config.json file for simulator 2016-06-23 18:29:15 +08:00
Wang Nan 2a2352b1bd Merge pull request #172 from minggo/v1.1
hide virtual button by default
2016-06-16 13:54:20 +08:00
Wang Nan 0ead7ec80c Merge pull request #173 from zilongshanren/fixWordTextWrap
Fix TTF and Bmfont word wrap
2016-06-16 13:52:25 +08:00
zilongshanren a0c632f20b Fix TTF and Bmfont word wrap
1. when the TTF or BMFont word boundary exceed the label width,
turn the word wrap to char wrap.
2016-06-16 13:49:46 +08:00
minggo 6a259592f4 hide virtual button by default 2016-06-16 10:31:00 +08:00
Wang Nan bde6dda785 Merge pull request #171 from cocos-creator/v1.1
merge V1.1
2016-06-15 13:48:33 +08:00
子龙山人 faa3e592fd Merge pull request #170 from CocosRobot/update_js_bindings_1465874303
[ci skip][AUTO]: updating jsbinding automatically
2016-06-14 11:28:11 +08:00
子龙山人 11e2907981 Merge pull request #169 from CocosRobot/update_cocosfiles_1465874162
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-14 11:27:56 +08:00
CocosRobot 1d6d76bb9b [ci skip][AUTO]: updating jsbinding automatically 2016-06-14 03:22:41 +00:00
CocosRobot 3cf1737e66 [AUTO][ci skip]: updating cocos2dx_files.json 2016-06-14 03:16:03 +00:00
子龙山人 498bdd79d8 Merge pull request #165 from zilongshanren/add-system-font-overflow
Add system font overflow
2016-06-14 11:15:16 +08:00
Wang Nan ada47a1a71 Merge pull request #168 from knoxHuang/v1.1
add CCJavascriptJavaBridge.cpp  for Android.mk
2016-06-13 19:05:19 +08:00