Commit Graph

1116 Commits

Author SHA1 Message Date
YouWei Zhao
a9835de64a editor_file & comment.js 2018-01-01 19:31:32 +08:00
YouWei Zhao
f6f4745b5d Merge remote-tracking branch 'refs/remotes/origin/master' into 2.0-1.3-merge
# Conflicts:
#	drawMapGUI.html
#	libs/core.js
#	libs/data.js
#	libs/enemys.js
#	libs/maps.js
#	main.js
2018-01-01 11:45:29 +08:00
YouWei Zhao
62b11fc3a0 Update editor_file.js 2018-01-01 02:07:55 +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
YouWei Zhao
5f248444ec merge 1.3 into 2.0 2017-12-31 10:30:01 +08:00
YouWei Zhao
5e00ff8a50 editor.file 2017-12-31 09:13:24 +08:00
echo
d37c28abdf for v1.3 2017-12-31 01:07:25 +08:00
echo
c45c638599 for 2.0 2017-12-30 22:04:37 +08:00
YouWei Zhao
627bcee8c4 main.init('editor') 2017-12-30 21:18:58 +08:00
YouWei Zhao
f92124e162 editor.file demo 2017-12-30 12:02:19 +08:00
echo
1a67fec545 重构&更新autotile算法 2017-12-29 18:35:06 +08:00
YouWei Zhao
0a15e303c1 重构drawMapGui 2017-12-26 00:55:41 +08:00
echo
2e7aa2dec0 update drawmapgui 2017-12-22 00:29:04 +08:00
echo
bc789fc0df update drawMapGui 2017-12-21 22:35:12 +08:00
oc
8d6a75929d Fix HTTP Bug 2017-12-21 20:54:08 +08:00