Commit Graph

158 Commits

Author SHA1 Message Date
zhangbin b8a9bb2a74 Update the reference of submodule cocos2d-console.
Stat the version of engine but not the version of console.
2017-02-24 16:04:12 +08:00
Wang Nan d7eb5fb1b9 Merge pull request #531 from natural-law/issue5202
Modify the callback argument of spine event listener.
2017-02-10 17:34:27 +08:00
zhangbin d27bfa164e Modify the callback argument of spine event listener.
Change the argument trackIndex to trackEntry.
2017-02-10 17:16:25 +08:00
pandamicro 9ae7ed8d38 Enhance pointer type conversion 2017-02-10 16:20:24 +08:00
pandamicro 714c6b2338 Add network config to genbindings 2017-01-16 14:12:50 +08:00
pandamicro bc915ddc44 Add Downloader bindings 2017-01-16 13:57:10 +08:00
pandamicro 40d600f1e2 Fix compilation issue when lambda function has return value 2017-01-13 15:06:39 +08:00
zhangbin 9b3c2f9098 Update the reference of submodule cocos2d-console.
Changes: Solve the error when generating prebuilt mk.
2017-01-11 11:24:47 +08:00
pandamicro b55c5aa157 Merge pull request #486 from pandamicro/v1.4
Fix ManifestAsset conversions
2017-01-10 16:13:54 +08:00
pandamicro 8013021e65 Fix ManifestAsset conversions 2017-01-10 16:11:01 +08:00
Wang Nan da44033c9c Merge pull request #481 from natural-law/dragonbones-binding
Solve the error bindings of display related interfaces in dragonBones::Slot.
2017-01-10 15:42:48 +08:00
zhangbin 49aa1ef894 Solve the error bindings of display related interface in dragonBones::Slot. 2017-01-10 15:19:47 +08:00
pandamicro 171ad4e21a Add Manifest::Asset conversion 2017-01-09 15:48:30 +08:00
pandamicro 58bf143401 Improve memory related API usage in JSFunctionWrapper::invoke 2017-01-06 17:00:47 +08:00
Wang Nan 18ce5acc87 Merge pull request #468 from natural-law/issue5036
Update the Spine runtime to version 3.5.35.
2017-01-05 14:42:18 +08:00
zhangbin 34b5595d3a Update the Spine runtime to version 3.5.35. 2017-01-05 14:36:52 +08:00
zhangbin 900cd5361e Bind the field timeScale of dragonBones::Animation. 2017-01-04 11:18:15 +08:00
zilongshanren c3896621c8 add show FPS on mac simulator 2016-12-22 16:12:56 +08:00
子龙山人 caebd2cfe9 Merge pull request #454 from knoxHuang/develop
add Show FPS for simulator #fireball/issues/4944
2016-12-22 15:18:02 +08:00
knoxHuang 4ee224b05a add Show FPS for simulator #fireball/issues/4944 2016-12-22 15:12:27 +08:00
zhangbin 0b0bc1121c Update the runtime version of DragonBones. 2016-12-20 11:19:07 +08:00
Wang Nan 821e45c3cb Merge pull request #432 from cocos-creator/v1.3
merge V1.3
2016-12-09 14:08:38 +08:00
Nan Wang 3b50b32187 update bindings generator 2016-12-09 13:59:21 +08:00
Wang Nan 4499b5fd5c Merge pull request #426 from natural-law/issue4863
Output more information of jscompile command as default.
2016-12-06 16:50:13 +08:00
zhangbin 63d39f4d14 Output more information of jscompile command as default. 2016-12-06 16:26:32 +08:00
Nan Wang 384cfa8b6b fix CocosDenshion namespace compile error 2016-12-01 13:45:51 +08:00
Nan Wang 9ff81c656b fix CocosDenshion namespace compile error 2016-12-01 09:58:33 +08:00
Wang Nan 6a85ff24a1 Merge pull request #420 from cocos-creator/v1.3
merge V1.3
2016-11-29 10:10:54 +08:00
zhangbin 8ae2cda989 Support using specified python by environment 'COCOS_PYTHON_HOME'. 2016-11-28 15:52:30 +08:00
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