Commit Graph

866 Commits

Author SHA1 Message Date
pandamicro dc339ac39d Merge pull request #353 from pandamicro/v1.3
Fix compilation issue when COCOS_DEBUG = 2
2016-10-21 10:50:16 +08:00
pandamicro 0ef4b39235 Fix compilation issue when COCOS_DEBUG = 2 2016-10-21 10:34:00 +08:00
pandamicro 1aa0369e32 Merge pull request #352 from knoxHuang/v1.3
fix Follow bug for fireball/issues/4486
2016-10-20 17:22:40 +08:00
knoxHuang 576362d28b fix Follow bug for fireball/issues/4486 2016-10-20 17:18:55 +08:00
pandamicro b7ec01f2a2 Merge pull request #351 from pandamicro/v1.3
Fix ScriptingCore::evalString
2016-10-20 14:14:41 +08:00
Wang Nan 7ca8011eeb Merge pull request #349 from pandamicro/v1.3
Add Webp in native
2016-10-20 13:47:31 +08:00
pandamicro eedacaa57b Fix ScriptingCore::evalString 2016-10-20 11:35:14 +08:00
pandamicro 6240137229 Merge pull request #1 from zilongshanren/panda-v1.3
add webp library
2016-10-20 11:21:48 +08:00
zilongshanren 2ceff34668 add webp library 2016-10-20 11:18:57 -07:00
Wang Nan 657707786d Merge pull request #350 from hylthink/v1.3
cancel annotation init function
2016-10-20 09:41:56 +08:00
yanli.huang 7b5ce594e5 cancel annotation init function 2016-10-19 18:46:22 +08:00
pandamicro f88c6fa3cc Support webp in native 2016-10-19 18:36:35 +08:00
pandamicro 9b9845e02c Improve ScheduleWrapper function call 2016-10-19 16:27:08 +08:00
Wang Nan 9debe22d14 Merge pull request #348 from zilongshanren/fix-android-video-total-time
add ready to play event
2016-10-17 14:58:05 +08:00
zilongshanren be642ec1af add ready to play event 2016-10-17 11:59:38 +08:00
子龙山人 c4eb9c42ec Merge pull request #347 from zilongshanren/fix-android-video-total-time
Fix android video total time
2016-10-14 03:32:31 -07:00
zilongshanren 65a677e51a improve VideoPlayer 2016-10-14 18:16:40 +08:00
Wang Nan 158d8510ba Merge pull request #346 from natural-law/issue4335
Add method insertChildBefore for Creator issue 4335.
2016-10-14 14:31:51 +08:00
zilongshanren 58be2ff238 add metaloaded and click event 2016-10-14 11:37:31 +08:00
zhangbin 14876aee45 Remove spaces. 2016-10-14 10:39:02 +08:00
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