耀
|
73db3d61a6
|
zhao:1增加微课模型2增加视频模型3增加录屏4优化代码
|
4 jaren geleden |
耀
|
d7047b5d5e
|
Merge remote-tracking branch 'origin/zxy' into zyy
# Conflicts:
# XHWK.WKTool/ScreenRecordingToolbarWindow.xaml
|
4 jaren geleden |
耀
|
e5791061e4
|
zhao:增加增加暂停功能,多视频录制合并
|
4 jaren geleden |
zhangxueyang
|
af14813ae0
|
画笔颜色 粗细 样式。
|
4 jaren geleden |
耀
|
fbf9789e1b
|
Merge remote-tracking branch 'origin/zxy' into zyy
|
4 jaren geleden |
耀
|
a956170188
|
zhao:1增加录音方法,2增加视频格式
|
4 jaren geleden |
zhangxueyang
|
1355aaab46
|
BUG
|
4 jaren geleden |
耀
|
e9e374ff94
|
zhao:解决冲突
|
4 jaren geleden |
耀
|
6c2bc0ad3b
|
zhao:增加保存UI内容为图片 增加图片音频合成视频
|
4 jaren geleden |
zhangxueyang
|
f209fd72e3
|
UI
|
4 jaren geleden |
耀
|
db2ab6ead8
|
Merge remote-tracking branch 'origin/zxy' into zyy
|
4 jaren geleden |
zhangxueyang
|
162c736c9f
|
删除bin obj
|
4 jaren geleden |
zhangxueyang
|
f68ea88799
|
文件
|
4 jaren geleden |
耀
|
d7cf544f0c
|
Merge remote-tracking branch 'origin/zxy' into zyy
# Conflicts:
# Common/bin/Debug/Common.dll
# Common/bin/Debug/Common.pdb
# Common/obj/Debug/Common.csproj.CoreCompileInputs.cache
# Common/obj/Debug/Common.csproj.FileListAbsolute.txt
# Common/obj/Debug/Common.csprojAssemblyReference.cache
# Common/obj/Debug/Common.dll
# Common/obj/Debug/Common.pdb
# XHWK.Model/bin/Debug/XHWK.Model.dll
# XHWK.Model/bin/Debug/XHWK.Model.pdb
# XHWK.Model/obj/Debug/XHWK.Model.csproj.CoreCompileInputs.cache
# XHWK.Model/obj/Debug/XHWK.Model.csproj.FileListAbsolute.txt
# XHWK.Model/obj/Debug/XHWK.Model.csprojAssemblyReference.cache
# XHWK.Model/obj/Debug/XHWK.Model.dll
# XHWK.Model/obj/Debug/XHWK.Model.pdb
# XHWK.WKTool/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
# XHWK.WKTool/obj/Debug/MainWindow.g.i.cs
# XHWK.WKTool/obj/Debug/XHWK.WKTool.csproj.CoreCompileInputs.cache
# XHWK.WKTool/obj/Debug/XHWK.WKTool.csproj.FileListAbsolute.txt
# XHWK.WKTool/obj/Debug/XHWK.WKTool.csprojAssemblyReference.cache
# XHWK.WKTool/obj/Debug/XHWK.WKTool_MarkupCompile.cache
# XHWK.WKTool/obj/Debug/XHWK.WKTool_MarkupCompile.i.cache
# XHWK.WKTool/obj/Debug/XHWK.WKTool_MarkupCompile.lref
|
4 jaren geleden |
耀
|
6141326234
|
zhao:去除bin obj
|
4 jaren geleden |
zhangxueyang
|
de23c59911
|
主页面
|
4 jaren geleden |
耀
|
2c05040d9c
|
zy:
|
4 jaren geleden |
耀
|
9863d1c004
|
zy:
|
4 jaren geleden |
耀
|
3521f70df4
|
zhao:提交框架
|
4 jaren geleden |