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 |
|
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 |
|
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 |
|
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 |
|
子龙山人
|
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 |
|
knoxHuang
|
28acc37ee0
|
add CCJavascriptJavaBridge.cpp for Android.mk
|
2016-06-13 19:02:41 +08:00 |
|
pandamicro
|
4e076a88e5
|
Merge pull request #167 from knoxHuang/v1.1
add JS and JAVA reflection test tips for AppActivity.java
|
2016-06-13 18:07:15 +08:00 |
|
knoxHuang
|
048266e40b
|
add JS and JAVA reflection test tips for AppActivity.java
|
2016-06-13 18:06:18 +08:00 |
|
pandamicro
|
1dc71db965
|
Merge pull request #166 from knoxHuang/v1.1
add CCJavascriptJavaBridge
|
2016-06-13 17:43:16 +08:00 |
|
knoxHuang
|
fb6d6d7b8a
|
update CCJavascriptJavaBridge
|
2016-06-13 17:39:33 +08:00 |
|
zilongshanren
|
a356c7d387
|
fix android system font
|
2016-06-13 16:42:23 +08:00 |
|
zilongshanren
|
574df2bad3
|
improve iOS and Mac clamp and shrink feature
|
2016-06-13 15:19:34 +08:00 |
|
zilongshanren
|
0733fe707c
|
fix template settings
|
2016-06-12 18:30:04 +08:00 |
|
zilongshanren
|
c2e5a97f6a
|
add system font label overflow
|
2016-06-12 17:43:02 +08:00 |
|
Wang Nan
|
4f18cbc2f1
|
Merge pull request #163 from CocosRobot/update_cocosfiles_1465373680
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-06-08 16:23:14 +08:00 |
|
CocosRobot
|
ac5a126585
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-06-08 08:14:41 +00:00 |
|
Nan Wang
|
9d7d002c6a
|
update yml branch setting to v1.1
|
2016-06-08 16:13:30 +08:00 |
|
Nan Wang
|
2cdc58d57e
|
Merge branch 'v1.1' of github.com:cocos-creator/cocos2d-x-lite into v1.1
|
2016-06-08 13:45:31 +08:00 |
|
Wang Nan
|
267ea3f06f
|
Merge pull request #162 from dabingnn/fix_tiled_sprite
fix tiled sprite exceed 65536 vertices
|
2016-06-08 13:44:49 +08:00 |
|
Huabing.Xu
|
9f9c813e22
|
fix tiled sprite exceed 65536 vertices
|
2016-06-08 13:35:27 +08:00 |
|
Nan Wang
|
43a284ac19
|
Merge branch 'v1.1' of github.com:cocos-creator/cocos2d-x-lite into v1.1
|
2016-06-08 11:02:15 +08:00 |
|
Wang Nan
|
428364ec79
|
Merge pull request #161 from pandamicro/v1.1
Add JavascriptJavaBridge dependencies back
|
2016-06-08 10:01:54 +08:00 |
|
pandamicro
|
e826686499
|
Add JavascriptJavaBridge dependencies back
|
2016-06-08 09:56:31 +08:00 |
|
Wang Nan
|
a519ea0bb6
|
Merge pull request #160 from 2youyouo2/template
fixed android template
|
2016-06-07 14:59:19 +08:00 |
|
2youyouo2
|
fa94995e70
|
fixed android template
|
2016-06-07 14:51:37 +08:00 |
|
Nan Wang
|
938877de36
|
Merge branch 'v1.1' of github.com:cocos-creator/cocos2d-x-lite into v1.1
|
2016-06-07 09:31:11 +08:00 |
|
Wang Nan
|
87752e5d45
|
Merge pull request #156 from 2youyouo2/android-studio
Android studio
|
2016-06-07 09:26:42 +08:00 |
|
Wang Nan
|
448d9a3f5f
|
Merge pull request #158 from 2youyouo2/resize
Resize
|
2016-06-07 09:26:18 +08:00 |
|
pandamicro
|
8547c6beaf
|
Merge pull request #159 from pandamicro/v1.1
Add necessary Android dependencies for AssetsManager
|
2016-06-06 20:48:33 +08:00 |
|
pandamicro
|
2e2922afae
|
Add necessary lib for AssetManager
|
2016-06-06 20:35:48 +08:00 |
|
pandamicro
|
dfbf560787
|
Add necessary Android dependencies for AssetsManager
|
2016-06-06 20:30:09 +08:00 |
|
2youyouo2
|
39343dd9ef
|
add window resize event when resize
|
2016-06-06 15:28:48 +08:00 |
|
2youyouo2
|
47f7f34117
|
default support resize window in simulator desktop
|
2016-06-06 11:54:08 +08:00 |
|
2youyouo2
|
1b2087cfbb
|
fixed window resize
|
2016-06-06 11:53:38 +08:00 |
|
2youyouo2
|
d45928a655
|
reset build.gradle
|
2016-06-01 17:40:12 +08:00 |
|
Nan Wang
|
aeddb5cc69
|
Merge branch 'v1.1' of github.com:cocos-creator/cocos2d-x-lite into v1.1
|
2016-06-01 17:34:08 +08:00 |
|
Wang Nan
|
76e880685a
|
Merge pull request #155 from nantas/develop
fix gen-libs cmd line
|
2016-06-01 17:33:57 +08:00 |
|
Nan Wang
|
819db85575
|
Merge branch 'develop' of github.com:nantas/cocos2d-x-lite into v1.1
|
2016-06-01 17:32:16 +08:00 |
|