Commit Graph
571 Commits
Author SHA1 Message Date
oc 39245cd615 Use Tab to indent 2018-03-16 01:12:09 +08:00
oc 1764592f62 Use Tab to indent 2018-03-16 01:07:21 +08:00
Zhang Chen 0811248bba Merge pull request #88 from zhaouv/v2.0-editor-docs-20180313
V2 0 editor docs 20180313
2018-03-16 00:57:33 +08:00
YouWei Zhao e1786c40eb 判断是否开启lint和自动补全 2018-03-16 00:45:23 +08:00
YouWei Zhao 4d9327854d Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-docs-20180313
# Conflicts:
#	_server/editor_blockly.js
2018-03-16 00:28:17 +08:00
YouWei Zhao 7403fa72c7 修改滚轮行为 2018-03-16 00:25:56 +08:00
oc 7f5752ee94 options 2018-03-15 23:02:09 +08:00
YouWei Zhao 4842dd3c8f Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-docs-20180313 2018-03-15 22:38:42 +08:00
ckcz123 955476285d Shop Template 2018-03-15 21:07:53 +08:00
ckcz123 0b084b027f Comment 2018-03-15 19:54:56 +08:00
ckcz123 dc35bc7adf Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-03-15 19:51:45 +08:00
ckcz123 42fa7ffa7f CSS 2018-03-15 19:51:39 +08:00
Zhang Chen 9fc0937c81 Merge pull request #86 from zhaouv/v2.0-editor-docs-20180313
V2 0 editor docs 20180313
2018-03-15 19:18:22 +08:00
ckcz123 ef643a97af Javascript Lint 2018-03-15 19:16:50 +08:00
YouWei Zhao 8fd8e27baa type:choice允许缺省text 2018-03-15 18:44:40 +08:00
YouWei Zhao 875726cbbe Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-docs-20180313 2018-03-15 18:26:18 +08:00
ckcz123 a02682cb7e Autocomplete & Css 2018-03-15 18:21:54 +08:00
YouWei Zhao f933ca5435 编辑mapblocksinfo 2018-03-15 17:25:47 +08:00
YouWei Zhao 1c45bfee3f 修复点confirm事件编辑器的输入文本不消失的bug 2018-03-15 16:45:17 +08:00
YouWei Zhao 1f221a1600 editor中显示useItem和canUseItem 2018-03-15 16:25:16 +08:00
YouWei Zhao ba3ff6e178 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-docs-20180313 2018-03-15 15:49:54 +08:00
ckcz123 b82c24ec06 Replay Speed 2018-03-15 15:48:40 +08:00
ckcz123 a551311051 Replay Speed 2018-03-15 15:47:58 +08:00
YouWei Zhao 7c82f4e9fb show MapBlocksInfo 2018-03-15 15:46:53 +08:00
oc b4fdc3b326 Init Item 2018-03-15 14:13:16 +08:00
oc 150d65275b Update Item Effect 2018-03-15 13:56:45 +08:00
oc b222ed4252 Support plugin 2018-03-15 10:04:51 +08:00
oc 6d9a4dafbf Support plugin 2018-03-15 10:04:12 +08:00
oc 55bae305d9 Support plugin 2018-03-15 10:00:10 +08:00
YouWei Zhao 9a58c2bbd5 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-docs-20180313 2018-03-14 23:02:54 +08:00
oc 896bd1947c Fix V2.0 Bug 2018-03-14 22:14:45 +08:00
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