zilongshanren
|
1a6e0ed7c1
|
sync changes from cocos2d-x v3
|
2017-05-10 17:22:02 +08:00 |
|
2youyou2
|
30af1a3736
|
update submodule
|
2017-05-10 13:57:00 +08:00 |
|
2youyou2
|
8a60346382
|
fixed bzero error
|
2017-05-10 13:56:23 +08:00 |
|
zilongshanren
|
475a176cd3
|
fix cursor issue
|
2017-05-09 03:09:26 -07:00 |
|
zilongshanren
|
143a82c7c0
|
fix the skeleton of editbox
|
2017-05-08 03:04:47 -07:00 |
|
zilongshanren
|
27ccd45770
|
try to use CEdit
|
2017-05-08 00:53:15 -07:00 |
|
CocosRobot
|
f038cfc2c6
|
[ci skip][AUTO]: updating jsbinding automatically
|
2017-05-08 07:42:35 +00:00 |
|
knoxHuang
|
9319dd7002
|
fix DeviceMotion bug for fireball/issues/5679
|
2017-05-08 15:32:40 +08:00 |
|
zilongshanren
|
479475b06c
|
create editbox on top of cocos view
|
2017-05-07 23:44:55 -07:00 |
|
zilongshanren
|
f4e61963da
|
make win32 editbox inherit from UIEditBoxImpl-common
|
2017-05-05 02:12:28 -07:00 |
|
zilongshanren
|
fd72938523
|
fix editbox textchagned event call times on Android
|
2017-05-05 11:16:48 +08:00 |
|
CocosRobot
|
b1bef61180
|
[ci skip][AUTO]: updating jsbinding automatically
|
2017-05-04 15:39:07 +00:00 |
|
pandamicro
|
bbec08eebb
|
Merge pull request #612 from pandamicro/am
Enhance functionalities of AssetsManager
|
2017-05-04 23:32:52 +08:00 |
|
pandamicro
|
e37196f41d
|
Fix issues with AssetsManager new features
|
2017-05-04 23:32:08 +08:00 |
|
Wang Nan
|
8203f97750
|
Merge pull request #616 from zilongshanren/fix-bmfont-memory-leak
fix memory leaks of bmfont
|
2017-05-04 18:37:53 +08:00 |
|
zilongshanren
|
a556ac1891
|
add inline video play for webview
|
2017-05-04 17:46:28 +08:00 |
|
zilongshanren
|
fe89204f6b
|
fix memory leaks of bmfont
|
2017-05-04 15:40:52 +08:00 |
|
Wang Nan
|
515bfe1d96
|
Merge pull request #614 from CocosRobot/update_cocosfiles_1493869430
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-05-04 11:44:19 +08:00 |
|
CocosRobot
|
51c5239bf2
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-05-04 03:43:50 +00:00 |
|
Wang Nan
|
3be9092635
|
Merge pull request #611 from zilongshanren/fix-editbox-duplicated-text
fix editbox duplicated text when change text in textChange callback
|
2017-05-04 11:38:17 +08:00 |
|
Wang Nan
|
496eedb1b0
|
Merge pull request #613 from 2youyou2/android
fixed android studio compile error
|
2017-05-04 11:38:03 +08:00 |
|
2youyouo2
|
166923e174
|
update submodule
|
2017-05-04 11:01:58 +08:00 |
|
2youyouo2
|
992bb2724c
|
fixed .so not compile to apk
|
2017-05-04 11:01:45 +08:00 |
|
zilongshanren
|
36e3e8a455
|
revert native placeholder change
|
2017-05-03 16:51:58 +08:00 |
|
zilongshanren
|
25bd7d7923
|
fix editbox duplicated text when change text in textChange callback
|
2017-05-03 15:03:21 +08:00 |
|
Wang Nan
|
07f6def08e
|
Merge pull request #610 from CocosRobot/update_js_bindings_1493704596
[ci skip][AUTO]: updating jsbinding automatically
|
2017-05-02 14:02:12 +08:00 |
|
Wang Nan
|
2ea1bd86a3
|
Merge pull request #609 from 2youyou2/android
set ndk_out for android-studio project
|
2017-05-02 14:02:02 +08:00 |
|
CocosRobot
|
b6f9f79d7f
|
[ci skip][AUTO]: updating jsbinding automatically
|
2017-05-02 05:58:48 +00:00 |
|
2youyouo2
|
524c511ca5
|
set ndk_out for android-studio project
|
2017-05-02 13:54:49 +08:00 |
|
Wang Nan
|
5635ab2957
|
Merge pull request #607 from zilongshanren/syncCodeFromCocosV3_path1
Sync code from cocos v3
|
2017-05-02 13:53:10 +08:00 |
|
2youyouo2
|
d7b3bc096b
|
fixed windows commands char length too long
|
2017-04-27 17:31:32 +08:00 |
|
zilongshanren
|
080496b486
|
update link template
|
2017-04-26 17:41:34 +08:00 |
|
zilongshanren
|
a458a96cb9
|
fix default template
|
2017-04-26 17:35:15 +08:00 |
|
zilongshanren
|
5c25d799d3
|
update binary template
|
2017-04-26 17:24:44 +08:00 |
|
Wang Nan
|
0027ffbcc6
|
Merge pull request #606 from 2youyou2/physics
add SetPosition and GetPosition for b2CircleShape
|
2017-04-26 17:24:29 +08:00 |
|
zilongshanren
|
47a97df552
|
fix: validates director before layout in iOS
|
2017-04-26 15:05:57 +08:00 |
|
2youyouo2
|
f6a24f2903
|
add SetPosition and GetPosition for b2CircleShape
|
2017-04-26 14:48:53 +08:00 |
|
pandamicro
|
50839c4be1
|
Supports create manifest and manually load local and remote manifest
|
2017-04-26 00:00:02 +08:00 |
|
pandamicro
|
505845813c
|
Support setting version compare handle in AssetsManager’s constructor
|
2017-04-25 23:59:13 +08:00 |
|
CocosRobot
|
fde3f87625
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-04-25 07:53:37 +00:00 |
|
Wang Nan
|
875e646809
|
Merge pull request #604 from 2youyou2/android-studio
add simulator android-studio project
|
2017-04-25 15:47:03 +08:00 |
|
2youyouo2
|
bc068518ef
|
add simulator android-studio project
|
2017-04-25 15:09:02 +08:00 |
|
pandamicro
|
cea2e9a012
|
Add more progression info to EventAssetsManager
|
2017-04-25 14:45:03 +08:00 |
|
CocosRobot
|
d108510512
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-04-25 02:36:26 +00:00 |
|
Nan Wang
|
7c8564e6bd
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
|
2017-04-25 10:29:29 +08:00 |
|
Wang Nan
|
77c4b7b9be
|
Merge pull request #600 from dumganhar/fix/sync-v3
Sync with cocos2d-x v3 branch ddb4dc8 commit.
|
2017-04-25 10:28:55 +08:00 |
|
Nan Wang
|
44ae174f8e
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
|
2017-04-25 10:13:45 +08:00 |
|
Nan Wang
|
97ccfb6f4c
|
update console repo, update external tag to 27
|
2017-04-25 10:13:06 +08:00 |
|
Wang Nan
|
799fb4f19c
|
Merge pull request #594 from 2youyou2/android-studio
Android studio
|
2017-04-25 10:08:28 +08:00 |
|
子龙山人
|
e468cd1987
|
Merge pull request #595 from zilongshanren/fix-ios-label-shrink-effect
fix ios label shrink bug
|
2017-04-24 17:07:02 +08:00 |
|