Commit Graph
590 Commits
Author SHA1 Message Date
oc 75d40ffdd0 Fix SyncLoad Bug 2018-03-17 23:47:44 +08:00
oc 80b81b6ce9 Fix SyncLoad Bug 2018-03-17 23:46:22 +08:00
oc e88c5ad67f Lint Checkbox 2018-03-17 23:27:43 +08:00
Zhang Chen 7f3b86e2f7 Merge pull request #91 from zhaouv/v2.0-comment-20180316
V2 0 comment 20180316
2018-03-17 22:07:47 +08:00
YouWei Zhao 82e6b8e760 取消editor_multi的自动检测 2018-03-17 17:47:07 +08:00
YouWei Zhao c192a2b62c 重构comment 2018-03-17 17:40:13 +08:00
Zhang Chen c791566044 Merge pull request #90 from zhaouv/v2.0-editor-docs-20180313
lint检查
2018-03-17 11:55:59 +08:00
YouWei Zhao 12a7d213f2 调整blockly滚动条 2018-03-17 01:24:06 +08:00
YouWei Zhao 8400cd0051 重构遍历生成表格 2018-03-16 22:33:11 +08:00
YouWei Zhao f825d0f482 Merge remote-tracking branch 'refs/remotes/origin/v2.0-editor-docs-20180313' into v2.0-comment-20180316 2018-03-16 20:27:09 +08:00
YouWei Zhao 6a5906b0da lint检查 2018-03-16 20:25:51 +08:00
YouWei Zhao fabb45dbbf 重构table recursionParse 2018-03-16 20:19:38 +08:00
oc ca3bcd688a 增加输入提示 2018-03-16 20:00:22 +08:00
oc 36fa4af7c6 Save floorId 2018-03-16 19:33:48 +08:00
oc 12066d1893 Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-03-16 19:26:01 +08:00
oc e36392675c default 0 2018-03-16 19:25:50 +08:00
Zhang Chen 57f65a1719 Merge pull request #89 from zhaouv/v2.0-editor-docs-20180313
V2 0 editor docs 20180313
2018-03-16 19:10:48 +08:00
YouWei Zhao 07811f67d7 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-docs-20180313 2018-03-16 19:08:22 +08:00
YouWei Zhao 1eab391b5b type:function的lint 2018-03-16 19:07:52 +08:00
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