zilongshanren
|
0b658267be
|
fix textChange event
|
2016-09-05 17:01:38 +08:00 |
|
zilongshanren
|
b2c56ff88a
|
fix editbox issue
|
2016-09-05 16:48:45 +08:00 |
|
zilongshanren
|
fd1b18524b
|
fix iOS/Mac editbox issue
|
2016-09-05 16:04:51 +08:00 |
|
zilongshanren
|
c50da0fca5
|
use v1.2 editbox implementation
|
2016-09-05 15:40:22 +08:00 |
|
zilongshanren
|
7140dbb006
|
add webview https support
|
2016-09-05 13:58:10 +08:00 |
|
CocosRobot
|
91eef2d236
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-09-02 09:40:45 +00:00 |
|
zilongshanren
|
727ac643b4
|
fix Android compile and running issues
|
2016-09-02 17:38:31 +08:00 |
|
pandamicro
|
50b8fd39a4
|
Merge pull request #304 from pandamicro/develop
Upgrade external to v10 with chipmunk v7.0.1
|
2016-09-02 11:51:41 +08:00 |
|
pandamicro
|
f840ccee2f
|
Upgrade external to v10 with chipmunk v7.0.1
|
2016-09-02 11:51:03 +08:00 |
|
zhangbin
|
4acadb9595
|
Update the version of rapid json.
|
2016-09-02 11:40:59 +08:00 |
|
pandamicro
|
473325bc1e
|
Merge pull request #302 from pandamicro/develop
Fix mac simulator
|
2016-09-02 10:59:07 +08:00 |
|
pandamicro
|
651551055a
|
Fix mac simulator
|
2016-09-02 10:57:21 +08:00 |
|
CocosRobot
|
f32aa372a5
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-09-02 01:52:39 +00:00 |
|
pandamicro
|
5be074620d
|
Merge pull request #300 from pandamicro/develop
Update external ref
|
2016-09-02 09:51:44 +08:00 |
|
pandamicro
|
a89b8a6f80
|
Update external ref
|
2016-09-02 09:48:20 +08:00 |
|
CocosRobot
|
f664fe1047
|
[ci skip][AUTO]: updating jsbinding automatically
|
2016-09-01 10:48:09 +00:00 |
|
子龙山人
|
fe914ed20f
|
Merge pull request #298 from zilongshanren/fix-travis-bindings-generator
fix jsb travis script
|
2016-09-01 03:40:21 -07:00 |
|
zilongshanren
|
1ecec7bdd8
|
fix jsb travis script
|
2016-09-01 18:39:49 +08:00 |
|
子龙山人
|
a941908a45
|
Merge pull request #297 from zilongshanren/fix-travis-bindings-generator
fix travis binidngs generator
|
2016-09-01 03:22:22 -07:00 |
|
zilongshanren
|
2e00a5158c
|
fix travis binidngs generator
|
2016-09-01 18:21:49 +08:00 |
|
CocosRobot
|
57a0e11044
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-09-01 07:27:33 +00:00 |
|
pandamicro
|
86ae89f85f
|
Fix win32 compilation issues
|
2016-09-01 10:38:54 +08:00 |
|
pandamicro
|
fcbcce65d8
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
cocos/platform/android/CCDevice-android.cpp
cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java
cocos/platform/ios/CCDevice-ios.mm
cocos/platform/mac/CCDevice-mac.mm
cocos/platform/win32/CCDevice-win32.cpp
|
2016-08-31 14:39:08 +08:00 |
|
子龙山人
|
b2b9262686
|
Merge pull request #293 from zilongshanren/improve-systemfont-underline
improve system font underline
|
2016-08-30 20:46:33 -07:00 |
|
zilongshanren
|
299280cbe0
|
fix windows systemfont bold
|
2016-08-31 11:44:04 -07:00 |
|
zilongshanren
|
ae35fc46f5
|
improve system font underline
|
2016-08-31 10:46:14 +08:00 |
|
zhangbin
|
951b978335
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into dragonbones
|
2016-08-30 18:01:14 +08:00 |
|
natural-law
|
a240bef9bc
|
Add dragonbones project for win32.
|
2016-08-30 15:21:48 +08:00 |
|
zilongshanren
|
81393c3ef4
|
add android bold support
|
2016-08-30 15:16:10 +08:00 |
|
zilongshanren
|
5134ca1851
|
add bold support for iOS
|
2016-08-30 15:03:20 +08:00 |
|
zilongshanren
|
96d066204d
|
add bold support for mac
|
2016-08-30 14:41:59 +08:00 |
|
zhangbin
|
1f9d49dbfe
|
Update the project files for dragon bones.
|
2016-08-30 14:22:50 +08:00 |
|
zhangbin
|
6c92d8daaa
|
Solve the error when compile project with NDK r10.
|
2016-08-30 14:08:27 +08:00 |
|
Wang Nan
|
0d239ca2e8
|
Merge pull request #290 from hylthink/v1.2
update cocos2d-console commit id :fix cocos package can't update
|
2016-08-30 14:04:00 +08:00 |
|
yanli.huang
|
20e981f64e
|
update cocos2d-console commit id :fix cocos package can't update
|
2016-08-30 13:59:45 +08:00 |
|
zhangbin
|
ae0e94825b
|
Solve the error of using camera in Dragon Bones.
|
2016-08-30 11:49:23 +08:00 |
|
zhangbin
|
36bdf9aac7
|
Update the version of rapid json.
|
2016-08-30 11:48:57 +08:00 |
|
zhangbin
|
66289d5cf5
|
Add source code for dragon bones runtime
|
2016-08-29 18:39:30 +08:00 |
|
CocosRobot
|
de6dd6d450
|
[ci skip][AUTO]: updating jsbinding automatically
|
2016-08-29 09:10:20 +00:00 |
|
Wang Nan
|
51ec64b6b4
|
Merge pull request #288 from knoxHuang/v1.2
add enableAntiAlias for Native for fireball/issues/2836
|
2016-08-29 17:02:22 +08:00 |
|
knoxHuang
|
b73e97e403
|
add enableAntiAlias for Native for fireball/issues/2836
|
2016-08-29 16:33:52 +08:00 |
|
zilongshanren
|
c216e504f1
|
fix label shrink crash issue
|
2016-08-29 15:30:12 +08:00 |
|
zilongshanren
|
a6c7155922
|
fix label shrink crash issue
|
2016-08-29 11:12:01 +08:00 |
|
pandamicro
|
f4e9b225db
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
|
2016-08-29 09:46:41 +08:00 |
|
Wang Nan
|
5023802926
|
Merge pull request #285 from CocosRobot/update_js_bindings_1472214121
[ci skip][AUTO]: updating jsbinding automatically
|
2016-08-27 21:19:52 +08:00 |
|
pandamicro
|
66a38aa3a4
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
cocos/2d/CCFastTMXTiledMap.cpp
|
2016-08-26 20:48:38 +08:00 |
|
CocosRobot
|
09e3a5ef3a
|
[ci skip][AUTO]: updating jsbinding automatically
|
2016-08-26 12:26:50 +00:00 |
|
Wang Nan
|
140425207a
|
Merge pull request #284 from CocosRobot/update_cocosfiles_1472213744
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-08-26 20:16:18 +08:00 |
|
CocosRobot
|
71fe83284b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-08-26 12:15:44 +00:00 |
|
Wang Nan
|
789320bbe3
|
Merge pull request #269 from natural-law/issue3120
Support show the object group in TiledMap.
|
2016-08-26 20:15:22 +08:00 |
|