zilongshanren
|
a907770685
|
fix bmfont setColor asset error
|
2016-11-16 11:40:37 +08:00 |
|
子龙山人
|
d57727efaa
|
Merge pull request #400 from zilongshanren/fix-bmfont-assert-error
fix bmfont setColor asset error
|
2016-11-15 19:38:06 -08:00 |
|
zilongshanren
|
c4bb1764ca
|
fix bmfont setColor asset error
|
2016-11-16 11:37:28 +08:00 |
|
Nan Wang
|
8c70c99b27
|
Merge branch 'v1.3' of github.com:cocos-creator/cocos2d-x-lite into v1.3
|
2016-11-15 18:10:24 +08:00 |
|
Nan Wang
|
facf9ebf2d
|
update version to 1.3.2-lite
|
2016-11-15 18:10:03 +08:00 |
|
zilongshanren
|
2789d8f6fe
|
fix editbox can't input on mac
|
2016-11-14 18:08:13 +08:00 |
|
zilongshanren
|
323087aadb
|
fix editbox can't input on mac
|
2016-11-14 18:06:37 +08:00 |
|
子龙山人
|
b5652d905e
|
Merge pull request #396 from zilongshanren/upgrade-external-to-17
update external to 17
|
2016-11-14 01:49:42 -08:00 |
|
zilongshanren
|
fe50b4a450
|
update external to 17
|
2016-11-14 17:48:45 +08:00 |
|
子龙山人
|
2a773115b7
|
Merge pull request #395 from cocos-creator/v1.3
merge V1.3 back to develop
|
2016-11-11 00:45:37 -08:00 |
|
子龙山人
|
e669404cf7
|
Update before-install.sh
|
2016-11-11 16:38:03 +08:00 |
|
zilongshanren
|
17c350e300
|
fix bindings
|
2016-11-11 16:30:03 +08:00 |
|
zilongshanren
|
39aafdefb5
|
improve travis build script
|
2016-11-11 16:16:41 +08:00 |
|
子龙山人
|
b6acb98c2c
|
Update run-script.sh
|
2016-11-11 16:06:58 +08:00 |
|
CocosRobot
|
a7d4a50eed
|
[ci skip][AUTO]: updating jsbinding automatically
|
2016-11-11 08:02:35 +00:00 |
|
子龙山人
|
4108ec026e
|
Update .travis.yml
|
2016-11-11 15:55:52 +08:00 |
|
子龙山人
|
c3170fdf7a
|
Update before-install.sh
|
2016-11-11 15:52:08 +08:00 |
|
子龙山人
|
94046a1978
|
Update .travis.yml
|
2016-11-11 15:43:38 +08:00 |
|
zilongshanren
|
1578d03606
|
drop osx, only use linux
|
2016-11-11 15:30:03 +08:00 |
|
子龙山人
|
0f7e30e7b0
|
Update before-install.sh
|
2016-11-11 15:17:41 +08:00 |
|
子龙山人
|
7a36d35d02
|
Update before-install.sh
|
2016-11-11 15:10:11 +08:00 |
|
子龙山人
|
fac04a50bb
|
Update before-install.sh
|
2016-11-11 15:02:35 +08:00 |
|
子龙山人
|
9ca135f631
|
Update before-install.sh
|
2016-11-11 14:57:38 +08:00 |
|
Wang Nan
|
42cbe526eb
|
Merge pull request #383 from natural-law/improve-dragonbones-bindings
Solve the crash when initializing DragonBones component in code.
|
2016-11-11 14:55:05 +08:00 |
|
zilongshanren
|
30babe4563
|
remove unneed code for osx
|
2016-11-11 14:45:52 +08:00 |
|
zilongshanren
|
acb08aaebe
|
try to fix osx python build
|
2016-11-11 14:38:20 +08:00 |
|
zilongshanren
|
e9365ba87a
|
install pyyaml and cheetah
|
2016-11-11 14:30:00 +08:00 |
|
zilongshanren
|
9b5382eaa6
|
fix label outline color
|
2016-11-11 14:12:44 +08:00 |
|
zhangbin
|
a70c941f59
|
Update the icon of Android Studio project in templates.
|
2016-11-11 11:46:31 +08:00 |
|
zhangbin
|
11e86ac9c5
|
Solve the crash when initializing DragonBones component in code.
|
2016-11-10 15:51:10 +08:00 |
|
zhangbin
|
b36a4cf35f
|
Solve the error calculation of the image object's position.
|
2016-11-09 15:07:22 +08:00 |
|
zilongshanren
|
d3149a7ec2
|
fix viewport size change after capture screen
|
2016-11-08 16:02:01 +08:00 |
|
zilongshanren
|
79d935c61b
|
fix viewport size change after capture screen
|
2016-11-08 15:58:41 +08:00 |
|
Nan Wang
|
4572d56594
|
fix travis branch for develop
|
2016-11-07 15:23:36 +08:00 |
|
Nan Wang
|
9a934c8b46
|
Merge branch 'v1.3' of github.com:cocos-creator/cocos2d-x-lite into develop
|
2016-11-07 15:21:33 +08:00 |
|
zhangbin
|
4b2e32af7f
|
Generate multi app-abi libraries for android in gulp gen-libs.
|
2016-11-07 13:38:51 +08:00 |
|
CocosRobot
|
4774895ce0
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-11-04 06:32:53 +00:00 |
|
Nan Wang
|
4c387a184e
|
added update-version workflow
|
2016-11-04 14:31:53 +08:00 |
|
pandamicro
|
721658116d
|
Merge pull request #373 from pandamicro/v1.3
Manually bind EventDispatcher::addCustomEventListener to avoid memory issue
|
2016-11-02 18:18:02 +08:00 |
|
pandamicro
|
ee8bb071c4
|
Manually bind EventDispatcher::addCustomEventListener to avoid memory issue
|
2016-11-02 18:14:52 +08:00 |
|
pandamicro
|
9990187a4c
|
Merge pull request #372 from pandamicro/v1.3
Manual bind EventListenerCustom::create to avoid memory issue
|
2016-11-02 12:13:37 +08:00 |
|
pandamicro
|
028d3c9f3c
|
Manual bind EventListenerCustom::create to avoid memory issue
|
2016-11-02 12:10:17 +08:00 |
|
pandamicro
|
44e8069ae1
|
Merge pull request #371 from DavidDeSimone/hh-help-fixv2
Fixing issue where JSScheduleTarget::dump will trigger a bad access
|
2016-11-02 11:42:15 +08:00 |
|
David DeSimone
|
473c5f1fae
|
Fixing issue where JSScheduleTarget::dump will trigger a bad access due to NULL pointer access.
|
2016-11-01 16:52:52 -07:00 |
|
子龙山人
|
f30200e87e
|
Merge pull request #370 from zilongshanren/fix-editbox-macos-sierra
fix editbox can't input on macos sierra
|
2016-11-01 07:51:28 -07:00 |
|
zilongshanren
|
b289d6010e
|
fix editbox sierra
|
2016-11-01 22:29:42 +08:00 |
|
pandamicro
|
1c9dd03112
|
Merge pull request #369 from pandamicro/v1.3
Update auto bindings manually
|
2016-11-01 22:11:56 +08:00 |
|
pandamicro
|
f1b3a9e24a
|
Update auto bindings manually
|
2016-11-01 22:08:29 +08:00 |
|
pandamicro
|
b96b64d218
|
Merge pull request #367 from DavidDeSimone/set-width-fix
Fixing improperly named variable in cc.LabelBMFont.
|
2016-11-01 21:43:24 +08:00 |
|
pandamicro
|
cf8539133b
|
Merge pull request #368 from pandamicro/v1.3
Manual bind EventListenerAcceleration::create to avoid memory issue
|
2016-11-01 21:42:19 +08:00 |
|