Commit Graph

640 Commits

Author SHA1 Message Date
oc
27b44b874f Fix V2.0 Bug 2018-03-14 22:14:10 +08:00
oc
cb2c0930d7 update doc 2018-03-14 11:22:00 +08:00
oc
395120c2db update docx 2018-03-14 11:18:33 +08:00
oc
cb89b42a9e Update ReadMe 2018-03-14 00:45:03 +08:00
oc
3ae260bfad Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-03-14 00:40:17 +08:00
oc
cac8402058 Update ReadMe 2018-03-14 00:40:04 +08:00
Zhang Chen
3577f42623
Merge pull request #79 from zhaouv/v2.0-editor-docs-20180313
不打印调试信息;修改事件的trigger
2018-03-14 00:22:51 +08:00
oc
55e153928b V2.0 Docs 2018-03-14 00:22:34 +08:00
YouWei Zhao
b86d734655 不打印调试信息;修改事件的trigger 2018-03-14 00:18:19 +08:00
oc
72d140d4c9 Map Generator V2.0 2018-03-13 22:19:01 +08:00
Zhang Chen
7544f2e284
Merge pull request #78 from zhaouv/v2.0-editor-docs-20180313
editor使用文档
2018-03-13 16:10:04 +08:00
YouWei Zhao
2c7162467f editor使用文档
editor使用文档
type:win lose允许缺省
2018-03-13 14:45:43 +08:00
ckcz123
eb3088a3f0 css 2018-03-13 13:14:45 +08:00
ckcz123
65aa90615b Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-03-13 12:24:15 +08:00
ckcz123
cda73fe058 Support fg & bg 2018-03-13 12:24:06 +08:00
Zhang Chen
8daeeb31e0
Merge pull request #77 from zhaouv/v2.0-editor48-20180313
editor支持48*32
2018-03-13 12:22:53 +08:00
YouWei Zhao
40488a0784 editor支持48*32 2018-03-13 11:23:33 +08:00
oc
292c2a59e6 Image 2018-03-13 10:57:39 +08:00
oc
d7b5403140 Status Bar 2018-03-13 10:16:44 +08:00
oc
0aaed81b76 Fix Bug 2018-03-13 01:59:58 +08:00
oc
a248349739 support 48x32 2018-03-13 01:50:00 +08:00
Zhang Chen
817e95c225
Merge pull request #76 from zhaouv/v2.0-editor-20180304
V2 0 editor 20180304
2018-03-12 15:49:27 +08:00
oc
cb1561f6e7 Textbox 2018-03-12 12:17:40 +08:00
oc
a04d03000c ChangeFloor trigger firstArrive 2018-03-12 12:14:17 +08:00
YouWei Zhao
c4447d88c8 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-20180304 2018-03-12 11:09:14 +08:00
YouWei Zhao
6be440a99d 发生不合要求的更改时显示field 2018-03-12 11:06:04 +08:00
Zhang Chen
7ad578a2a2
Merge pull request #75 from zhaouv/v2.0-editor-20180304
editor:更改部分内容显示的缩进
2018-03-12 00:25:45 +08:00
YouWei Zhao
45f27530a0 editor:更改部分内容显示的缩进 2018-03-12 00:02:28 +08:00
oc
8592e4be31 Enemy Special 2018-03-11 23:31:05 +08:00
oc
ea0848f5a8 Enable HP Max 2018-03-11 23:23:45 +08:00
Zhang Chen
640baac703
Merge pull request #74 from zhaouv/v2.0-editor-20180304
editor在编辑enemy.js时一个怪物一行
2018-03-11 20:41:07 +08:00
YouWei Zhao
fd5e0032ab editor在编辑enemy.js时一个怪物一行
修复了codeAreaHL不是全局量导致的bug
2018-03-11 19:56:21 +08:00
oc
0d592f4b4e PS v2.0 2018-03-11 01:33:02 +08:00
oc
61a804a19d PS v2.0 2018-03-11 01:32:03 +08:00
Zhang Chen
73f2ea3a84
Merge pull request #73 from zhaouv/v2.0-editor-20180304
V2 0 editor 20180304
2018-03-10 23:45:28 +08:00
oc
8fe982ed15 Compress 2018-03-10 23:43:52 +08:00
ckcz123
cd149a0360 Save canvas 2018-03-10 21:02:47 +08:00
YouWei Zhao
ae0a8be8f1 editor细节调整 2018-03-10 21:00:18 +08:00
YouWei Zhao
628d7eeafa 删除过时的文件
已经无法工作的editor_file_test.html
旧版的blockly
已经无效的2.0diff
2018-03-10 20:07:16 +08:00
YouWei Zhao
0ef90087d1 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-20180304 2018-03-10 19:37:47 +08:00
YouWei Zhao
46d4d77bde fix bug 以及调整追加素材的字体 2018-03-10 19:36:53 +08:00
ckcz123
ce0e80c4fa drawText & replay 2018-03-10 18:48:31 +08:00
ckcz123
184740e3cf Add Point 2018-03-10 18:36:25 +08:00
ckcz123
e5098cd7d1 Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-03-10 17:53:32 +08:00
Zhang Chen
b7f8b39d14
Merge pull request #72 from zhaouv/v2.0-editor-20180304
对function更好的支持
2018-03-10 17:32:11 +08:00
YouWei Zhao
3b9e03efee editor的tips的样式 2018-03-10 17:11:38 +08:00
YouWei Zhao
68fa560b0c 对function更好的支持 2018-03-10 16:41:50 +08:00
ckcz123
5f452a5363 Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-03-10 15:11:32 +08:00
ckcz123
cbaf94e646 启动服务 2018-03-10 15:11:27 +08:00
Zhang Chen
e48a8f3106
Merge pull request #71 from zhaouv/v2.0-editor-20180304
V2 0 editor 20180304
2018-03-10 14:13:10 +08:00