Commit Graph

2049 Commits

Author SHA1 Message Date
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
oc
a58067cd6a Update V1.3 2017-12-31 01:35:21 +08:00
Zhang Chen
4fdff8ac18
Merge pull request #26 from i2Echo/master
update gui for v1.3
2017-12-31 01:34:33 +08:00
echo
e87adf63ec Merge branch 'ckcz123' 2017-12-31 01:18:55 +08:00
echo
9ce6ba8d3f merge ckcz123 2017-12-31 01:16:58 +08:00
echo
04eaf07ed1 merge ckcz123 2017-12-31 01:12:44 +08:00
echo
d37c28abdf for v1.3 2017-12-31 01:07:25 +08:00
YouWei Zhao
04424fbe57 Merge remote-tracking branch 'refs/remotes/ckcz123/master' 2017-12-30 22:56:43 +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
ckcz123
2d9278f8f6 Monster Detail 2017-12-30 18:05:21 +08:00
ckcz123
f2bfa7cd84 Update Enemy Detail 2017-12-30 17:25:39 +08:00
oc
9ecccf35de N连击 2017-12-30 15:58:42 +08:00
oc
c0d67d431c N连击 2017-12-30 15:38:54 +08:00
oc
0c61b6d28d Add Point' 2017-12-30 14:28:21 +08:00
YouWei Zhao
f92124e162 editor.file demo 2017-12-30 12:02:19 +08:00
oc
356dc647b4 Support Hue 2017-12-29 21:58:41 +08:00
echo
d94d5f7137 Merge branch 'ckcz123-master' 2017-12-29 18:48:27 +08:00
echo
1a67fec545 重构&更新autotile算法 2017-12-29 18:35:06 +08:00
ckcz123
f3ab1dc83f Update damage 2017-12-29 18:00:12 +08:00
oc
53ba0d4f51 Update BGM 2017-12-29 16:47:09 +08:00
oc
7e832d0496 Music 2017-12-29 12:39:49 +08:00
oc
02b67f3c40 Music 2017-12-29 12:32:18 +08:00
oc
94f31d95ba Music 2017-12-29 12:29:21 +08:00
oc
95686a637c Music 2017-12-29 12:28:59 +08:00
oc
5f7a03ec70 FloorMsgGroup 2017-12-28 22:02:08 +08:00