James Chen
|
5996fe0866
|
Don’t invoke simple audio engine stuff in AppDelegate. And send missing game_on_hide & game_on_show event for Appdelegate in Simulator.
|
2016-11-28 11:51:37 +08:00 |
|
Wang Nan
|
c98eb67f19
|
Merge pull request #410 from cocos-creator/v1.3
merge V1.3
|
2016-11-25 11:32:55 +08:00 |
|
zhangbin
|
9ccb58a3f2
|
Add binding field DragonBonesData::name.
|
2016-11-22 10:27:25 +08:00 |
|
zhangbin
|
0dc977649f
|
Update submodule cocos2d-console.
Changes: Add option '--ap' for command gen-libs.
|
2016-11-16 14:17:46 +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 |
|
子龙山人
|
c3170fdf7a
|
Update before-install.sh
|
2016-11-11 15:52:08 +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 |
|
zhangbin
|
11e86ac9c5
|
Solve the crash when initializing DragonBones component in code.
|
2016-11-10 15:51:10 +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 |
|
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
|
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 |
|
pandamicro
|
8d90e127a3
|
Manual bind EventListenerAcceleration::create to avoid memory issue
|
2016-11-01 21:38:27 +08:00 |
|
zhangbin
|
57f79e9be9
|
Update the submodule cocos2d-console.
Changed : Improve `cocos run -p iOS` for support XCode 8.
|
2016-10-27 15:34:29 +08:00 |
|
子龙山人
|
cc1e708495
|
Update before-install.sh
|
2016-10-24 14:04:31 +08:00 |
|
子龙山人
|
7eb05b1158
|
Update before-install.sh
|
2016-10-24 13:55:32 +08:00 |
|
子龙山人
|
639707ebe1
|
Merge pull request #361 from zilongshanren/fix-travis-build
fix yaml issue
|
2016-10-23 22:38:12 -07:00 |
|
zilongshanren
|
e387ab35cd
|
fix yaml issue
|
2016-10-24 13:35:43 +08:00 |
|
pandamicro
|
1ad947925b
|
Unify function name of Texture2D::releaseTexture
|
2016-10-24 02:49:18 +08:00 |
|
zhangbin
|
3e295176ff
|
Update submodule cocos2d-console.
|
2016-10-11 18:04:33 +08:00 |
|
zhangbin
|
1e8ea4ee58
|
Solve the error on platform win32.
|
2016-09-27 15:14:12 +08:00 |
|
zhangbin
|
976a4e75e1
|
Update submodule cocos2d-console.
|
2016-09-22 18:22:06 +08:00 |
|
zhangbin
|
ab293df6bd
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into dragonbones
# Conflicts:
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
|
2016-09-22 17:42:48 +08:00 |
|
zhangbin
|
c981f0e488
|
Improve the implementation of dragonbones.
|
2016-09-22 17:37:35 +08:00 |
|
zhangbin
|
eb4ce7d13a
|
Solve the errors in jsbindings.
|
2016-09-21 15:23:35 +08:00 |
|
zhangbin
|
070bada185
|
Solve the errors in js bindings.
|
2016-09-19 17:44:12 +08:00 |
|
zhangbin
|
119fec9efe
|
Merge branch 'develop' into dragonbones
# Conflicts:
# external/config.json
|
2016-09-13 16:29:59 +08:00 |
|
zhangbin
|
cabcc205e9
|
Improve the implementation of showing Object Group in TiledMap.
|
2016-09-13 16:11:19 +08:00 |
|
zhangbin
|
bbae20da07
|
Add config for dragonbones jsbinding.
|
2016-09-09 16:02:33 +08:00 |
|
pandamicro
|
f581b673eb
|
Fix Android compilation issues for simulator
|
2016-09-08 15:40:01 +08:00 |
|
zhangbin
|
ed591faa19
|
Merge branch 'develop' into dragonbones
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# external/config.json
|
2016-09-08 09:52:09 +08:00 |
|
Nan Wang
|
ef368ef409
|
merged v1.2
|
2016-09-07 18:47:59 +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 |
|