Commit Graph

846 Commits

Author SHA1 Message Date
zhangbin e769890ddc Add method insertChildBefore for Creator issue 4335. 2016-10-13 18:37:04 +08:00
子龙山人 e38edba130 Merge pull request #345 from zilongshanren/cherry-pick-bmfont-bomheader
add bmfont BOM header support
2016-10-12 22:44:38 -07:00
zilongshanren 07d43683e2 add bmfont BOM header support 2016-10-13 13:43:34 +08:00
Wang Nan de89c7e001 Merge pull request #344 from hylthink/v1.3
fix update libPluginProtocol.jar 2.2.3
2016-10-12 13:53:47 +08:00
yanli.huang f2c3fda64a fix update libPluginProtocol.jar 2.2.3 2016-10-12 11:25:23 +08:00
Wang Nan db206cc654 Merge pull request #342 from natural-law/v1.3
Update submodule cocos2d-console.
2016-10-12 10:52:47 +08:00
Wang Nan ddc8dd70fa Merge pull request #343 from hylthink/v1.3
update libPluginProtocol.jar 2.2.3
2016-10-12 10:50:17 +08:00
yanli.huang 67f27618f7 update libPluginProtocol.jar 2.2.3 2016-10-12 10:45:09 +08:00
zhangbin 3e295176ff Update submodule cocos2d-console. 2016-10-11 18:04:33 +08:00
Wang Nan 217e29a42a Merge pull request #340 from natural-law/issue4346
Solve the error application name of Android Studio project.
2016-10-11 12:11:27 +08:00
zhangbin ddda30122d Solve the error application name of Android Studio project. 2016-10-10 13:44:38 +08:00
Wang Nan c41a181be9 Merge pull request #339 from natural-law/v1.3
Fix the error in TiledMap.
2016-10-08 17:28:59 +08:00
zhangbin 0bc2ae3482 Fix the error in TiledMap. 2016-10-08 17:21:35 +08:00
Jare Guo a7a662c62f Merge pull request #338 from natural-law/issue4283
Solve the error logic when re-init the TiledMap with a new resource.
2016-09-30 11:11:51 +08:00
zhangbin b47a800400 Solve the error logic when re-init the TiledMap with a new resource. 2016-09-30 09:44:52 +08:00
pandamicro 5c4c0c9b26 Merge pull request #337 from natural-law/issue4265
Solve the errors on platform win32.
2016-09-28 11:33:49 +08:00
zhangbin ad9593f9b6 Solve the error in binary template. 2016-09-27 16:17:11 +08:00
zhangbin 1e8ea4ee58 Solve the error on platform win32. 2016-09-27 15:14:12 +08:00
Wang Nan 523749faa3 Merge pull request #336 from 2youyou2/android-studio
support binary android-studio
2016-09-23 17:07:05 +08:00
2youyouo2 ba0c01341c support binary android-studio 2016-09-23 16:00:17 +08:00
Wang Nan 5cb3359906 Merge pull request #334 from natural-law/issue4238
Solve the cracks in TiledMap.
2016-09-23 13:43:58 +08:00
Wang Nan a3f0e38d22 Merge pull request #335 from hylthink/develop
fix built-in android project  compiled failed
2016-09-23 13:43:27 +08:00
yanli.huang 19bf2d5ee5 fix built-in android project compiled failed 2016-09-23 12:04:24 +08:00
zhangbin e4d79401d9 Solve the cracks in TiledMap. 2016-09-23 11:26:41 +08:00
Wang Nan b681feee2a Merge pull request #333 from CocosRobot/update_cocosfiles_1474540331
[AUTO][ci skip]: updating cocos2dx_files.json
2016-09-23 08:46:12 +08:00
CocosRobot b7bf21810d [AUTO][ci skip]: updating cocos2dx_files.json 2016-09-22 10:32:11 +00:00
Wang Nan e40a442915 Merge pull request #332 from natural-law/dragonbones
Support DragonBones in native.
2016-09-22 18:31:01 +08:00
zhangbin 976a4e75e1 Update submodule cocos2d-console. 2016-09-22 18:22:06 +08:00
natural-law f37c9bd0c7 Update the win32 project config. 2016-09-22 18:20:17 +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 cd19cef93a Update the jsbindings. 2016-09-22 17:39:08 +08:00
zhangbin c981f0e488 Improve the implementation of dragonbones. 2016-09-22 17:37:35 +08:00
Wang Nan 3caf5834ba Merge pull request #331 from zilongshanren/fix-ios-label-shrink-issue
fix ios label shrink issue
2016-09-22 15:06:09 +08:00
zilongshanren 8ec54e67c5 fix ios label shrink issue 2016-09-22 14:51:09 +08:00
Wang Nan a8cea0986b Merge pull request #328 from 2youyou2/graphics
fixed graphics crash when line cap is round
2016-09-22 14:12:10 +08:00
zhangbin eb4ce7d13a Solve the errors in jsbindings. 2016-09-21 15:23:35 +08:00
Wang Nan 8ea31273a1 Merge pull request #327 from hylthink/develop
update AnySDK 2.2.3
2016-09-20 17:14:02 +08:00
2youyouo2 1d856b396c fixed graphics crash when line cap is round 2016-09-20 17:00:18 +08:00
yanli.huang 6606b2ec23 update AnySDK 2.2.3 2016-09-20 16:37:23 +08:00
Wang Nan 5e4191a9f8 Merge pull request #326 from CocosRobot/update_js_bindings_1474266274
[ci skip][AUTO]: updating jsbinding automatically
2016-09-19 17:49:27 +08:00
zhangbin 070bada185 Solve the errors in js bindings. 2016-09-19 17:44:12 +08:00
CocosRobot fc6e13b9a2 [ci skip][AUTO]: updating jsbinding automatically 2016-09-19 06:29:37 +00:00
Wang Nan e9f31b88e0 Merge pull request #325 from natural-law/support-objectgroup
Improve the implementation of showing Object Group in TiledMap.
2016-09-19 14:21:14 +08:00
zhangbin 77d919dd1f Solve the reviewed issue. 2016-09-13 17:46:00 +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
子龙山人 a7fef7e46a Merge pull request #324 from zilongshanren/fix-label-italics-width
fix label italics width
2016-09-12 19:45:00 -07:00
zilongshanren c6aac0fd85 fix label italics width 2016-09-12 14:06:24 +08:00
Wang Nan 15e3c9d689 Merge pull request #323 from natural-law/support-objectgroup
Solve the error when compile project with NDK r10.
2016-09-12 10:44:26 +08:00
zhangbin 11ccbf28c4 Solve the error when compile project with NDK r10. 2016-09-12 10:43:07 +08:00