Commit Graph

940 Commits

Author SHA1 Message Date
ckcz123
7db5abe7e4 更新文档注释内容 2020-05-10 16:30:18 +08:00
ckcz123
4b503e1663 Optimize system switches, remove checkConsole 2020-05-10 15:16:43 +08:00
Zhang Chen
7cefb0e7b1
Merge pull request #451 from zhaouv/v2.x-remove-unsorted
checkboxSet
2020-05-10 12:09:46 +08:00
ckcz123
046aaa71e6 状态栏增设绿钥匙 2020-05-10 12:09:26 +08:00
YouWei Zhao
a193addf91 checkboxSet 2020-05-10 12:00:04 +08:00
ckcz123
c71aac1fa9 Optimize global flags 2020-05-10 10:19:28 +08:00
ckcz123
a0475745f2 Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-10 09:56:12 +08:00
ckcz123
a516d45189 四方向夹击判定 2020-05-10 09:55:58 +08:00
Zhang Chen
00b906648b
Merge pull request #450 from zhaouv/v2.x-remove-unsorted
remove unsorted & fix bug
2020-05-10 09:44:04 +08:00
YouWei Zhao
c4802bcac7 fix bug: edit & click
修复了编辑时切换到同类对象会使得保存到错误的目标的bug
2020-05-09 22:30:53 +08:00
YouWei Zhao
44f71591b0 remove _file_unsorted 2020-05-09 22:29:41 +08:00
ckcz123
8caf1f9b35 \z[n]暂停打字效果 2020-05-09 20:33:59 +08:00
ckcz123
ced1ac34d3 Add lineHeight to setText 2020-05-09 18:10:12 +08:00
ckcz123
b25029ec72 给setValue增加operator;移除core.addValue 2020-05-09 14:47:37 +08:00
YouWei Zhao
25e24a208f remove _legacy 2020-05-09 14:46:13 +08:00
ckcz123
f1093c3cfd 修复全局商店不受canUseQuickShop影响的问题 2020-05-09 13:55:55 +08:00
ckcz123
44b73acfa0 修复g4部分事件 2020-05-09 13:19:47 +08:00
ckcz123
c40545fa6c 增加IntString, ColorString和FontString类型 2020-05-08 22:47:23 +08:00
ckcz123
dcc6d39927 Update forEach 2020-05-08 21:07:17 +08:00
ckcz123
78f4210eb7 添加for/forEach事件 2020-05-08 15:13:47 +08:00
ckcz123
21f9016b89 新增JsonEvalString类型 2020-05-08 10:01:47 +08:00
ckcz123
f9a84954e1 优化部分事件 2020-05-07 13:41:46 +08:00
ckcz123
fe0e4049af 删除setInitData并移动到startText中 2020-05-06 14:53:32 +08:00
ckcz123
8961dd9a58 删除setInitData并移动到startText中 2020-05-06 14:40:18 +08:00
ckcz123
5ab15d998d 图块属性noPass -> canPass 2020-05-06 14:24:34 +08:00
ckcz123
b55388a499 cannotIn / cannotOut使用checkbox选项框 2020-05-06 14:03:59 +08:00
ckcz123
b49728ecef 重写全部道具效果 2020-05-05 22:46:15 +08:00
ckcz123
0554ac2d71 清除最近使用图块 2020-05-05 21:02:18 +08:00
ckcz123
4003eb71d0 Check images exists 2020-05-05 19:02:29 +08:00
ckcz123
d0367b40a3 Update defaultGround for any ID 2020-05-05 17:50:12 +08:00
ckcz123
22fca8d25f wait事件允许多键值和超时时间 2020-05-05 16:48:35 +08:00
ckcz123
77e29f6039 显示选择项/显示确认框可以指定超时时间 2020-05-05 16:26:55 +08:00
ckcz123
34bb3c9713 setCurtain & setWeather持续到下个本事件选项 2020-05-05 15:41:29 +08:00
ckcz123
8ee28cd26d playBgm开始时间;resumeBgm从暂停点恢复 2020-05-05 15:29:01 +08:00
ckcz123
3b50761098 drawAnimate alignWindow 2020-05-05 15:15:59 +08:00
ckcz123
88f0a189d7 图块属性更新门信息 2020-05-05 14:36:44 +08:00
ckcz123
9739b7089f Fix \t .png issue 2020-04-30 17:15:17 +08:00
tocque
95c0dce37b fix config 2020-01-23 10:14:22 +08:00
tocque
7ff1ac3b1b delete alertTiled 2020-01-22 09:46:04 +08:00
tocque
4ef8c59c7c complete config.json 2020-01-22 09:45:01 +08:00
tocque
918140f67c config.json 2020-01-22 09:36:16 +08:00
ckcz123
9f8f4eaa49 lockMode 2020-01-13 11:09:16 +08:00
ckcz123
ee025ad7b0 onStatusBarClick 2020-01-13 10:52:28 +08:00
ckcz123
347af83355 Fix 266 bugs 2020-01-13 10:22:31 +08:00
ckcz123
7108e3a786 Fix 2020-01-04 19:39:01 +08:00
ckcz123
7ad5ba01e8 Add useItemEvent 2020-01-04 17:21:15 +08:00
ckcz123
8413bb657f Fix V2.6.6 2019-12-31 16:18:12 +08:00
ckcz123
90e8980adc optimize lastUsed 2019-12-31 13:23:55 +08:00
ckcz123
d1ff3662a2 lastUsed 2019-12-31 12:49:46 +08:00
ckcz123
c0ffce339a lastUsed 2019-12-31 12:43:59 +08:00
ckcz123
1d271648d2 mid2 2019-12-30 19:05:33 +08:00
ckcz123
97ba00cb33 tileset bind width&height 2019-12-30 18:38:50 +08:00
ckcz123
2893e1c3fb v2.6.6 2019-12-29 22:14:43 +08:00
ckcz123
4d0ad198a4 type:wait preview 2019-12-27 18:39:56 +08:00
ckcz123
ef45e9f7d9 type:wait preview 2019-12-27 18:37:51 +08:00
ckcz123
8ef2cc11a0 Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2019-12-27 16:58:51 +08:00
ckcz123
bd59bea013 type:wait context 2019-12-27 16:58:31 +08:00
ckcz123
638aa0d814 V266 2019-12-27 14:43:25 +08:00
ckcz123
9d8146ab29 Editor last floorId 2019-12-27 14:38:46 +08:00
ckcz123
1216ae7d96 editor multi undo 2019-12-27 14:18:44 +08:00
ckcz123
18d888a05f Fix multiple appendPic bug 2019-12-26 15:29:08 +08:00
ckcz123
cc80dd450d copy enemyitem & foldColNum & fix bug 2019-12-26 15:02:10 +08:00
ckcz123
a4b8e752fa spread the editor 2019-12-20 23:14:56 +08:00
ckcz123
c1e5d4f1f0 norefresh 2019-12-04 23:22:01 +08:00
ckcz123
52b0617944 norefresh 2019-12-04 23:17:17 +08:00
ckcz123
ca69ca5005 v265 2019-11-30 11:47:58 +08:00
ckcz123
ede501e030 setValue refresh 2019-11-29 20:08:24 +08:00
ckcz123
f8163c5fbf action loadEquip 2019-11-29 14:37:06 +08:00
ckcz123
257a14248e setEnemy 2019-11-29 13:32:15 +08:00
ckcz123
755c998ab8 setEnemy 2019-11-29 13:16:57 +08:00
ckcz123
31048d7d05 enemy:xxx && blockId:x,y 2019-11-22 22:47:55 +08:00
ckcz123
b3e11e1938 win noexit 2019-11-22 21:29:45 +08:00
ckcz123
e8ad81da8d Update 264 2019-11-22 00:23:48 +08:00
ckcz123
cb3e761209 fix bug 2019-11-01 22:46:03 +08:00
ckcz123
2eca956482 Update 264 2019-11-01 16:16:12 +08:00
Zhang Chen
cec0abdb9e
Merge pull request #411 from voderl/patch-2
设置字符间距注释的补充
2019-10-29 19:42:49 +08:00
voderl
ba297813c3 update 2019-10-28 21:08:01 +08:00
Zhang Chen
0bab4e508c
Merge pull request #410 from voderl/patch-2
设置剧情文本的属性   增加字符间距参数
2019-10-28 12:56:14 +08:00
ckcz123
3e38036561 itemShop 2019-10-28 10:57:25 +08:00
ckcz123
a94a05f9bd itemShop 2019-10-27 23:02:48 +08:00
ckcz123
a897d9262b itemShop 2019-10-27 21:58:36 +08:00
ckcz123
addc81b26c block script 2019-10-26 19:29:26 +08:00
ckcz123
6bbc3ddd0a block script 2019-10-26 19:22:36 +08:00
ckcz123
b8dc380f46 awesomplete replaceName 2019-10-26 18:09:01 +08:00
ckcz123
9a04c38719 awesomplete replaceName 2019-10-26 18:06:18 +08:00
ckcz123
6612db117c awesomplete replaceName 2019-10-26 18:01:53 +08:00
ckcz123
c212991275 replaceName 2019-10-26 17:33:40 +08:00
ckcz123
0f66a43eb9 blockly replaceToName 2019-10-26 17:09:27 +08:00
voderl
c3c6a1d767 remove vscPlugin 2019-10-26 14:40:03 +08:00
voderl
982e2624cf setText FontInterval 2019-10-26 14:36:28 +08:00
ckcz123
b8b5c0e1f5 tiny fiox 2019-10-26 11:58:01 +08:00
ckcz123
647ad49dcc tiny fiox 2019-10-26 11:57:33 +08:00
ckcz123
4b06096486 quickAppend 2019-10-26 11:32:19 +08:00
ckcz123
6b7300325d searchUsedFlags 2019-10-26 11:00:58 +08:00
ckcz123
9115ab2b7c searchUsedFlags 2019-10-25 09:53:40 +08:00
ckcz123
4846314b1b Update shopItemChoices 2019-10-24 16:50:34 +08:00
ckcz123
3a0c44f34c Update shopItemChoices 2019-10-24 16:30:23 +08:00
ckcz123
d1a1af9f29 Update shopItemChoices 2019-10-24 15:49:48 +08:00
ckcz123
005440fc36 smoothCamera 2019-10-23 20:23:37 +08:00
ckcz123
364f69aa72 showPlugins 2019-10-23 10:35:51 +08:00
ckcz123
cbb2a27f01 itemShop 2019-10-22 21:51:19 +08:00
ckcz123
fe6e331fb0 itemShop 2019-10-22 21:42:40 +08:00
ckcz123
103f2c6415 reformat table 2019-10-22 20:46:37 +08:00
ckcz123
a9d3a94f0e optimize 264 2019-10-22 19:34:40 +08:00
ckcz123
2d06a1e612 bindSpecialDoor 2019-10-22 19:10:22 +08:00
ckcz123
f0bdd3e026 setStartPoint 2019-10-22 11:56:29 +08:00
ckcz123
80715f20de optimize 264 2019-10-21 14:33:33 +08:00
ckcz123
afe5212bc3 dynamicMapEditor 2019-10-21 09:29:53 +08:00
ckcz123
c0078aeb5f autoEvent 2019-10-20 19:01:17 +08:00
YouWei Zhao
ed4607e1dd autoEvent blockly 2019-10-20 14:44:08 +08:00
YouWei Zhao
1fd3bf657d autoEvent 2019-10-19 18:43:17 +08:00
YouWei Zhao
5305533da9 fix editor.viewportLoc 2019-10-19 09:06:58 +08:00
Zhang Chen
e6399b6ebe
Merge pull request #396 from zhaouv/v3.x-kill-unsorted
V3.x kill unsorted
2019-08-22 15:15:03 +08:00
YouWei Zhao
8150e042a2 update _server/README.md 2019-08-22 13:32:05 +08:00
YouWei Zhao
30292c7bfb update _server/README.md 2019-08-22 13:23:40 +08:00
YouWei Zhao
dbc7bd7136 unsorted3->legacy 2019-08-21 23:08:26 +08:00
YouWei Zhao
a7cfeac272 remove unsorted2 2019-08-21 22:42:28 +08:00
YouWei Zhao
64c2e43d00 reorder unsorted2 (unfinished) 2019-08-21 19:20:21 +08:00
YouWei Zhao
aa00d304b6 reorder unsorted2 (unfinished) 2019-08-19 22:10:00 +08:00
YouWei Zhao
983c645d8e reoeder unsorted1 2019-08-19 21:36:51 +08:00
YouWei Zhao
de817bef3a reorder unsorted1 (unfinished) 2019-08-19 19:45:56 +08:00
ckcz123
ba3c719c0a blurFg 2019-08-13 11:45:16 +08:00
ckcz123
c995f81017 showHero & hideHero 2019-08-13 11:23:37 +08:00
oc
3d116c61b4 merge v2.6.3 2019-07-24 18:27:37 +08:00
oc
36cdcd0dbd Fix awesomplete keydown 2019-07-24 10:46:22 +08:00
oc
2ea8b012a8 v2.6.3 2019-07-23 14:49:05 +08:00
oc
3a62d366e0 fix 263 bug 2019-07-10 22:18:48 +08:00
oc
193046f33d setViewport & moveViewport 2019-07-09 20:23:52 +08:00
oc
7de3964525 setBlock multiple locs 2019-07-09 17:20:07 +08:00
oc
83828e57a7 drag bg/fg 2019-07-09 16:22:57 +08:00
oc
9619325d12 playBgm keep 2019-07-06 01:20:31 +08:00
oc
c6c8cd91ec startButtons css 2019-07-06 00:54:16 +08:00
oc
5d279e375d dynamic choices & startReaply save & global flag 2019-07-05 23:20:25 +08:00
oc
3ba1ff07cf changeFont 2019-07-05 00:23:42 +08:00
oc
224f7031cc blockly auto complete 2019-07-04 14:08:53 +08:00
oc
3b3195b9d4 blockly auto complete 2019-07-04 12:02:38 +08:00
oc
a0487a3e5c blockly auto complete 2019-07-04 12:01:55 +08:00
oc
b138d0a157 editor.used_flags 2019-06-29 22:58:06 +08:00
oc
90fc42fc31 editor_blockly getAutoCompletions 2019-06-29 21:08:48 +08:00
oc
43c12e55f1 flyRecordPosition 2019-06-28 17:23:09 +08:00
oc
4a960790c3 syntax error in editor & B in replay 2019-06-28 16:36:20 +08:00
oc
6f75c878a0 Fix uievent bugs & fillCircle 2019-06-19 23:20:19 +08:00
oc
f9f5f9228c Fix uievent bugs & fillCircle 2019-06-19 23:17:54 +08:00
Zhang Chen
cb357b05d2
Merge pull request #380 from ckcz123/v2.x
V2.x
2019-06-09 10:16:47 +08:00
oc
eeb9c6a912 Fix uievent drawThumbnail 2019-06-09 00:00:01 +08:00
oc
1d756fd223 preventDefault 2019-06-08 20:56:51 +08:00
oc
2080b7a885 block name 2019-06-08 20:15:12 +08:00
oc
b75f475443 exchangePos 2019-06-07 22:41:59 +08:00
oc
517892e90e V2.6.2 2019-06-07 21:23:00 +08:00
YouWei Zhao
b0c580ad99 update refactoring.md 2019-06-04 12:54:21 +08:00
YouWei Zhao
a91ad5d5e4 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.x' into refactoring-editor
# Conflicts:
#	_server/editor_file_unsorted.js
2019-06-04 12:10:54 +08:00
oc
d0b8c2088f ctrl+C/X/V 2019-06-04 02:04:23 +08:00
oc
f2796b1bd0 move, copy, cut and paste blocks 2019-06-04 01:56:20 +08:00
oc
396b984ca5 move, copy, cut and paste blocks 2019-06-04 01:39:18 +08:00
oc
14071c287f global:中文 & switch:A-Z 2019-06-03 23:09:30 +08:00
oc
98357fd482 \t & \b in editor 2019-06-03 22:38:44 +08:00
oc
b63c06d982 changeFloor_m selectPoint & ps 2019-06-03 12:45:23 +08:00
oc
5cef1fe4a2 expand / fold materials 2019-06-03 01:37:04 +08:00
oc
bcb3bfc8fd expand / fold materials 2019-06-03 01:10:07 +08:00
oc
4753b47eb4 editor.viewportLoc 2019-06-02 17:10:37 +08:00
oc
10fc179934 editor help & plugin new function 2019-06-02 15:32:14 +08:00
oc
ddac388dd0 long press arrow 2019-06-02 14:49:54 +08:00
oc
718852b9ef fix bugs 2019-06-02 10:23:46 +08:00
oc
2899167a3b fix g4 bug 2019-05-31 23:31:01 +08:00
oc
07646a8491 uievent z 2019-05-31 22:52:58 +08:00
ckcz123
ef31d39bed setBlock selectPoint 2019-05-31 20:45:53 +08:00
ckcz123
b4a702f928 selectPoint fix bug 2019-05-31 20:14:06 +08:00
ckcz123
4391e8cd7d selectPoint fix bug 2019-05-31 20:12:50 +08:00
ckcz123
b15782228a uievent mobile 2019-05-31 19:56:57 +08:00
ckcz123
cbad40d773 blockly selectPoint 2019-05-31 19:30:44 +08:00
oc
af9e541268 uievent.elements 2019-05-31 00:30:14 +08:00
oc
06a0d5153d uievent.elements 2019-05-31 00:29:03 +08:00
oc
1cee65b7ff selectPoint 2019-05-29 23:53:08 +08:00
oc
550252817c selectPoint 2019-05-29 22:48:41 +08:00
oc
58c9f4ddbe selectPoint 2019-05-29 22:40:45 +08:00
oc
317ff5d591 previewUI 2019-05-29 21:35:19 +08:00
oc
dc205877de previewUI 2019-05-28 00:04:45 +08:00
oc
414dd86c81 previewUI part 1 2019-05-27 23:23:32 +08:00
oc
ba7eccbf5e toolboxReplay 2019-05-27 21:56:28 +08:00
oc
6b23361b61 uievents 2019-05-26 23:26:50 +08:00
oc
0c6176f5f6 uievents 2019-05-26 23:10:28 +08:00
oc
1e96491dd4 uievents 2019-05-26 23:06:21 +08:00
oc
2586ec9b76 uievents 2019-05-26 23:02:46 +08:00
oc
01edcfbc98 uievents part 1 2019-05-26 16:33:42 +08:00
oc
a57771d1bf changeFloor symmetry point 2019-05-26 12:01:39 +08:00
oc
5335a2f858 Merge branch 'v2.x' into refactoring-editor 2019-05-02 21:11:10 +08:00
oc
2c0e0ba307 changeFloorId 2019-05-02 21:06:44 +08:00
oc
330e031bc7 changeFloorId 2019-05-02 21:05:05 +08:00
oc
4a3bf0e96a merge v2.x 2019-05-01 16:27:21 +08:00
oc
053665d081 changeId 2019-05-01 16:24:25 +08:00
YouWei Zhao
570f03343d change id idnum 2019-04-30 20:35:11 -04:00
oc
2426c8b010 canEquip -> equipCondition 2019-04-30 20:22:06 +08:00
oc
9264e7dfe5 insertAction commonEvent do-while 2019-04-29 20:10:42 +08:00
Zhang Chen
efe51ce363
Merge pull request #364 from zhaouv/g4-regex-this.xxx
.g4-regex
2019-04-29 19:08:34 +08:00
YouWei Zhao
ca7059bbc2 saveScript 2019-04-28 12:14:59 -04:00
oc
c4a38f4f99 moveBlock forward & backward 2019-04-28 22:38:19 +08:00
YouWei Zhao
45101d43f6 .g4-regex 2019-04-28 10:21:07 -04:00
YouWei Zhao
41b0fc553e editor_file fileMark 2019-04-28 09:54:56 -04:00
oc
9a993b13ca global:xxx -> core.getLocalStorage 2019-04-28 21:50:14 +08:00
oc
9e9025e089 openDoor async & battle loc & trigger keep 2019-04-28 20:29:51 +08:00