jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity
3,093 Commits 1 Branch 2 Tags 50 MiB
d6df76b206
Commit Graph

212 Commits

Author SHA1 Message Date
YouWei Zhao
49d497b1a8 editArea 2019-03-19 23:17:47 -04:00
YouWei Zhao
a1e144f2da editArea-1 2019-03-19 22:36:13 -04:00
YouWei Zhao
b61a9afea8 selectBox 2019-03-19 22:25:14 -04:00
YouWei Zhao
4fa318a6b4 step1:buttons 2019-03-19 22:19:41 -04:00
oc
69e4215e03 myprompt & myconfirm 2019-03-20 02:32:31 +08:00
YouWei Zhao
eda91df9f0 ui 2019-03-19 14:23:43 -04:00
oc
bd008a2d48 autoFormat & clearPoint 2019-02-27 00:37:46 +08:00
Zhang Chen
5a1b22b9a2
Merge pull request #320 from zhaouv/update-blockly-version 
blockly-version
 2019-02-18 23:49:56 +08:00
oc
248b65834d editor format js 2019-02-18 23:51:38 +08:00
YouWei Zhao
fc878bb529 blockly-version 2019-02-18 10:20:34 -05:00
YouWei Zhao
57b437de7b common event view 
edit-able in page
 2019-02-01 20:27:37 -05:00
YouWei Zhao
08315af63d common event blockly 
delete legacy point_m
add commentEvent_m
 2019-01-31 17:11:05 -05:00
oc
3d44412491 toolbar 8 buttons 2019-01-24 23:12:13 +08:00
oc
58607216fe remove edata 2019-01-16 22:27:29 +08:00
YouWei Zhao
5a33a81224 editor-icons 
drawImage->img.src
 2019-01-13 10:44:37 -05:00
YouWei Zhao
bad6ff1412 dynamic table 2019-01-12 10:10:29 -05:00
oc
42c4301472 colorPicker 2019-01-04 02:26:12 +08:00
oc
20bedabd05 create multiple floors 2019-01-01 23:14:12 +08:00
oc
91d227dd96 PS & addFloorEvent 2019-01-01 20:16:16 +08:00
oc
132afb961e colorPicker 2018-12-22 23:44:59 +08:00
tocque
a7109fe0cb colorPicker 2018-12-22 23:19:21 +09:00
ckcz123
6bd4d21413 Remove route canvas 2018-12-18 17:22:24 +08:00
ckcz123
3063393a92 Weather dynamic canvas 2018-12-18 14:57:48 +08:00
ckcz123
f26bc14bf1 Dynamic canvas 2018-12-17 14:38:34 +08:00
ckcz123
65f9fcb612 Dynamic canvas 2018-12-14 20:52:55 +08:00
oc
8d31055c52 Search Blockly 2018-12-13 22:43:28 +08:00
ckcz123
71f03ffbfe Search 2018-12-13 20:41:20 +08:00
oc
519b882758 statusCanvas 2018-12-06 23:29:49 +08:00
oc
6b371c305f Fix Bug 2018-12-04 01:07:55 +08:00
oc
f709a61013 eachArrive 2018-12-02 22:17:26 +08:00
oc
4ee795a3c3 eachArrive 2018-12-02 22:15:22 +08:00
tocque
873f2d3a9c fix more typo 2018-11-24 22:51:06 +09:00
tocque
a8554c21e2 levelUp event 2018-11-24 22:30:54 +09:00
oc
1ddde2137d mana & skill 2018-10-30 02:58:21 +08:00
oc
c9eb0c9b85 statusBar Color 2018-10-29 02:23:33 +08:00
Zhang Chen
cffd0101fe
Merge pull request #243 from zhaouv/editor-tilesets-changeable 
Editor tilesets changeable
 2018-10-27 00:03:32 +08:00
YouWei Zhao
94ae7f3a33 editor-tilesets 2018-10-26 23:25:51 +08:00
oc
2c64452da1 Update css for input:range 2018-10-26 23:02:55 +08:00
YouWei Zhao
99998c3249 editor-appendPic-hsl 
追加素材中支持更改色相
 2018-10-26 21:24:25 +08:00
oc
4bd24e665b Update z-index of image 2018-10-17 22:32:55 +08:00
oc
8ad043ad6c canvas:image 2018-10-16 23:41:26 +08:00
oc
3565b2256a Name on statusBar 2018-10-11 21:51:41 +08:00
YouWei Zhao
21ab8a4450 editor-airwall 2018-09-27 18:48:52 +08:00
YouWei Zhao
74b6f48a01 editor-airwall 2018-09-27 18:01:38 +08:00
YouWei Zhao
be3925cae6 editor: tileset draw-mod 2018-09-27 14:44:32 +08:00
YouWei Zhao
458e464f73 editor-tilesets 2018-09-26 23:39:36 +08:00
YouWei Zhao
914874e5af editor: fine tuning 2018-09-24 14:35:30 +08:00
oc
64e39b8da6 curtain -> canvas 2018-09-18 11:51:55 +08:00
ckcz123
c00ae6e017 Equipment 2018-09-17 16:18:33 +08:00
ckcz123
d2af698252 V2.4.1 2018-09-16 04:54:32 +08:00
YouWei Zhao
f0d5c04db5 editor: fgmap bgmap draw-support 2018-09-15 23:54:39 +08:00
YouWei Zhao
2c3fba90e1 editor: fgmap bgmap data-support 2018-09-13 19:31:10 +08:00
ckcz123
095aedf1e1 Bgmap & Fgmap events 2018-09-13 16:08:17 +08:00
ckcz123
2202888419 Fix SetFg 2018-09-12 18:25:50 +08:00
oc
f262834c27 Fix Editor Bug 2018-08-30 22:11:28 +08:00
oc
95f401e2dd write generate_map error 2018-08-27 23:57:07 +08:00
ckcz123
6c515ffb7d View map while replaying 2018-08-27 17:43:34 +08:00
ckcz123
6471f61e35 Show PZF on status bar 2018-08-27 17:21:05 +08:00
oc
fb540a6976 Create bigmap 2018-08-27 01:36:00 +08:00
YouWei Zhao
702c22d49d bigmap-editor 
界面的兼容
viewport调整以及对应的按钮, 地图两边的坐标刻度跟随
editor-mobile
 2018-08-26 15:25:39 +08:00
YouWei Zhao
7032cb7c83 bigmap-editor 2018-08-26 00:33:02 +08:00
oc
ccdc613afd Fix ClickMove & RM animate export custom ratio 2018-08-02 00:45:33 +08:00
ckcz123
f5ca89e27a V2.3.3 2018-07-22 13:59:08 +08:00
YouWei Zhao
5f411c0acc editor brushMod 
editor.brushMod = "line"; // ["line","rectangle"]
 2018-07-21 22:18:19 +08:00
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