Commits · 86232cb9e1d5c8c1bc33d786239bc282e209ec4b · 陈创杰 / automated_warehouse

28 Feb, 2018 2 commits

Merge branch 'master' of git@gitlab.sd-zeus.com:ccj/automated_warehouse.git · 86232cb9

liang-jia-hui authored Feb 28, 2018

# Conflicts:
#	warehouse/Library/CurrentLayout.dwlt
#	warehouse/Library/assetDatabase3
#	warehouse/Library/expandedItems
#	warehouse/Library/metadata/00/00000000000000004000000000000000
#	warehouse/Library/shadercompiler-UnityShaderCompiler.exe0.log

86232cb9

创建warehouse's ui场景添加手柄介绍界面 · 5c707659
liang-jia-hui authored Feb 28, 2018

5c707659

27 Feb, 2018 2 commits
- Merge branch '2-addother' into 'master' · 88465c07
  陈创杰 authored Feb 27, 2018
```
添加了介绍屏幕和机器顶部UI提示

Closes #2

See merge request !1
```
  88465c07
- 添加了介绍屏幕和机器顶部UI提示 · 324f085f
  陈创杰 authored Feb 27, 2018
  
  324f085f
26 Feb, 2018 2 commits
- 无更新 · d56c9653
  liang-jia-hui authored Feb 26, 2018
  
  d56c9653
- 创建warehouse场景，完成场景布置及模型优化，添加滚筒式AGV模型及材质贴图 · 1377c0f9
  liang-jia-hui authored Feb 26, 2018
  
  1377c0f9
23 Feb, 2018 1 commit
- 上传自动化仓库demo · 34fbe848
  ccj authored Feb 23, 2018
```
有项目指导书
```
  34fbe848