jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity
570 Commits 1 Branch 2 Tags 50 MiB
1764592f62
Commit Graph

102 Commits

Author SHA1 Message Date
oc
1764592f62 Use Tab to indent 2018-03-16 01:07:21 +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
ckcz123
955476285d Shop Template 2018-03-15 21:07:53 +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
7c82f4e9fb show MapBlocksInfo 2018-03-15 15:46:53 +08:00
oc
27b44b874f Fix V2.0 Bug 2018-03-14 22:14:10 +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
YouWei Zhao
b86d734655 不打印调试信息;修改事件的trigger 2018-03-14 00:18:19 +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
YouWei Zhao
40488a0784 editor支持48*32 2018-03-13 11:23:33 +08:00
YouWei Zhao
6be440a99d 发生不合要求的更改时显示field 2018-03-12 11:06:04 +08:00
YouWei Zhao
45f27530a0 editor:更改部分内容显示的缩进 2018-03-12 00:02:28 +08:00
YouWei Zhao
fd5e0032ab editor在编辑enemy.js时一个怪物一行 
修复了codeAreaHL不是全局量导致的bug
 2018-03-11 19:56:21 +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
46d4d77bde fix bug 以及调整追加素材的字体 2018-03-10 19:36:53 +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
YouWei Zhao
15cdfa0f23 function调整 2018-03-10 14:10:42 +08:00
YouWei Zhao
9ee85323df editor实现$range以及细节调整 2018-03-10 13:27:13 +08:00
YouWei Zhao
38842a7200 editor细节优化 2018-03-09 22:50:59 +08:00
YouWei Zhao
8e3c1b5c67 表格css以及编辑细节调整 2018-03-09 20:46:34 +08:00
YouWei Zhao
a695dcd6cf editor前端上切换模式 2018-03-08 19:00:20 +08:00
YouWei Zhao
05982bfaf4 issue #57 
#57
 2018-03-07 22:44:57 +08:00
YouWei Zhao
39db1cd235 blockly改为弹窗 2018-03-07 17:35:15 +08:00
oc
66117ebf08 Support Callback in Editor 2018-03-05 19:37:21 +08:00
YouWei Zhao
df89fd0b7c 调整 editor.file & editor.mode 2018-03-04 11:11:52 +08:00
oc
2f5caae07c Support Reborn 2018-03-03 23:48:46 +08:00
ckcz123
0974656ad1 Restructure 2018-03-03 21:07:26 +08:00
YouWei Zhao
8c484d84d9 fix bug 2018-03-01 16:00:38 +08:00
YouWei Zhao
2f50978612 Update blockly 2018-02-28 20:25:53 +08:00
YouWei Zhao
5da6ad56d0 Update blockly 2018-02-28 17:59:03 +08:00
YouWei Zhao
d754df5a83 修改event显伤的默认值 2018-02-28 14:48:14 +08:00
YouWei Zhao
3be76240ff 可设置可不设置的增加null选项 2018-02-28 14:02:34 +08:00
YouWei Zhao
7b2c7c3509 Update editor-blockly-template 
事件模板中添加
检测音乐如果没有开启则系统提示开启
 2018-02-23 16:28:49 +08:00
YouWei Zhao
bb6a9e3266 Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-blockly-20180214' into dev-2.0-appendPic-20180218 2018-02-21 18:09:39 +08:00