Commit Graph

9 Commits

Author SHA1 Message Date
YouWei Zhao
3b9e03efee editor的tips的样式 2018-03-10 17:11:38 +08:00
YouWei Zhao
f67b88d38e add tab for appendPic 2018-02-19 12:07:49 +08:00
YouWei Zhao
85c4d8a622 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into 2.0-for-merge
Conflicts:
_server/vm.js
drawMapGUI.html
index.html
libs/core.js
libs/data.js
libs/enemys.js
libs/icons.js
libs/items.js
libs/maps.js
main.js
project/floors/sample1.js
project/images/yewai.png
project/images/常用素材:如需使用请直接替换目录中的对应文件/items1:圆形宝石.png
styles.css
2018-02-10 16:35:38 +08:00
echo
f47eefeea8 fix IE bug 2018-01-20 13:56:44 +08:00
echo
4db9583e41 merge from master 2018-01-09 21:13:05 +08:00
YouWei Zhao
4659f4ddcd editor.changeFloor 2018-01-02 13:35:27 +08:00
echo
878d27eb0a add bgimg seletion 2017-12-31 15:27:58 +08:00
echo
8b8538ccfd add ground select 2017-12-31 13:10:56 +08:00
echo
c45c638599 for 2.0 2017-12-30 22:04:37 +08:00