148 Commits (b8b1f53eb406e8d315c19d0e1bca2529fa1ea0ef)
 

Author SHA1 Message Date
  zhangxueyang 227d1da0b6 Merge commit '32c92f7ab9a14cac19aa285e481893a008fa486e' into zhangxueyang 4 years ago
  耀 94138a510d Merge remote-tracking branch 'origin/zxy' into zyy 4 years ago
  耀 32c92f7ab9 zhao:优化打印 4 years ago
  zhangxueyang 596e1e2cdd Merge remote-tracking branch 'origin/zyy' into zhangxueyang 4 years ago
  zhangxueyang 6bccf4ac21 优化工具栏 4 years ago
  耀 025ff51e33 Merge remote-tracking branch 'origin/zxy' into zyy 4 years ago
  耀 1921604d7d zhao:1增加生成和打印点阵文件,2增加记录和读取微课信息 4 years ago
  zhangxueyang c43de58d7b 画板转PDF 工具栏 圆形 矩形 4 years ago
  zhangxueyang 7106b48fe2 Merge remote-tracking branch 'origin/zyy' into zhangxueyang 4 years ago
  zhangxueyang bb481aa75d PDF 4 years ago
  耀 3151a43782 zhao:倒计时 4 years ago
  耀 15423a8b20 zhao:解决冲突 4 years ago
  耀 15e25f230b zhao:记录录像信息 4 years ago
  zhangxueyang 8ecac05845 ppt转图片 画笔图标 工具栏 4 years ago
  zhangxueyang 5e6fd2992f 录屏 画板功能。 4 years ago
  zhangxueyang 04b272712d 工具栏 4 years ago
  耀 4969a87e84 zhao:解决冲突 4 years ago
  耀 b90c43d9a5 zhao:1增加缩略图 2调试录屏、录制 3增加截图临时文件夹 4 years ago
  zhangxueyang faf85a77f5 设置配置项 。 缩小 移动 图片 。 截图 4 years ago
  zhangxueyang fae26e576d Merge remote-tracking branch 'origin/zyy' into zhangxueyang 4 years ago
  zhangxueyang 2480f493a6 导入图片的页码 4 years ago
  耀 bec6b62498 zhao:增加录屏、录制 4 years ago
  耀 f4643552d5 zhao:解决冲突 4 years ago
  耀 9d5379f4b9 zhao:修改FFMPEG类 4 years ago
  zhangxueyang 0cbd3eaac0 导入 绘图 分页 登陆 4 years ago
  zhangxueyang 914165c6ed 冲突 4 years ago
  耀 da90e2c048 zhao:增加用户模型 4 years ago
  zhangxueyang 7067cd02eb 冲突 4 years ago
  zhangxueyang 5310508030 手掌效果 4 years ago
  耀 73db3d61a6 zhao:1增加微课模型2增加视频模型3增加录屏4优化代码 4 years ago
  耀 d7047b5d5e Merge remote-tracking branch 'origin/zxy' into zyy 4 years ago
  耀 e5791061e4 zhao:增加增加暂停功能,多视频录制合并 4 years ago
  zhangxueyang af14813ae0 画笔颜色 粗细 样式。 4 years ago
  耀 fbf9789e1b Merge remote-tracking branch 'origin/zxy' into zyy 4 years ago
  耀 a956170188 zhao:1增加录音方法,2增加视频格式 4 years ago
  zhangxueyang 1355aaab46 BUG 4 years ago
  耀 e9e374ff94 zhao:解决冲突 4 years ago
  耀 6c2bc0ad3b zhao:增加保存UI内容为图片 增加图片音频合成视频 4 years ago
  zhangxueyang f209fd72e3 UI 4 years ago
  耀 db2ab6ead8 Merge remote-tracking branch 'origin/zxy' into zyy 4 years ago
  zhangxueyang 162c736c9f 删除bin obj 4 years ago
  zhangxueyang f68ea88799 文件 4 years ago
  耀 d7cf544f0c Merge remote-tracking branch 'origin/zxy' into zyy 4 years ago
  耀 6141326234 zhao:去除bin obj 4 years ago
  zhangxueyang de23c59911 主页面 4 years ago
  耀 2c05040d9c zy: 4 years ago
  耀 9863d1c004 zy: 4 years ago
  耀 3521f70df4 zhao:提交框架 4 years ago