Wang Nan
|
e49aa9825f
|
Merge pull request #207 from zilongshanren/improve-editbox-cross-platform
Improve editbox cross platform compatibility
|
2016-07-18 09:39:22 +08:00 |
|
zhangbin
|
42afcea455
|
Solve the error effect when using hex map with stagger-axis is x.
|
2016-07-18 09:33:43 +08:00 |
|
zilongshanren
|
e4f6f6db26
|
fix android multiline editbox alignment
|
2016-07-15 18:35:11 +08:00 |
|
zilongshanren
|
a20d7b97cb
|
fix jsb editbox label alignment
|
2016-07-15 18:27:32 +08:00 |
|
zilongshanren
|
fd7f421e9f
|
fix Android EditBox textChange event
|
2016-07-15 14:16:51 +08:00 |
|
2youyou2
|
0bbc29391d
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into binary
|
2016-07-14 15:46:30 +08:00 |
|
2youyou2
|
3c525de2a9
|
update binary windows template
|
2016-07-14 15:45:37 +08:00 |
|
2youyouo2
|
d130fdfa23
|
remove unused files
|
2016-07-14 11:28:07 +08:00 |
|
yanli.huang
|
0aaab3fa5e
|
add anysdk to templates
|
2016-07-13 16:37:07 +08:00 |
|
2youyouo2
|
259fc314a1
|
remove runtime files from binary template
|
2016-07-13 15:11:09 +08:00 |
|
zhangbin
|
fd04ca26c2
|
Solve the error effect when using hex map with stagger-axis is x.
|
2016-07-13 13:58:30 +08:00 |
|
Wang Nan
|
414592b8ea
|
Merge pull request #205 from cocos-creator/v1.1
merge V1.1
|
2016-07-12 14:03:48 +08:00 |
|
zhangbin
|
b397ac686e
|
Solve the errors in simulator project.
|
2016-07-12 14:00:09 +08:00 |
|
Nan Wang
|
51494a9aaf
|
Merge branch 'v1.1' of github.com:nantas/cocos2d-x-lite into v1.1
|
2016-07-12 13:55:45 +08:00 |
|
Nan Wang
|
e33debc4fd
|
separate dll copy task from pubic tasks
|
2016-07-12 13:55:18 +08:00 |
|
yanli.huang
|
130351f7ff
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
|
2016-07-12 12:02:53 +08:00 |
|
zhangbin
|
e9d4652c31
|
Add TiledMap for the HEX orientation maps.
|
2016-07-11 17:53:52 +08:00 |
|
Wang Nan
|
8381c080f1
|
Update project.properties
revert android target setting
|
2016-07-08 18:43:22 +08:00 |
|
Nan Wang
|
57ae3d1eb4
|
fix archiving extra prebuilt_mk folder into the package
|
2016-07-08 18:06:25 +08:00 |
|
Wang Nan
|
9b33aa98be
|
Merge pull request #200 from pandamicro/v1.1
Fix jsb.loadRemoteImg
|
2016-07-08 13:44:37 +08:00 |
|
pandamicro
|
2c5c37a610
|
Fix jsb.loadRemoteImg
|
2016-07-07 10:35:42 +08:00 |
|
Wang Nan
|
4efc6045a1
|
Merge pull request #198 from 2youyou2/errorHandler
fixed errorHandler
|
2016-07-06 16:26:51 +08:00 |
|
knoxHuang
|
4da24170b6
|
fix used spine.getCurrent cause the emulator to crash for #fireball/issues/3546
|
2016-07-06 16:17:49 +08:00 |
|
2youyouo2
|
0f966efbb0
|
fixed errorHandler
|
2016-07-06 14:36:03 +08:00 |
|
Wang Nan
|
c51554f7d4
|
Merge pull request #196 from 2youyou2/develop
fixed windows graphics
|
2016-07-06 14:34:52 +08:00 |
|
2youyouo2
|
10111b0cd4
|
fixed errorHandler
|
2016-07-06 14:21:49 +08:00 |
|
2youyouo2
|
6ec312d892
|
Merge branch 'develop' of github.com:2youyouo2/cocos2d-x-lite into develop
|
2016-07-06 14:02:27 +08:00 |
|
2youyouo2
|
bc038a61a3
|
fixed graphics roundRect api
|
2016-07-06 14:02:10 +08:00 |
|
2youyou2
|
c0dee4ed6e
|
fixed windows graphics
|
2016-07-06 09:36:55 +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 |
|
knoxHuang
|
07f1344db5
|
fix JSB Label does not support Boolean value. for #fireball/issues/3519
|
2016-07-04 18:27:24 +08:00 |
|
knoxHuang
|
ce4ea88297
|
add isScheduled for JSB #fireball/issues/3510
|
2016-07-04 18:16:48 +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 |
|
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 |
|
Nan Wang
|
9ae1360be9
|
update info.plist to add app transport security setting to allow http connection
|
2016-06-29 15:39:50 +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 |
|
knoxHuang
|
ca32680d27
|
fix Follow native error, for #fireball/issues/3409
|
2016-06-29 10:18:58 +08:00 |
|
knoxHuang
|
06bf021143
|
merge code for #/fireball/issues/2787
|
2016-06-28 14:22:22 +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 |
|
knoxHuang
|
4352ca56d6
|
fix cc.Follow code error for jsb_create_apis
|
2016-06-24 17:00:19 +08:00 |
|