YouWei Zhao
|
4659f4ddcd
|
editor.changeFloor
|
2018-01-02 13:35:27 +08:00 |
|
YouWei Zhao
|
5671d5501e
|
取消了editor模式的部分动画 & fix bug
|
2018-01-02 12:37:40 +08:00 |
|
YouWei Zhao
|
a9835de64a
|
editor_file & comment.js
|
2018-01-01 19:31:32 +08:00 |
|
Zhang Chen
|
cdc85d5782
|
Merge pull request #30 from zhaouv/2.0-1.3-merge
develop-2.0
|
2018-01-01 12:57:30 +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
|
f0b9264443
|
Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0'
|
2018-01-01 10:50:16 +08:00 |
|
oc
|
f7b9a5819d
|
Update Service Worker
|
2018-01-01 10:00:38 +08:00 |
|
oc
|
33cc806de4
|
Update Docs
|
2018-01-01 09:50:56 +08:00 |
|
oc
|
d0774de9f0
|
Ver 1.3
|
2018-01-01 09:40:38 +08:00 |
|
Zhang Chen
|
059566cf68
|
Merge pull request #29 from zhaouv/fix-bug
fix bug
|
2018-01-01 09:19:04 +08:00 |
|
YouWei Zhao
|
97838927db
|
fix bug
|
2018-01-01 02:40:21 +08:00 |
|
YouWei Zhao
|
7699bc7ccf
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master'
|
2018-01-01 02:12:03 +08:00 |
|
YouWei Zhao
|
62b11fc3a0
|
Update editor_file.js
|
2018-01-01 02:07:55 +08:00 |
|
oc
|
4ae315d53f
|
Avoid Cache
|
2018-01-01 01:56:11 +08:00 |
|
ckcz123
|
a9529afe6e
|
Add doc
|
2017-12-31 23:41:14 +08:00 |
|
ckcz123
|
b03f2c9171
|
Add doc
|
2017-12-31 23:40:45 +08:00 |
|
ckcz123
|
71c9ac3eb9
|
Fix Doc Bug
|
2017-12-31 23:20:42 +08:00 |
|
ckcz123
|
6b2b320fa7
|
Fix Doc Bug
|
2017-12-31 23:10:44 +08:00 |
|
ckcz123
|
4c80b0216d
|
Fix Doc Bug
|
2017-12-31 22:52:59 +08:00 |
|
ckcz123
|
2f50679891
|
V1.3
|
2017-12-31 22:43:19 +08:00 |
|
ckcz123
|
bd1ad3916a
|
Merge branch 'master' of https://github.com/ckcz123/mota-js
|
2017-12-31 22:31:55 +08:00 |
|
ckcz123
|
3195e1d505
|
Update
|
2017-12-31 22:31:50 +08:00 |
|
Zhang Chen
|
03d3461d15
|
Merge pull request #28 from i2Echo/master
update autotile
|
2017-12-31 22:31:21 +08:00 |
|
echo
|
ab1f9bb4d5
|
merge ckcz123
|
2017-12-31 22:23:44 +08:00 |
|
echo
|
92a2c8cef1
|
update autotile
|
2017-12-31 22:00:26 +08:00 |
|
echo
|
ac06442844
|
update docs
|
2017-12-31 18:24:58 +08:00 |
|
Zhang Chen
|
bfda12df04
|
Update event.md
|
2017-12-31 17:04:48 +08:00 |
|
oc
|
e1fdfa3da5
|
战前剧情
|
2017-12-31 16:54:58 +08:00 |
|
oc
|
81727e1e71
|
战前剧情
|
2017-12-31 16:25:49 +08:00 |
|
YouWei Zhao
|
f037ebe3f0
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master'
|
2017-12-31 15:50:49 +08:00 |
|
YouWei Zhao
|
4f6bf850f8
|
editor: import main.js
editor完全使用core的数据
|
2017-12-31 15:49:03 +08:00 |
|
Zhang Chen
|
77c712a9df
|
Merge pull request #27 from i2Echo/master
add bgimg seletion
|
2017-12-31 15:30:45 +08:00 |
|
YouWei Zhao
|
5438001ea0
|
editor: import main.js
画图部分完美结合
|
2017-12-31 15:29:44 +08:00 |
|
echo
|
878d27eb0a
|
add bgimg seletion
|
2017-12-31 15:27:58 +08:00 |
|
ckcz123
|
c99787fb0c
|
Update Doc
|
2017-12-31 15:27:57 +08:00 |
|
ckcz123
|
58111a06bc
|
Update Doc
|
2017-12-31 15:25:45 +08:00 |
|
ckcz123
|
334e215009
|
可以使用自己的图片素材作为背景
|
2017-12-31 14:58:35 +08:00 |
|
echo
|
15f179732d
|
Merge branch 'v-1.3'
|
2017-12-31 13:11:39 +08:00 |
|
echo
|
8b8538ccfd
|
add ground select
|
2017-12-31 13:10:56 +08:00 |
|
YouWei Zhao
|
ba7bbbc7be
|
editor: import main.js
目前状态是都能工作,需要重写editor的方法
|
2017-12-31 12:15:19 +08:00 |
|
YouWei Zhao
|
fb7749a67e
|
fix bug
|
2017-12-31 10:54:11 +08:00 |
|
YouWei Zhao
|
fd8a03a90d
|
merge 1.3 into 2.0
merge data
|
2017-12-31 10:49:57 +08:00 |
|
YouWei Zhao
|
5f248444ec
|
merge 1.3 into 2.0
|
2017-12-31 10:30:01 +08:00 |
|
YouWei Zhao
|
bbf4396937
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master'
|
2017-12-31 09:15:13 +08:00 |
|
YouWei Zhao
|
5e00ff8a50
|
editor.file
|
2017-12-31 09:13:24 +08:00 |
|
oc
|
8979c1ddcf
|
Update V1.3
|
2017-12-31 01:45:28 +08:00 |
|
oc
|
d695380d1a
|
Update V1.3
|
2017-12-31 01:44:24 +08:00 |
|
oc
|
bb479f04ee
|
Update V1.3
|
2017-12-31 01:41:48 +08:00 |
|
oc
|
7b3d37ee60
|
Update V1.3
|
2017-12-31 01:38:58 +08:00 |
|
oc
|
4bfb23b845
|
Merge branch 'master' of https://github.com/ckcz123/mota-js
|
2017-12-31 01:35:30 +08:00 |
|