Commit Graph

650 Commits

Author SHA1 Message Date
oc
2c0e0ba307 changeFloorId 2019-05-02 21:06:44 +08:00
oc
330e031bc7 changeFloorId 2019-05-02 21:05:05 +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
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
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
YouWei Zhao
9861319734 update refactoring.md
更新的重构思路,关于edtior_file的重构思考的(可能)比较清晰了
2019-04-23 17:49:49 -04:00
YouWei Zhao
b49fbc6c22 editor_file 2019-04-23 17:08:31 -04:00
YouWei Zhao
59b1bee743 editor_file
floors_template
2019-04-23 16:46:03 -04:00
YouWei Zhao
057861d826 floors_template 2019-04-23 14:58:15 -04:00
YouWei Zhao
4e102eba6c editor_file 2019-04-23 14:39:19 -04:00
YouWei Zhao
cb10654e58 editor_file 2019-04-22 18:48:31 -04:00
YouWei Zhao
2b9eadbe9f rename editor_file 2019-04-22 17:51:10 -04:00
oc
507c2040c8 optimize loadData 2019-04-22 23:38:41 +08:00
Zhang Chen
354f2d192f
Merge pull request #358 from zhaouv/refactoring-editor
refactoring-update
2019-04-22 11:39:35 +08:00
YouWei Zhao
b41feefa07 add /* html */ to get tpl highlighted by plugin
https://marketplace.visualstudio.com/items?itemName=bierner.comment-tagged-templates
2019-04-21 18:33:20 -04:00
YouWei Zhao
3360d151e7 fix comment 2019-04-21 18:16:15 -04:00
YouWei Zhao
3bae60a545 update 2019-04-21 18:14:48 -04:00
YouWei Zhao
c73d16c1b9 update 2019-04-21 17:59:50 -04:00
ckcz123
073cec920b flag:xxx support chinese 2019-04-20 21:10:01 +08:00
ckcz123
3230fde958 nameMap 2019-04-20 20:26:20 +08:00
YouWei Zhao
da5c2a2590 editor_file.js 2019-04-18 19:48:45 -04:00
YouWei Zhao
73ebf73f17 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.x' into refactoring-editor 2019-04-18 19:21:19 -04:00
YouWei Zhao
251ac2e46d update refactoring.md 2019-04-18 19:21:09 -04:00
oc
0923a7fdd2 SL 1000 longClick && tip icon && replaySpeed && \b followers 2019-04-18 01:05:27 +08:00
oc
0d49777e1a Fix blockly searchInput 2019-04-17 16:02:17 +08:00
oc
cbd2f650a5 type:autosave 2019-04-17 13:30:36 +08:00
oc
2eeaf5de03 __size__ -> __SIZE 2019-04-16 23:46:42 +08:00
YouWei Zhao
6a49cf89a1 iconLib.onmousedown
core.__size__==13?630:655
2019-04-16 11:40:13 -04:00
YouWei Zhao
7deec138ed merge 2019-04-16 11:07:58 -04:00
YouWei Zhao
73b8b9a825 move listen -> unsorted 2019-04-16 11:02:58 -04:00
ckcz123
5b239047b5 indexOf 48 -> endsWith 48 2019-04-16 14:00:48 +08:00
YouWei Zhao
0e9b26b31d update refactoring.md 2019-04-15 13:59:40 -04:00
YouWei Zhao
574a54f81a Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into refactoring-editor 2019-04-15 13:44:50 -04:00
oc
94374d7e81 map category & type:restart 2019-04-15 20:52:42 +08:00
oc
ceddecfd02 betweenAttackMax 2019-04-15 20:25:56 +08:00
oc
379ec5ca89 betweenAttackMax 2019-04-15 20:23:23 +08:00
oc
822a0deb5b changefloor current position 2019-04-13 22:11:08 +08:00
YouWei Zhao
5426052746 update refactoring.md 2019-04-12 17:51:21 -04:00
oc
2e34fd267f drawChoices offset 2019-04-12 23:59:39 +08:00
oc
f93c6d03f0 Fix bug: follow, callBook & dowhile 2019-04-09 23:13:43 +08:00
oc
29e9edae0e setBlock for id 2019-04-08 01:33:03 +08:00
oc
b81c94fe62 steelDoorWithoutKey 2019-04-08 01:12:16 +08:00
YouWei Zhao
616b77a760 mv *comment.js 2019-04-06 08:31:57 -04:00
ckcz123
f43a872895 update comments 2019-04-06 13:23:21 +08:00
YouWei Zhao
e7fc0cd846 config table 2019-04-05 21:41:04 -04:00
oc
a60b6ff3db if_1_s 2019-04-05 22:16:39 +08:00
oc
88a60d6995 type:confirm 2019-04-04 23:15:24 +08:00
Zhang Chen
5d58f1bf67
Merge pull request #339 from zhaouv/refactoring-editor
confirm_s
2019-04-04 22:12:40 +08:00
YouWei Zhao
9b5acbcdc4 nobreak 2019-04-03 18:21:48 -04:00
YouWei Zhao
bfa3f3e075 confirm_s 2019-04-03 13:54:19 -04:00
oc
9ecbd2aa42 api for actions & control 2019-04-02 02:38:37 +08:00
Zhang Chen
a688bdb868
Merge pull request #338 from zhaouv/refactoring-editor
fix bug
2019-03-31 23:55:10 +08:00
oc
f61ab63693 status:manamax & documents 2019-03-31 23:03:16 +08:00
YouWei Zhao
2d81d7ce74 update regactoring.md 2019-03-31 09:55:40 -04:00
YouWei Zhao
97386fa9cf fix bug 2019-03-31 09:45:28 -04:00
oc
99a4a7b2a2 playSound stop previous 2019-03-31 19:40:55 +08:00
YouWei Zhao
cfd3058b7e update refactoring.md 2019-03-30 19:35:10 -04:00
YouWei Zhao
11fe36a44e editor_game 2019-03-30 19:25:57 -04:00
YouWei Zhao
16930841ce Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into refactoring-editor 2019-03-30 18:52:29 -04:00
YouWei Zhao
52abd12740 update refactoring.md 2019-03-30 12:54:34 -04:00
YouWei Zhao
05f6b37121 update refactoring.md 2019-03-30 12:38:56 -04:00
oc
b3fb8cf98a remove double click unknow_s 2019-03-31 00:35:35 +08:00
oc
8aca0760c0 commonEventShop 2019-03-31 00:22:26 +08:00
YouWei Zhao
8b6ef9f0d3 Merge branch 'refactoring-editor' of https://github.com/zhaouv/mota-js into refactoring-editor 2019-03-30 12:15:25 -04:00
YouWei Zhao
6e5e8f46ab shop_event & unknow_event 2019-03-30 11:13:11 -04:00
oc
16980c527a quickCommonEvents 2019-03-30 19:18:57 +08:00
ckcz123
d7fb0a2f3f Custom System Event 2019-03-28 15:58:01 +08:00
Zhang Chen
b84912c189
Merge pull request #333 from zhaouv/refactoring-editor
fix bug
2019-03-27 17:50:32 +08:00
YouWei Zhao
30d920d8b4 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into refactoring-editor 2019-03-26 14:27:28 -04:00
YouWei Zhao
0023a16007 Update refactoring.md 2019-03-26 14:27:10 -04:00
YouWei Zhao
2da164af9c fix bug in editor_table 2019-03-26 14:02:47 -04:00
oc
9813dc3115 lineHeight, showImage, splitImage 2019-03-25 00:29:18 +08:00
YouWei Zhao
8eddb7f7b5 editor_util 2019-03-23 16:50:10 -04:00
YouWei Zhao
f67a84faf4 editor_table 2019-03-23 16:21:45 -04:00
YouWei Zhao
6b7f9837b6 Merge remote-tracking branch 'refs/remotes/origin/blockly-mousewheel' into refactoring-editor 2019-03-23 15:00:15 -04:00
YouWei Zhao
74b168a285 onmousewheel
滚轮的行为从滚动百分比改为滚动固定的3行
修改.g4文件的位置
2019-03-23 14:58:16 -04:00
YouWei Zhao
34e8d8cf9a editor_table 2019-03-23 14:49:10 -04:00
YouWei Zhao
a187df91c9 Merge branch 'refactoring-editor' of https://github.com/zhaouv/mota-js into refactoring-editor 2019-03-23 11:42:22 -04:00
YouWei Zhao
1dda51bb3c editor_table 2019-03-23 11:42:19 -04:00
YouWei Zhao
9bbc8d7a47 editor_table 2019-03-23 11:41:36 -04:00
oc
e7af2ec476 ski 2019-03-23 00:40:09 +08:00
YouWei Zhao
ffb8a5e2b3 editor_table 2019-03-21 11:54:50 -04:00
Zhang Chen
3a1d068308
Merge pull request #327 from zhaouv/remove-vue
Remove vue
2019-03-21 23:30:31 +08:00
oc
20781645d4 type:closeDoor 2019-03-21 22:31:13 +08:00
YouWei Zhao
b6b6aa33f6 structure 2019-03-20 20:40:51 -04:00
YouWei Zhao
8af45f900f editor_table 2019-03-20 20:27:23 -04:00
YouWei Zhao
331e4ca592 editor_table 2019-03-20 20:27:04 -04:00
YouWei Zhao
45207a2a54 structure 2019-03-20 19:11:35 -04:00
YouWei Zhao
3996b714c9 init 2019-03-20 19:01:08 -04:00
YouWei Zhao
a87e62ba26 Merge remote-tracking branch 'refs/remotes/origin/plugins' into refactoring-editor 2019-03-20 18:41:17 -04:00
YouWei Zhao
c14d1789e9 tip 2019-03-20 08:42:46 -04:00
oc
cebb4a73c0 flyTo 2019-03-20 14:18:05 +08:00
oc
cc45359ea1 plugins 2019-03-20 13:47:48 +08:00
Zhang Chen
da07c2dc7d
Merge pull request #326 from zhaouv/plugins
Plugins
2019-03-20 13:28:09 +08:00