Commit Graph

148 Commits

Author SHA1 Message Date
YouWei Zhao
0288f42c8d fix getCategory
修复了getCategory,因为命名不一致带来bug的可能, 方便添加新分类
2018-07-05 20:39:32 +08:00
YouWei Zhao
cd23d0abba finish 2018-07-05 18:13:04 +08:00
oc
58ddc08c51 fix editor bug 2018-06-18 00:01:10 +08:00
Zhang Chen
206b763b88
Merge pull request #138 from zhaouv/v2.x
V2 x
2018-06-05 22:00:17 +08:00
YouWei Zhao
a7f156b73b blockly侧边栏改成中文 2018-06-05 14:29:09 +08:00
oc
db0aabd16b Use Chinese 2018-05-26 00:05:22 +08:00
oc
76773e717d Compress Blockly & Fix Autocomplete 2018-05-25 23:59:08 +08:00
YouWei Zhao
7f7ad9a44a alertWhenCompress 2018-05-24 12:32:18 +08:00
YouWei Zhao
7301f703ef set useCompress false in editor 2018-05-24 12:00:35 +08:00
YouWei Zhao
932bbfd60b menu 2018-05-11 16:26:27 +08:00
YouWei Zhao
b5c9df41a8 menu css 2018-05-11 15:15:42 +08:00
YouWei Zhao
4e1eafc2ba 右键菜单 - 在素材区选中 2018-05-10 22:49:22 +08:00
oc
df4d8cdf9e save floor status 2018-05-09 13:26:51 +08:00
oc
06dfa942ec Auto register 2018-05-07 00:09:14 +08:00
oc
b04b45070f competition mode 2018-05-06 21:11:56 +08:00
oc
3ba0473078 Update commments 2018-04-21 00:56:57 +08:00
oc
bbe77b13b0 update editor.html 2018-04-19 20:50:38 +08:00
ckcz123
8e68f1fbdf Animate image & Gif support 2018-04-18 18:11:21 +08:00
oc
81df4a9b19 Reformat _server & delete map 2018-04-18 00:28:53 +08:00
oc
e38f131f53 New empty map & autosave map 2018-04-17 00:45:17 +08:00
oc
e88c5ad67f Lint Checkbox 2018-03-17 23:27:43 +08:00
oc
ca3bcd688a 增加输入提示 2018-03-16 20:00:22 +08:00
ckcz123
42fa7ffa7f CSS 2018-03-15 19:51:39 +08:00
ckcz123
ef643a97af Javascript Lint 2018-03-15 19:16:50 +08:00
ckcz123
a02682cb7e Autocomplete & Css 2018-03-15 18:21:54 +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
oc
ea0848f5a8 Enable HP Max 2018-03-11 23:23:45 +08:00
YouWei Zhao
ae0a8be8f1 editor细节调整 2018-03-10 21:00:18 +08:00
YouWei Zhao
46d4d77bde fix bug 以及调整追加素材的字体 2018-03-10 19:36:53 +08:00
YouWei Zhao
38842a7200 editor细节优化 2018-03-09 22:50:59 +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
YouWei Zhao
f22ba51023 保持editor中的gameGroup部分与index同形 2018-02-28 15:16:19 +08:00
YouWei Zhao
e436a5f995 追加素材完成 2018-02-21 18:09:19 +08:00
YouWei Zhao
f67b88d38e add tab for appendPic 2018-02-19 12:07:49 +08:00
YouWei Zhao
d003dbf84b editor:修改成功或失败会有相应的提示
不再时只是throw错误
2018-02-19 10:26:23 +08:00
YouWei Zhao
93160d2156 引入CodeMirror作为多行文本编辑器 2018-02-17 17:16:05 +08:00
YouWei Zhao
7c33ce6b1f fix bug
可以正确的处理null了
2018-02-15 10:00:02 +08:00
YouWei Zhao
2b069b7614 集成blockly的事件编辑器
目前只能在正确的事件上工作,尚未处理null
2018-02-15 00:18:00 +08:00
YouWei Zhao
5939d27508 add tab for blockly 2018-02-14 14:51:10 +08:00
YouWei Zhao
85c4d8a622 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into 2.0-for-merge
Conflicts:
_server/vm.js
drawMapGUI.html
index.html
libs/core.js
libs/data.js
libs/enemys.js
libs/icons.js
libs/items.js
libs/maps.js
main.js
project/floors/sample1.js
project/images/yewai.png
project/images/常用素材:如需使用请直接替换目录中的对应文件/items1:圆形宝石.png
styles.css
2018-02-10 16:35:38 +08:00
YouWei Zhao
0c24e662c9 editor 2018-01-09 23:45:16 +08:00
YouWei Zhao
8977ac5137 editor 全GUI编辑 2018-01-09 15:22:11 +08:00
YouWei Zhao
eb8a045816 把editor的代码拆分到单独的文件中 2018-01-08 19:28:11 +08:00